Merge lp:~renatofilho/history-service/most-called into lp:history-service

[Renato Araujo Oliveira Filho]

Unmerged revisions

198. By Renato Araujo Oliveira Filho on 2015-05-15

Merged 'lp:~boiko/history-service/fix_flags'

197. By Renato Araujo Oliveira Filho on 2015-05-15

Export new enuns into QML.

196. By Renato Araujo Oliveira Filho on 2015-05-15

Removed "startDate" and "endDate" from history model.

195. By Renato Araujo Oliveira Filho on 2015-05-14

Implemented support for date filter on historymodel.

Added property 'startDate' and 'endDate' on QML component 'HistoryModel'.

=== modified file 'Ubuntu/History/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2015-02-05 19:35:28 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2015-05-15 19:19:21 +0000
@@ -323,7 +323,9 @@
         querySort = mSort->sort();
     }
 
-    mView = History::Manager::instance()->queryEvents((History::EventType)mType, querySort, queryFilter);
+    mView = History::Manager::instance()->queryEvents((History::EventType)mType,
+                                                      querySort,
+                                                      queryFilter);
     connect(mView.data(),
             SIGNAL(eventsAdded(History::Events)),
             SLOT(onEventsAdded(History::Events)));

=== modified file 'Ubuntu/History/historymodel.cpp'
--- Ubuntu/History/historymodel.cpp	2015-04-01 20:05:39 +0000
+++ Ubuntu/History/historymodel.cpp	2015-05-15 19:19:21 +0000
@@ -28,6 +28,7 @@
 #include "textevent.h"
 #include "manager.h"
 #include "utils_p.h"
+#include "intersectionfilter.h"
 #include <QTimerEvent>
 #include <QCryptographicHash>
 #include <QDebug>
@@ -209,7 +210,7 @@
     History::TextEvent historyEvent = History::TextEvent(accountId,
                                                          threadId,
                                                          QString(QCryptographicHash::hash(QByteArray(
-                                                                 QDateTime::currentDateTime().toString().toLatin1()), 
+                                                                 QDateTime::currentDateTime().toString().toLatin1()),
                                                                  QCryptographicHash::Md5).toHex()),
                                                          "self",
                                                          QDateTime::currentDateTime(),

=== modified file 'Ubuntu/History/historymodel.h'
--- Ubuntu/History/historymodel.h	2015-04-01 20:05:39 +0000
+++ Ubuntu/History/historymodel.h	2015-05-15 19:19:21 +0000
@@ -28,6 +28,7 @@
 #include <QAbstractListModel>
 #include <QStringList>
 #include <QQmlParserStatus>
+#include <QDateTime>
 
 class HistoryModel : public QAbstractListModel, public QQmlParserStatus
 {
@@ -83,7 +84,7 @@
         AttachmentPending = History::AttachmentPending,
         AttachmentError = History::AttachmentError
     };
- 
+
     enum Role {
         AccountIdRole = Qt::UserRole,
         ThreadIdRole,

=== modified file 'Ubuntu/History/historyqmlfilter.h'
--- Ubuntu/History/historyqmlfilter.h	2013-09-17 21:04:09 +0000
+++ Ubuntu/History/historyqmlfilter.h	2015-05-15 19:19:21 +0000
@@ -39,7 +39,9 @@
         MatchCaseSensitive = History::MatchCaseSensitive,
         MatchCaseInsensitive = History::MatchCaseInsensitive,
         MatchContains = History::MatchContains,
-        MatchPhoneNumber = History::MatchPhoneNumber
+        MatchPhoneNumber = History::MatchPhoneNumber,
+        MatchLessOrEqual = History::MatchLessOrEqual,
+        MatchGreaterOrEqual = History::MatchGreaterOrEqual
     };
 
     explicit HistoryQmlFilter(QObject *parent = 0);
