Merge lp:~renatofilho/qtorganizer5-eds/fix-query-with-detached-events into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Populate event list with detached events.

Make sure that detached events appear on the list while fetching events.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-query-with-detached-events]

88. By Renato Araujo Oliveira Filho on 2016-01-18

Check if request still valid bofere parse items on thread.

89. By Renato Araujo Oliveira Filho on 2016-01-18

Fixed event recurrence cb signature.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-query-with-detached-events]

90. By Renato Araujo Oliveira Filho on 2016-01-25

Avoid crash when searching with invalid filter.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2016-01-25 14:17:34 +0000
+++ organizer/qorganizer-eds-engine.cpp	2016-01-25 14:17:34 +0000
@@ -133,7 +133,6 @@
         itemsAsyncStart(data);
     } else {
         data->finish();
-        releaseRequestData(data);
     }
 }
 
@@ -175,16 +174,63 @@
 void QOrganizerEDSEngine::itemsAsyncDone(FetchRequestData *data)
 {
     if (data->isLive()) {
+        data->compileCurrentIds();
+        itemsAsyncFetchDeatachedItems(data);
+    } else {
+        releaseRequestData(data);
+    }
+}
+
+void QOrganizerEDSEngine::itemsAsyncFetchDeatachedItems(FetchRequestData *data)
+{
+    QString parentId = data->nextParentId();
+    if (!parentId.isEmpty()) {
+        e_cal_client_get_objects_for_uid(E_CAL_CLIENT(data->client()),
+                                         parentId.toUtf8().data(),
+                                         data->cancellable(),
+                                         (GAsyncReadyCallback) QOrganizerEDSEngine::itemsAsyncListByIdListed,
+                                         data);
+    } else {
         itemsAsyncStart(data);
-    } else {
-        releaseRequestData(data);
-    }
-}
-
-void QOrganizerEDSEngine::itemsAsyncListed(ECalComponent *comp,
-                                           time_t instanceStart,
-                                           time_t instanceEnd,
-                                           FetchRequestData *data)
+    }
+}
+
+void QOrganizerEDSEngine::itemsAsyncListByIdListed(GObject *source,
+                                                   GAsyncResult *res,
+                                                   FetchRequestData *data)
+{
+    Q_UNUSED(source);
+    GError *gError = 0;
+    GSList *events = 0;
+    e_cal_client_get_objects_for_uid_finish(E_CAL_CLIENT(data->client()),
+                                            res,
+                                            &events,
+                                            &gError);
+    if (gError) {
+        qWarning() << "Fail to list deatached events in calendar" << gError->message;
+        g_error_free(gError);
+        gError = 0;
+        if (data->isLive()) {
+            data->finish(QOrganizerManager::InvalidCollectionError);
+        } else {
+            releaseRequestData(data);
+        }
+        return;
+    }
+
+    for(GSList *e = events; e != NULL; e = e->next) {
+        icalcomponent * ical = e_cal_component_get_icalcomponent(static_cast<ECalComponent*>(e->data));
+        data->appendDeatachedResult(ical);
+    }
+
+    itemsAsyncFetchDeatachedItems(data);
+}
+
+
+gboolean QOrganizerEDSEngine::itemsAsyncListed(ECalComponent *comp,
+                                               time_t instanceStart,
+                                               time_t instanceEnd,
+                                               FetchRequestData *data)
 {
     Q_UNUSED(instanceStart);
     Q_UNUSED(instanceEnd);
@@ -194,7 +240,9 @@
         if (icalComp) {
             data->appendResult(icalComp);
         }
+        return TRUE;
     }
