Merge pull request #4 from choonchernlim/feature/all-day-bug

0.4.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.4.1 - 2017-03-08
+
+* Fixed problem where all-day Exchange event from previous day gets created every time CalSync runs.                      
+
 ## 0.4.0 - 2016-12-16
 
 * `exchange.sleep.on.connection.error` = Whether to suppress thrown Exchange connection error or not.

src/main/groovy/com/github/choonchernlim/calsync/exchange/ExchangeClient.groovy

@@ -10,15 +10,13 @@ import microsoft.exchange.webservices.data.core.service.folder.CalendarFolder
 import microsoft.exchange.webservices.data.credential.WebCredentials
 import microsoft.exchange.webservices.data.search.CalendarView
 import org.joda.time.DateTime
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
 /**
  * Exchange client class.
  */
 @PackageScope
 class ExchangeClient {
-    private static Logger LOGGER = LoggerFactory.getLogger(ExchangeClient)
+    // private static Logger LOGGER = LoggerFactory.getLogger(ExchangeClient)
 
     final ExchangeService service
 
@@ -46,6 +44,23 @@ class ExchangeClient {
         return CalendarFolder.bind(service, WellKnownFolderName.Calendar).
                 findAppointments(new CalendarView(startDateTime.toDate(), endDateTime.toDate())).
                 getItems()?.
+                findAll { appointment ->
+                    // Exchange sets all-day event appointment from given day midnight to the next day midnight,
+                    // which may get picked up because it matches the given `endDateTime` even though it is an
+                    // all-day event appointment for the day before.
+                    //
+                    // To fix this, only include appointments with start datetime between the given
+                    // date range.
+                    if (appointment.isAllDayEvent) {
+                        def appointmentStartDateTime = new DateTime(appointment.start)
+
+                        return !appointmentStartDateTime.isBefore(startDateTime) &&
+                               !appointmentStartDateTime.isAfter(endDateTime)
+                    }
+                    else {
+                        return appointment
+                    }
+                }?.
                 collect { appointment ->
                     appointment.load(PropertySet.firstClassProperties)
                     Mapper.toExchangeEvent(appointment)