@@ -60,7 +62,7 @@
     void filterValueChanged();
     void matchFlagsChanged();
     void filterChanged();
-    
+
 protected:
     History::Filter mFilter;
 };

=== modified file 'plugins/sqlite/sqlitehistoryplugin.cpp'
--- plugins/sqlite/sqlitehistoryplugin.cpp	2015-01-28 23:15:24 +0000
+++ plugins/sqlite/sqlitehistoryplugin.cpp	2015-05-15 19:19:21 +0000
@@ -671,7 +671,6 @@
     QString result;
     History::Filters filters;
     QString linking;
-    QString value;
     int count;
     QString filterProperty = filter.filterProperty();
     QVariant filterValue = filter.filterValue();
@@ -713,6 +712,12 @@
         if (filter.matchFlags() & History::MatchContains) {
             // FIXME: maybe we should use QString("%1 LIKE '\%'||%2'\%'").arg(bindId) ?? needs more time for investigating
             result = QString("%1 LIKE '\%%2\%' ESCAPE '\\'").arg(propertyName, escapeFilterValue(filterValue.toString()));
+        } else if (filter.matchFlags() & History::MatchGreaterOrEqual) {
+            result = QString("%1>=%2").arg(propertyName, bindId);
+            bindValues[bindId] = filterValue;
+        } else if (filter.matchFlags() & History::MatchLessOrEqual) {
+            result = QString("%1<=%2").arg(propertyName, bindId);
+            bindValues[bindId] = filterValue;
         } else {
             result = QString("%1=%2").arg(propertyName, bindId);
             bindValues[bindId] = filterValue;

=== modified file 'src/filter.cpp'
--- src/filter.cpp	2015-01-07 21:59:30 +0000
+++ src/filter.cpp	2015-05-15 19:19:21 +0000
@@ -228,4 +228,48 @@
     return filter;
 }
 
+const Filter operator&(const Filter &left, const Filter &right)
+{
+    if (left.isValid() && right.isValid()) {
+        IntersectionFilter intersection;
+        if (left.type() == History::FilterTypeIntersection) {
+            intersection = static_cast<IntersectionFilter>(left);
+            intersection.append(right);
+        } else if (right.type() == History::FilterTypeIntersection) {
+            intersection = static_cast<IntersectionFilter>(right);
+            intersection.append(left);
+        } else {
+            intersection.append(left);
+            intersection.append(right);
+        }
+        return intersection;
+    } else if (left.isValid()) {
+        return left;
+    } else {
+        return right;
+    }
+}
+
+const Filter operator|(const Filter &left, const Filter &right)
+{
+    if (left.isValid() && right.isValid()) {
+        UnionFilter unionFilter;
+        if (left.type() == History::FilterTypeUnion) {
+            unionFilter = static_cast<UnionFilter>(left);
+            unionFilter.append(right);
+        } else if (right.type() == History::FilterTypeUnion) {
+            unionFilter = static_cast<UnionFilter>(right);
+            unionFilter.append(left);
+        } else {
+            unionFilter.append(left);
+            unionFilter.append(right);
+        }
+        return unionFilter;
+    } else if (left.isValid()) {
+        return left;
+    } else {
+        return right;
+    }
+}
+
 }

=== modified file 'src/filter.h'
--- src/filter.h	2013-10-23 19:35:23 +0000
+++ src/filter.h	2015-05-15 19:19:21 +0000
@@ -73,6 +73,9 @@
 
 typedef QList<Filter> Filters;
 
+const Filter operator&(const Filter& left, const Filter& right);
+const Filter operator|(const Filter& left, const Filter& right);
+
 }
 
 #endif

=== modified file 'src/intersectionfilter.h'
--- src/intersectionfilter.h	2013-10-23 19:35:23 +0000
+++ src/intersectionfilter.h	2015-05-15 19:19:21 +0000
@@ -45,7 +45,7 @@
     void setFilters(const Filters &filters);
     void prepend(const Filter &filter);
     void append(const Filter &filter);