+    return FALSE;
 }
 
 void QOrganizerEDSEngine::itemsAsyncListedAsComps(GObject *source,
@@ -662,7 +710,9 @@
             QOrganizerEDSEngineId *eid = new QOrganizerEDSEngineId(currentCollectionId,
                                                                    QString::fromUtf8(uid));
             item.setId(QOrganizerItemId(eid));
-            item.setGuid(QString::fromUtf8(uid));
+            item.setGuid(QString("%1/%2")
+                         .arg(eid->m_collectionId)
+                         .arg(eid->m_itemId));
 
             QOrganizerEDSCollectionEngineId *edsCollectionId = new QOrganizerEDSCollectionEngineId(currentCollectionId);
             item.setCollectionId(QOrganizerCollectionId(edsCollectionId));
@@ -2349,12 +2399,21 @@
                                   QOrganizerItem *item,
                                   QOrganizerEDSCollectionEngineId *edsCollectionId)
 {
+
     ECalComponentId *id = e_cal_component_get_id(comp);
     QOrganizerEDSEngineId *edsParentId = 0;
-    QOrganizerEDSEngineId *edsId = QOrganizerEDSEngineId::fromComponentId(edsCollectionId->m_collectionId, id, &edsParentId);
-
+    QOrganizerEDSEngineId *edsId;
+
+    if (!edsCollectionId) {
+        qWarning() << "Parse Id with null collection";
+        return;
+    }
+
+    edsId = QOrganizerEDSEngineId::fromComponentId(edsCollectionId->m_collectionId, id, &edsParentId);
     item->setId(QOrganizerItemId(edsId));
-    item->setGuid(QString::fromUtf8(id->uid));
+    item->setGuid(QString("%1/%2")
+                    .arg(edsCollectionId->m_collectionId)
+                    .arg(edsId->m_itemId));
 
     if (edsParentId) {
         QOrganizerItemParent itemParent = item->detail(QOrganizerItemDetail::TypeParent);
@@ -2633,14 +2692,12 @@
         e_cal_component_set_uid(comp, cId.toUtf8().data());
 
         if (!rId.isEmpty()) {
-            ECalComponentRange *recur_id;
+            ECalComponentRange recur_id;
             struct icaltimetype tt = icaltime_from_string(rId.toUtf8().data());
 
-            recur_id = g_new0 (ECalComponentRange, 1);
-            recur_id->type = E_CAL_COMPONENT_RANGE_SINGLE;
-            recur_id->datetime.value = &tt;
-            e_cal_component_set_recurid(comp, recur_id);
-            g_free (recur_id);
+            recur_id.type = E_CAL_COMPONENT_RANGE_SINGLE;
+            recur_id.datetime.value = &tt;
+            e_cal_component_set_recurid(comp, &recur_id);
         }
     }
 }

=== modified file 'organizer/qorganizer-eds-engine.h'
--- organizer/qorganizer-eds-engine.h	2016-01-25 14:17:34 +0000
+++ organizer/qorganizer-eds-engine.h	2016-01-25 14:17:34 +0000
@@ -217,9 +217,11 @@
     // glib callback
     void itemsAsync(QtOrganizer::QOrganizerItemFetchRequest *req);
     static void itemsAsyncStart(FetchRequestData *data);
-    static void itemsAsyncListed(ECalComponent *comp, time_t instanceStart, time_t instanceEnd, FetchRequestData *data);
+    static gboolean itemsAsyncListed(ECalComponent *comp, time_t instanceStart, time_t instanceEnd, FetchRequestData *data);
     static void itemsAsyncDone(FetchRequestData *data);
     static void itemsAsyncListedAsComps(GObject *source, GAsyncResult *res, FetchRequestData *data);
+    static void itemsAsyncFetchDeatachedItems(FetchRequestData *data);
+    static void itemsAsyncListByIdListed(GObject *source, GAsyncResult *res, FetchRequestData *data);
 
     void itemsByIdAsync(QtOrganizer::QOrganizerItemFetchByIdRequest *req);
     static void itemsByIdAsyncStart(FetchByIdRequestData *data);

=== modified file 'organizer/qorganizer-eds-fetchrequestdata.cpp'
--- organizer/qorganizer-eds-fetchrequestdata.cpp	2016-01-25 14:17:34 +0000
+++ organizer/qorganizer-eds-fetchrequestdata.cpp	2016-01-25 14:17:34 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "qorganizer-eds-fetchrequestdata.h"
+#include "qorganizer-eds-engineid.h"
 
 #include <QtCore/QDebug>
 
@@ -64,6 +65,16 @@
     }
 }
 
+QString FetchRequestData::nextParentId()
+{
+    QString nextId;
+    if (!m_currentParentIds.isEmpty()) {
+        nextId = m_currentParentIds.values().first();
+        m_currentParentIds.remove(nextId);
+    }
+    return nextId;
+}
+
 QString FetchRequestData::collection() const
 {
     return m_current;
@@ -119,6 +130,16 @@
     RequestData::cancel();
 }
 
