Merge lp:~phablet-team/history-service/sort_by_multiple_fields into lp:history-service/staging

[Gustavo Pichorim Boiko]

Allow pass multiple fields on sort clause.

Allow pass multiple fields on sort clause.

[Gustavo Pichorim Boiko (boiko)]

Just one request, looks good otherwise.

review: Needs Fixing

[lp:~phablet-team/history-service/sort_by_multiple_fields]

263. By Renato Araujo Oliveira Filho on 2017-03-22

Code optimize.

[Renato Araujo Oliveira Filho (renatofilho)]

> Just one request, looks good otherwise.
fixed.

[Tiago Salem Herrmann (tiagosh)]

looks good. thanks.

review: Approve

=== modified file 'Ubuntu/History/historymodel.cpp'
--- Ubuntu/History/historymodel.cpp	2017-03-22 17:15:32 +0000
+++ Ubuntu/History/historymodel.cpp	2017-03-22 17:15:32 +0000
@@ -415,10 +415,18 @@
 
 bool HistoryModel::lessThan(const QVariantMap &left, const QVariantMap &right) const
 {
-    QVariant leftValue = left[sort()->sortField()];
-    QVariant rightValue = right[sort()->sortField()];
-
-    return leftValue < rightValue;
+    QStringList sortFields = sort()->sortField().split(",");
+
+    while(!sortFields.isEmpty()) {
+        QString sortField = sortFields.takeFirst().trimmed();
+        QVariant leftValue = left.value(sortField, QVariant());
+        QVariant rightValue = right.value(sortField, QVariant());
+
+        if (leftValue != rightValue) {
+            return leftValue < rightValue;
+        }
+    }
+    return false;
 }
 
 int HistoryModel::positionForItem(const QVariantMap &item) const

=== modified file 'plugins/sqlite/sqlitehistoryeventview.cpp'
--- plugins/sqlite/sqlitehistoryeventview.cpp	2015-01-28 23:08:01 +0000
+++ plugins/sqlite/sqlitehistoryeventview.cpp	2017-03-22 17:15:32 +0000
@@ -42,7 +42,14 @@
     QString condition = mPlugin->filterToString(filter, filterValues);
     QString order;
     if (!sort.sortField().isNull()) {
-        order = QString("ORDER BY %1 %2").arg(sort.sortField(), sort.sortOrder() == Qt::AscendingOrder ? "ASC" : "DESC");
+        // WORKAROUND: Supports multiple fields by split it using ','
+        Q_FOREACH(const QString& field, sort.sortField().split(",")) {
+            order += QString("%1 %2, ")
+                    .arg(field.trimmed())
+                    .arg(sort.sortOrder() == Qt::AscendingOrder ? "ASC" : "DESC");
+        }
+
+        order = QString("ORDER BY %1").arg(order.mid(0, order.lastIndexOf(",")));
         // FIXME: check case sensitiviy
     }
 

=== modified file 'plugins/sqlite/sqlitehistorythreadview.cpp'
--- plugins/sqlite/sqlitehistorythreadview.cpp	2016-11-24 01:56:01 +0000
+++ plugins/sqlite/sqlitehistorythreadview.cpp	2017-03-22 17:15:32 +0000
@@ -43,7 +43,14 @@
     QString condition = mPlugin->filterToString(filter, filterValues);
     QString order;
     if (!sort.sortField().isNull()) {
-        order = QString("ORDER BY %1 %2").arg(sort.sortField(), sort.sortOrder() == Qt::AscendingOrder ? "ASC" : "DESC");
+        // WORKAROUND: Supports multiple fields by split it using ','
+        Q_FOREACH(const QString& field, sort.sortField().split(",")) {
+            order += QString("%1 %2, ")
+                    .arg(field.trimmed())
+                    .arg(sort.sortOrder() == Qt::AscendingOrder ? "ASC" : "DESC");
+        }
+
+        order = QString("ORDER BY %1").arg(order.mid(0, order.lastIndexOf(",")));
         // FIXME: check case sensitiviy
     }
 

=== modified file 'tests/plugins/sqlite/SqliteEventViewTest.cpp'
--- tests/plugins/sqlite/SqliteEventViewTest.cpp	2013-12-09 21:18:14 +0000
+++ tests/plugins/sqlite/SqliteEventViewTest.cpp	2017-03-22 17:15:32 +0000
@@ -39,6 +39,7 @@
     void testNextPage();
     void testFilter();
     void testSort();
+    void testSortWithMultipleFields();
 
 private:
     SQLiteHistoryPlugin *mPlugin;
@@ -128,7 +129,26 @@
     QCOMPARE(allEvents.first()[History::FieldEventId].toString(), QString("event%1").arg(EVENT_COUNT-1));
     QCOMPARE(allEvents.last()[History::FieldEventId].toString(), QString("event00"));
     delete view;
-
+}
+
+void SqliteEventViewTest::testSortWithMultipleFields()
+{
+    History::Sort ascendingSort(QString("%1, %2").arg(History::FieldAccountId).arg(History::FieldEventId), Qt::AscendingOrder);
+    //History::Sort ascendingSort(QString("%1").arg(History::FieldEventId), Qt::AscendingOrder);
+    History::PluginEventView *view = mPlugin->queryEvents(History::EventTypeText, ascendingSort);
+    QVERIFY(view->IsValid());
+    QList<QVariantMap> allEvents;
+    QList<QVariantMap> events = view->NextPage();
+    while (!events.isEmpty()) {
+        allEvents << events;
+        events = view->NextPage();
+    }
+
+    QCOMPARE(allEvents[0][History::FieldEventId].toString(), QString("event00"));
+    QCOMPARE(allEvents[0][History::FieldAccountId].toString(), QString("account0"));
+    QCOMPARE(allEvents[1][History::FieldEventId].toString(), QString("event01"));
+    QCOMPARE(allEvents[1][History::FieldAccountId].toString(), QString("account0"));
+    delete view;
 }
 
 void SqliteEventViewTest::populateDatabase()
@@ -136,7 +156,7 @@
     mPlugin->beginBatchOperation();
 
     // create two threads of each type
-    for (int i = 0; i < 2; ++i) {
+    for (int i = 1; i >= 0; --i) {
         QVariantMap voiceThread = mPlugin->createThreadForParticipants(QString("account%1").arg(i),
                                                                        History::EventTypeVoice,
                                                                        QStringList() << QString("participant%1").arg(i));