-    void clear();    
+    void clear();
     Filters filters() const;
 
     static Filter fromProperties(const QVariantMap &properties);

=== modified file 'src/types.h'
--- src/types.h	2015-05-15 19:19:21 +0000
+++ src/types.h	2015-05-15 19:19:21 +0000
@@ -51,7 +51,9 @@
     MatchCaseSensitive = 0x01,
     MatchCaseInsensitive = 0x02,
     MatchContains = 0x04,
-    MatchPhoneNumber = 0x08
+    MatchPhoneNumber = 0x08,
+    MatchLessOrEqual = 0x10,
+    MatchGreaterOrEqual = 0x20
 };
 
 Q_DECLARE_FLAGS(MatchFlags, MatchFlag)

=== modified file 'tests/plugins/sqlite/SqliteEventViewTest.cpp'
--- tests/plugins/sqlite/SqliteEventViewTest.cpp	2013-12-09 21:18:14 +0000
+++ tests/plugins/sqlite/SqliteEventViewTest.cpp	2015-05-15 19:19:21 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 #include <QtTest/QtTest>
 #include "sqlitehistoryplugin.h"
 #include "sqlitedatabase.h"
@@ -38,6 +39,7 @@
     void initTestCase();
     void testNextPage();
     void testFilter();
+    void testDateFilter();
     void testSort();
 
 private:
@@ -99,6 +101,27 @@
     delete view;
 }
 
+void SqliteEventViewTest::testDateFilter()
+{
+    const QDateTime currentDate = QDateTime::currentDateTime();
+    History::IntersectionFilter iFilter =
+            History::Filter(History::FieldAccountId, "account0") &
+            History::Filter("timestamp", currentDate.addDays(-10).addSecs(-60), History::MatchGreaterOrEqual) &
+            History::Filter("timestamp", currentDate.addSecs(60), History::MatchLessOrEqual);
+
+    QScopedPointer<History::PluginEventView> view(mPlugin->queryEvents(History::EventTypeText,
+                                                                       History::Sort(History::FieldTimestamp),
+                                                                       iFilter));
+    QVERIFY(view->IsValid());
+    QList<QVariantMap> events = view->NextPage();
+    QCOMPARE(events.count(), 10);
+    for(int i=0; i < 10; i++) {
+        QVariantMap event = events.at(i);
+        QCOMPARE(event[History::FieldTimestamp].toDateTime().date().day(),
+                 currentDate.addDays(i-10).date().day());
+    }
+}
+
 void SqliteEventViewTest::testSort()
 {
     History::Sort ascendingSort(History::FieldEventId, Qt::AscendingOrder);
@@ -133,6 +156,7 @@
 
 void SqliteEventViewTest::populateDatabase()
 {
+    const QDateTime currentDate = QDateTime::currentDateTime();
     mPlugin->beginBatchOperation();
 
     // create two threads of each type
@@ -147,7 +171,7 @@
                                            voiceThread[History::FieldThreadId].toString(),
                                            QString("event%1").arg(j, 2, 10, QChar('0')),
                                            j % 2 ? "self" : QString("participant%1").arg(i),
-                                           QDateTime::currentDateTime(),
+                                           currentDate.addDays(j - EVENT_COUNT + 1),
                                            j % 2,
                                            j % 2,
                                            j % 2 ? QTime(i, j, 0) : QTime());
@@ -164,7 +188,7 @@
                                          textThread[History::FieldThreadId].toString(),
                                          QString("event%1").arg(j, 2, 10, QChar('0')),
                                          j % 2 ? "self" : QString("participant%1").arg(i),
-                                         QDateTime::currentDateTime(),
+                                         currentDate.addDays(j - EVENT_COUNT + 1),
                                          j % 2,
                                          QString("Hello %1").arg(j),
                                          History::MessageTypeText,