+void FetchRequestData::compileCurrentIds()
+{
+    for(GSList *e = m_currentComponents; e != NULL; e = e->next) {
+        icalcomponent *icalComp = static_cast<icalcomponent *>(e->data);
+        if (e_cal_util_component_has_recurrences (icalComp)) {
+            m_currentParentIds.insert(QString::fromUtf8(icalcomponent_get_uid(icalComp)));
+        }
+    }
+}
+
 void FetchRequestData::finish(QOrganizerManager::Error error,
                               QOrganizerAbstractRequest::State state)
 {
@@ -126,21 +147,18 @@
         m_parseListener = new FetchRequestDataParseListener(this,
                                                             error,
                                                             state);
-#if 1
-        parent()->parseEventsAsync(m_components,
-                                   true,
-                                   request<QOrganizerItemFetchRequest>()->fetchHint().detailTypesHint(),
-                                   m_parseListener,
-                                   SLOT(onParseDone(QList<QtOrganizer::QOrganizerItem>)));
-#else
-        Q_FOREACH(const QString &id, m_components.keys()) {
-            appendResults(parent()->parseEvents(id, m_components[id], true, request<QOrganizerItemFetchRequest>()->fetchHint().detailTypesHint()));
+        QOrganizerItemFetchRequest *req =  request<QOrganizerItemFetchRequest>();
+        if (req) {
+            parent()->parseEventsAsync(m_components,
+                                       true,
+                                       req->fetchHint().detailTypesHint(),
+                                       m_parseListener,
+                                       SLOT(onParseDone(QList<QtOrganizer::QOrganizerItem>)));
+
+            return;
         }
-        finishContinue(error, state);
-#endif
-    } else {
-        finishContinue(error, state);
     }
+    finishContinue(error, state);
 }
 
 void FetchRequestData::finishContinue(QOrganizerManager::Error error,
@@ -169,27 +187,43 @@
     m_currentComponents = g_slist_append(m_currentComponents, comp);
 }
 
