Merge lp:~renatofilho/qtorganizer5-eds/fix-all-dayevents into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Fix qdatetime value before convert it to time_t.
Update event end time if saving event with startDate > endDate;

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/246/rebuild

review: Approve (continuous-integration)

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2016-03-03 17:20:40 +0000
+++ organizer/qorganizer-eds-engine.cpp	2016-03-03 17:20:40 +0000
@@ -1340,6 +1340,10 @@
         *tzId = QByteArray(icaltimezone_get_tzid(timezone));
         return icaltime_from_timet_with_zone(finalDate.toTime_t(), allDay, timezone);
     } else {
+        if (!finalDate.isValid()) {
+            finalDate = QDateTime(finalDate.date(),
+                                  allDay || !finalDate.time().isValid() ? QTime(0, 0, 0) : finalDate.time());
+        }
         *tzId = "";
         return icaltime_from_timet(finalDate.toTime_t(), allDay);
     }
@@ -2078,8 +2082,18 @@
 {
     QOrganizerEventTime etr = item.detail(QOrganizerItemDetail::TypeEventTime);
     if (!etr.isEmpty()) {
+        QDateTime eventEndDateTime = etr.endDateTime();
+        if (etr.startDateTime() > eventEndDateTime) {
+            eventEndDateTime = etr.startDateTime();
+        }
+
+        if (etr.isAllDay() &&
+            (eventEndDateTime.date() == etr.startDateTime().date())) {
+            eventEndDateTime = etr.startDateTime().addDays(1);
+        }
+
         QByteArray tzId;
-        struct icaltimetype ict = fromQDateTime(etr.endDateTime(), etr.isAllDay(), &tzId);
+        struct icaltimetype ict = fromQDateTime(eventEndDateTime, etr.isAllDay(), &tzId);
         ECalComponentDateTime dt;
         dt.tzid = tzId.isEmpty() ? NULL : tzId.constData();
         dt.value = &ict;
@@ -2270,8 +2284,18 @@
 {
     QOrganizerTodoTime ttr = item.detail(QOrganizerItemDetail::TypeTodoTime);
     if (!ttr.isEmpty() && !ttr.dueDateTime().isNull()) {
+        QDateTime dueDateTime = ttr.dueDateTime();
+        if (ttr.startDateTime() > dueDateTime) {
+            dueDateTime = ttr.startDateTime();
+        }
+
+        if (ttr.isAllDay() &&
+            (dueDateTime.date() == ttr.startDateTime().date())) {
+            dueDateTime = ttr.startDateTime().addDays(1);
+        }
+
         QByteArray tzId;
-        struct icaltimetype ict = fromQDateTime(ttr.dueDateTime(), ttr.isAllDay(), &tzId);
+        struct icaltimetype ict = fromQDateTime(dueDateTime, ttr.isAllDay(), &tzId);
         ECalComponentDateTime dt;
         dt.tzid = tzId.isEmpty() ? NULL : tzId.constData();
         dt.value = &ict;

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2016-03-03 17:20:40 +0000
+++ tests/unittest/event-test.cpp	2016-03-03 17:20:40 +0000
@@ -578,6 +578,93 @@
         QCOMPARE(eventResult.endDateTime().time(), QTime(0, 0, 0));
     }
 
+    void testModifyAllDayEvent()
+    {
+        static QString displayLabelValue = QStringLiteral("All day title");
+        static QString descriptionValue = QStringLiteral("All day description");
+
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
+        QOrganizerEvent event;
+        event.setStartDateTime(eventDateTime);
+        event.setEndDateTime(eventDateTime.addDays(1));
+        event.setDisplayLabel(displayLabelValue);
+        event.setDescription(descriptionValue);
+        event.setAllDay(true);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << event;
+        bool saveResult = m_engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+
+        QOrganizerEvent eventResult = static_cast<QOrganizerEvent>(items[0]);
+        eventResult.setDescription(QStringLiteral("New description"));
+        items.clear();
+        items << eventResult;
+        saveResult = m_engine->saveItems(&items,
+                                         QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                         &errorMap,
+                                         &error);
+
+        QOrganizerItemFetchHint hint;
+        QList<QOrganizerItemId> ids;
+        ids << items[0].id();
+        items = m_engine->items(ids, hint, &errorMap, &error);
+        QCOMPARE(items.count(), 1);
+
+        eventResult = static_cast<QOrganizerEvent>(items[0]);
+        QCOMPARE(eventResult.description(), QStringLiteral("New description"));
+        QCOMPARE(eventResult.isAllDay(), true);
+        QCOMPARE(eventResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(eventResult.startDateTime().time(), QTime(0, 0, 0));
+        QCOMPARE(eventResult.endDateTime().date(), eventDateTime.date().addDays(1));
+        QCOMPARE(eventResult.endDateTime().time(), QTime(0, 0, 0));
+    }
+
+    void testCreateAllDayEventWithInvalidEndDate()
+    {
+        static QString displayLabelValue = QStringLiteral("All day title");
+        static QString descriptionValue = QStringLiteral("All day description");
+
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
+        QOrganizerEvent event;
+        event.setStartDateTime(eventDateTime);
+        event.setEndDateTime(eventDateTime.addDays(-10));
+        event.setDisplayLabel(displayLabelValue);
+        event.setDescription(descriptionValue);
+        event.setAllDay(true);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << event;
+        bool saveResult = m_engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QOrganizerItemId id = items[0].id();
+        QVERIFY(!id.isNull());
+
+        QOrganizerItemFetchHint hint;
+        QList<QOrganizerItemId> ids;
+        ids << items[0].id();
+        items = m_engine->items(ids, hint, &errorMap, &error);
+        QCOMPARE(items.count(), 1);
+
+        QOrganizerEvent eventResult = static_cast<QOrganizerEvent>(items[0]);
+        QCOMPARE(eventResult.isAllDay(), true);
+        QCOMPARE(eventResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(eventResult.startDateTime().time(), QTime(0, 0, 0));
+        QCOMPARE(eventResult.endDateTime().date(), eventDateTime.date().addDays(1));
+        QCOMPARE(eventResult.endDateTime().time(), QTime(0, 0, 0));
+    }
 
     void testCreateTodoEventWithStartDate()
     {