Fix serialization issue with Event and deserilization with FreeBusy (#143)

This PR fixes the Event object not serializing hide_participants and visibility as well as Free Busy not serializing the calendar_id response from the API.

Author: mrashed-dev

CHANGELOG.md

@@ -12,6 +12,10 @@ This section contains changes that have been committed but not yet released.
 
 ### Fixed
 
+* Fix `Event.hide_participants` not serializing
+* Fix `Event.visibility` not serializing
+* Fix `FreeBusy` not having a `calendar_id` field
+
 ### Removed
 
 ### Security

src/main/java/com/nylas/Event.java

@@ -187,6 +187,7 @@ public String toString() {
 				", round_robin_order=" + round_robin_order +
 				", notifications=" + notifications +
 				", participants=" + participants +
+				", visibility=" + visibility +
 				", metadata=" + metadata +
 				']';
 	}
@@ -238,6 +239,12 @@ public void setBusy(Boolean busy) {
 
 	public void setHideParticipants(Boolean hideParticipants) {
 		this.hide_participants = hideParticipants;
+		this.modifiedFields.put("hide_participants", this.hide_participants);
+	}
+
+	public void setVisibility(String visibility) {
+		this.visibility = visibility;
+		this.modifiedFields.put("visibility", this.visibility);
 	}
 
 	public void setMetadata(Map<String, String> metadata) {
@@ -363,6 +370,8 @@ protected Map<String, Object> getWritableFields(boolean creation) {
 		Maps.putIfNotNull(params, "conferencing", getConferencing());
 		Maps.putIfNotNull(params, "notifications", getNotifications());
 		Maps.putIfNotNull(params, "recurrence", getRecurrence());
+		Maps.putIfNotNull(params, "hide_participants", getHideParticipants());
+		Maps.putIfNotNull(params, "visibility", getVisibility());
 		return params;
 	}
 

src/main/java/com/nylas/FreeBusy.java

@@ -5,6 +5,7 @@
 public class FreeBusy {
 
 	private String email;
+	private String calendar_id;
 	private List<TimeSlot> time_slots;
 
 	public String getEmail() {
@@ -15,6 +16,10 @@ public List<TimeSlot> getTimeSlots() {
 		return time_slots;
 	}
 
+	public String getCalendarId() {
+		return calendar_id;
+	}
+
 	public void setEmail(String email) {
 		this.email = email;
 	}
@@ -25,6 +30,6 @@ public void setTimeSlots(List<TimeSlot> timeSlots) {
 
 	@Override
 	public String toString() {
-		return "FreeBusy [email=" + email + ", time_slots=" + time_slots + "]";
+		return "FreeBusy [email=" + email + ", time_slots=" + time_slots + ", calendar_id=" + calendar_id + "]";
 	}
 }

src/test/java/com/nylas/EventTest.java

@@ -201,8 +201,8 @@ public void testValidate() {
 
     @Test
     public void testGetWritableFields() {
-        assertEquals(event.getWritableFields(true).size(), 13);
-        assertEquals(event.getWritableFields(false).size(), 15);
+        assertEquals(event.getWritableFields(true).size(), 15);
+        assertEquals(event.getWritableFields(false).size(), 16);
     }
 
     @Test

src/test/java/com/nylas/FreeBusyTest.java

@@ -25,6 +25,7 @@ public void init() throws NoSuchFieldException, IllegalAccessException {
 
         FieldReflectionUtils.setField("email", "jdoe@gmail.com", freeBusy);
         FieldReflectionUtils.setField("time_slots", timeSlots, freeBusy);
+        FieldReflectionUtils.setField("calendar_id", "abc123", freeBusy);
     }
 
     @Test
@@ -37,6 +38,6 @@ public void testGetters() {
 
     @Test
     public void testToString() {
-        assertEquals(freeBusy.toString(), "FreeBusy [email=jdoe@gmail.com, time_slots=[TimeSlot [status=null, start_time=2022-12-13T15:34:05Z, end_time=2022-12-13T15:34:05Z, emails=[]]]]");
+        assertEquals(freeBusy.toString(), "FreeBusy [email=jdoe@gmail.com, time_slots=[TimeSlot [status=null, start_time=2022-12-13T15:34:05Z, end_time=2022-12-13T15:34:05Z, emails=[]]], calendar_id=abc123]");
     }
 }

src/test/java/com/nylas/MessageTest.java

@@ -71,7 +71,7 @@ public void testGetters() {
         assertEquals(message.getLabels().size(), 1);
         assertEquals(message.getMetadata().size(), 1);
         assertEquals(message.getHeaders().size(), 1);
-        assertEquals(message.toString(), "Message [id=null, account_id=null, thread_id=okdvc089, subject=That thing I sent you, from=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], to=[NameEmail [name=Blue Falcone, email=falcone.blue@sebbebandsebben.com]], cc=[NameEmail [name=Harvey Birdman, email=harvey.birdman@sebbebandsebben.com]], bcc=[NameEmail [name=Christie, email=christie@sebbebandsebben.com]], reply_to=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], date=2022-11-10T12:28:00Z, unread=true, starred=true, snippet=Did you get that thing..., body.length=46, files=[File [id=null, filename=logo.jpg, size=12334, content_type=image/jpeg, message_ids=[odjashjcv89], content_id=osdivcnm90834e]], events=[Event [id='null', calendar_id='null', ical_uid='null', master_event_id='null', event_collection_id='null', title='null', description='null', location='null', owner='null', status='null', capacity=null, read_only=null, busy=null, hide_participants=null, original_start_time=null, when=null, conferencing=null, recurrence=null, round_robin_order=[], notifications=[], participants=[], metadata={}]], folder=Folder [id=null, name=null, display_name=null], labels=[Label [id=null, name=null, display_name=null]], headers={header1=value}, metadata={key1=value}]");
+        assertEquals(message.toString(), "Message [id=null, account_id=null, thread_id=okdvc089, subject=That thing I sent you, from=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], to=[NameEmail [name=Blue Falcone, email=falcone.blue@sebbebandsebben.com]], cc=[NameEmail [name=Harvey Birdman, email=harvey.birdman@sebbebandsebben.com]], bcc=[NameEmail [name=Christie, email=christie@sebbebandsebben.com]], reply_to=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], date=2022-11-10T12:28:00Z, unread=true, starred=true, snippet=Did you get that thing..., body.length=46, files=[File [id=null, filename=logo.jpg, size=12334, content_type=image/jpeg, message_ids=[odjashjcv89], content_id=osdivcnm90834e]], events=[Event [id='null', calendar_id='null', ical_uid='null', master_event_id='null', event_collection_id='null', title='null', description='null', location='null', owner='null', status='null', capacity=null, read_only=null, busy=null, hide_participants=null, original_start_time=null, when=null, conferencing=null, recurrence=null, round_robin_order=[], notifications=[], participants=[], visibility=null, metadata={}]], folder=Folder [id=null, name=null, display_name=null], labels=[Label [id=null, name=null, display_name=null]], headers={header1=value}, metadata={key1=value}]");
     }