+void FetchRequestData::appendDeatachedResult(icalcomponent *comp)
+{
+    const gchar *uid;
+    struct icaltimetype rid;
+
+    uid = icalcomponent_get_uid(comp);
+    rid = icalcomponent_get_recurrenceid(comp);
+
+    for(GSList *e=m_currentComponents; e != NULL; e = e->next) {
+        icalcomponent *ical = static_cast<icalcomponent *>(e->data);
+        if ((g_strcmp0(uid, icalcomponent_get_uid(ical)) == 0) &&
+            (icaltime_compare(rid, icalcomponent_get_recurrenceid(ical)) == 0)) {
+
+            // replace instance event
+            icalcomponent_free (ical);
+            e->data = icalcomponent_new_clone(comp);
+            QString itemId = QString("%1/%2#%3")
+                    .arg(QString(m_current).replace(QOrganizerEDSEngineId::managerUriStatic() + ":", ""))
+                    .arg(QString::fromUtf8(uid))
+                    .arg(QString::fromUtf8(icaltime_as_ical_string(rid)));
+            m_deatachedIds.append(itemId);
+            break;
+        }
+    }
+}
+
 int FetchRequestData::appendResults(QList<QOrganizerItem> results)
 {
     int count = 0;
-    // check if we really need filter or sort the result
     QOrganizerItemFetchRequest *req = request<QOrganizerItemFetchRequest>();
     QOrganizerItemFilter filter = req->filter();
-    if ((filter.type() == QOrganizerItemFilter::DefaultFilter) &&
-        req->sorting().isEmpty()) {
-        m_results += results;
-        count = results.size();
-    } else {
-        Q_FOREACH(const QOrganizerItem &item, results) {
-            if ((req->filter().type() == QOrganizerItemFilter::DefaultFilter) ||
-                QOrganizerManagerEngine::testFilter(req->filter(), item)) {
-                if (!req->sorting().isEmpty()) {
-                    QOrganizerManagerEngine::addSorted(&m_results, item, req->sorting());
-                } else {
-                    m_results << item;
-                }
-                count++;
-            }
+    QList<QOrganizerItemSortOrder> sorting = req->sorting();
+
+    Q_FOREACH(QOrganizerItem item, results) {
+        if (QOrganizerManagerEngine::testFilter(filter, item)) {
+            QOrganizerManagerEngine::addSorted(&m_results, item, sorting);
+            count++;
         }
     }
     return count;

=== modified file 'organizer/qorganizer-eds-fetchrequestdata.h'
--- organizer/qorganizer-eds-fetchrequestdata.h	2016-01-25 14:17:34 +0000
+++ organizer/qorganizer-eds-fetchrequestdata.h	2016-01-25 14:17:34 +0000
@@ -33,16 +33,19 @@
     ~FetchRequestData();
 
     QString nextCollection();
+    QString nextParentId();
     QString collection() const;
     time_t startDate() const;
     time_t endDate() const;
     bool hasDateInterval() const;
     bool filterIsValid() const;
     void cancel();
+    void compileCurrentIds();
 
     void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
                 QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
     void appendResult(icalcomponent *comp);
+    void appendDeatachedResult(icalcomponent *comp);
     int appendResults(QList<QtOrganizer::QOrganizerItem> results);
     QString dateFilter();
 
@@ -50,6 +53,8 @@
     FetchRequestDataParseListener *m_parseListener;
     QMap<QString, GSList*> m_components;
     QStringList m_collections;
+    QSet<QString> m_currentParentIds;
+    QStringList m_deatachedIds;
     QString m_current;
     GSList* m_currentComponents;
     QList<QtOrganizer::QOrganizerItem> m_results;

=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2015-02-26 17:30:35 +0000
+++ tests/unittest/recurrence-test.cpp	2016-01-25 14:17:34 +0000
@@ -632,6 +632,79 @@
         QCOMPARE(savedRule.limitDate().isValid(), false);
         QCOMPARE(savedRule.limitCount(), -1);
     }
+
+    void testModifiedRecurrenceDescription()
+    {
+        static QString displayLabelValue = QStringLiteral("testModifiedRecurrenceDescription test");
+        static QString descriptionValue = QStringLiteral("testModifiedRecurrenceDescription description");
+
+        // create  a recurrence event
+        QOrganizerEvent ev;
+        ev.setCollectionId(m_collection.id());
+        ev.setStartDateTime(QDateTime(QDate(2013, 12, 2), QTime(0,0,0)));
+        ev.setEndDateTime(QDateTime(QDate(2013, 12, 2), QTime(0,30,0)));
+        ev.setDisplayLabel(displayLabelValue);
+        ev.setDescription(descriptionValue);
+
+        QOrganizerRecurrenceRule rule;
+        rule.setFrequency(QOrganizerRecurrenceRule::Daily);
+        rule.setLimit(QDate(2013, 12, 31));
+        ev.setRecurrenceRule(rule);
+
+        QSignalSpy itemsAdded(m_engine, SIGNAL(itemsAdded(QList<QOrganizerItemId>)));
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << ev;
+        bool saveResult = m_engine->saveItems(&items,
+                                              QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                              &errorMap,
+                                              &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
+        QTRY_COMPARE_WITH_TIMEOUT(itemsAdded.count(), 1, 10000);
+
+        // modify the second ocurrence
+        QOrganizerItemSortOrder sort;
+        QOrganizerItemFetchHint hint;
+        QOrganizerItemCollectionFilter filter;
+        filter.setCollectionId(m_collection.id());
+
+        items = m_engine->items(filter,
+                                QDateTime(QDate(2013, 12, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2013, 12, 31), QTime(0,0,0)),
+                                100,
+                                sort,
+                                hint,
+                                &error);
+
+        QOrganizerItem ocurr = items.at(1);
+        ocurr.setDescription(QString("%1 modified").arg(descriptionValue));
+        items.clear();
+        items << ocurr;
+        saveResult = m_engine->saveItems(&items,
+                                         QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                         &errorMap,
+                                         &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QTRY_COMPARE_WITH_TIMEOUT(itemsAdded.count(), 2, 10000);
+
+        // Fetch items by date and check if the modified recurrence has his own id
+        items = m_engine->items(filter,
+                                QDateTime(QDate(2013, 12, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2013, 12, 31), QTime(0,0,0)),
+                                100,
+                                sort,
+                                hint,
+                                &error);
+
+        // Check if the modified item appear on the list
+        QOrganizerItem ocurr1 = items.at(1);
+        QCOMPARE(ocurr1.description(), QString("%1 modified").arg(descriptionValue));
+        QVERIFY(!ocurr1.id().isNull());
+    }
 };
 
 QTEST_MAIN(RecurrenceTest)