Merge lp:~boiko/history-service/rtm-store_remote_participant_id into lp:history-service/rtm-14.09

[Gustavo Pichorim Boiko]

Store the number that was used to call a given voice event.

Store the number that was used to call a given voice event.

=== modified file 'Ubuntu/History/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2015-01-09 11:59:27 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2015-02-10 17:31:22 +0000
@@ -45,6 +45,7 @@
     mRoles[TextReadSubjectRole] = "textSubject";
     mRoles[CallMissedRole] = "callMissed";
     mRoles[CallDurationRole] = "callDuration";
+    mRoles[RemoteParticipantRole] = "remoteParticipant";
 }
 
 int HistoryEventModel::rowCount(const QModelIndex &parent) const
@@ -153,6 +154,11 @@
             result = voiceEvent.duration();
         }
         break;
+    case RemoteParticipantRole:
+        if (!voiceEvent.isNull()) {
+            result = voiceEvent.remoteParticipant();
+        }
+        break;
     }
 
     return result;

=== modified file 'Ubuntu/History/historyeventmodel.h'
--- Ubuntu/History/historyeventmodel.h	2015-01-09 11:59:27 +0000
+++ Ubuntu/History/historyeventmodel.h	2015-02-10 17:31:22 +0000
@@ -46,6 +46,7 @@
         TextMessageAttachmentsRole,
         CallMissedRole,
         CallDurationRole,
+        RemoteParticipantRole,
         LastEventRole
     };
 

=== modified file 'daemon/historydaemon.cpp'
--- daemon/historydaemon.cpp	2014-09-23 12:30:29 +0000
+++ daemon/historydaemon.cpp	2015-02-10 17:31:22 +0000
@@ -363,6 +363,8 @@
     event[History::FieldNewEvent] = missed; // only mark as a new (unseen) event if it is a missed call
     event[History::FieldMissed] = missed;
     event[History::FieldDuration] = duration;
+    // FIXME: check what to do when there are more than just one remote participant
+    event[History::FieldRemoteParticipant] = participants[0];
     writeEvents(QList<QVariantMap>() << event);
 }
 

=== added file 'plugins/sqlite/schema/v11.sql'
--- plugins/sqlite/schema/v11.sql	1970-01-01 00:00:00 +0000
+++ plugins/sqlite/schema/v11.sql	2015-02-10 17:31:22 +0000
@@ -0,0 +1,6 @@
+ALTER TABLE voice_events ADD COLUMN remoteParticipant varchar(255);
+UPDATE voice_events SET remoteParticipant=(SELECT participantId FROM thread_participants
+                                           WHERE thread_participants.accountId = voice_events.accountId
+                                           AND thread_participants.threadId = voice_events.threadId
+                                           AND thread_participants.type = 1
+                                           LIMIT 1);

=== modified file 'plugins/sqlite/sqlitehistoryplugin.cpp'
--- plugins/sqlite/sqlitehistoryplugin.cpp	2015-01-28 23:15:01 +0000
+++ plugins/sqlite/sqlitehistoryplugin.cpp	2015-02-10 17:31:22 +0000
@@ -381,13 +381,14 @@
     History::EventWriteResult result;
     if (existingEvent.isEmpty()) {
         // create new
-        query.prepare("INSERT INTO voice_events (accountId, threadId, eventId, senderId, timestamp, newEvent, duration, missed) "
-                      "VALUES (:accountId, :threadId, :eventId, :senderId, :timestamp, :newEvent, :duration, :missed)");
+        query.prepare("INSERT INTO voice_events (accountId, threadId, eventId, senderId, timestamp, newEvent, duration, missed, remoteParticipant) "
+                      "VALUES (:accountId, :threadId, :eventId, :senderId, :timestamp, :newEvent, :duration, :missed, :remoteParticipant)");
         result = History::EventWriteCreated;
     } else {
         // update existing event
         query.prepare("UPDATE voice_events SET senderId=:senderId, timestamp=:timestamp, newEvent=:newEvent, duration=:duration, "
-                      "missed=:missed WHERE accountId=:accountId AND threadId=:threadId AND eventId=:eventId");
+                      "missed=:missed, remoteParticipant=:remoteParticipant "
+                      "WHERE accountId=:accountId AND threadId=:threadId AND eventId=:eventId");
 
         result = History::EventWriteModified;
     }
@@ -400,6 +401,7 @@
     query.bindValue(":newEvent", event[History::FieldNewEvent]);
     query.bindValue(":duration", event[History::FieldDuration]);
     query.bindValue(":missed", event[History::FieldMissed]);
+    query.bindValue(":remoteParticipant", event[History::FieldRemoteParticipant]);
 
     if (!query.exec()) {
         qCritical() << "Failed to save the voice event: Error:" << query.lastError() << query.lastQuery();
@@ -484,7 +486,7 @@
         break;
     case History::EventTypeVoice:
         table = "voice_events";
-        extraFields << "voice_events.duration" << "voice_events.missed";
+        extraFields << "voice_events.duration" << "voice_events.missed" << "voice_events.remoteParticipant";
         break;
     }
 
@@ -557,6 +559,7 @@
         case History::EventTypeVoice:
             thread[History::FieldMissed] = query.value(10);
             thread[History::FieldDuration] = query.value(9);
+            thread[History::FieldRemoteParticipant] = query.value(11);
             break;
         }
         threads << thread;
@@ -585,7 +588,7 @@
     case History::EventTypeVoice:
         participantsField = participantsField.arg("voice_events", QString::number(type));
         queryText = QString("SELECT accountId, threadId, eventId, senderId, timestamp, newEvent, %1, "
-                            "duration, missed FROM voice_events %2 %3").arg(participantsField, modifiedCondition, order);
+                            "duration, missed, remoteParticipant FROM voice_events %2 %3").arg(participantsField, modifiedCondition, order);
         break;
     }
 
@@ -649,6 +652,7 @@
         case History::EventTypeVoice:
             event[History::FieldDuration] = query.value(7).toInt();
             event[History::FieldMissed] = query.value(8);
+            event[History::FieldRemoteParticipant] = query.value(9);
             break;
         }
 

=== modified file 'src/tests/VoiceEventTest.cpp'
--- src/tests/VoiceEventTest.cpp	2014-09-25 18:27:15 +0000
+++ src/tests/VoiceEventTest.cpp	2015-02-10 17:31:22 +0000
@@ -46,16 +46,21 @@
     QTest::addColumn<bool>("newEvent");
     QTest::addColumn<bool>("missed");
     QTest::addColumn<QTime>("duration");
+    QTest::addColumn<QString>("remoteParticipant");
+    QTest::addColumn<QStringList>("participants");
 
     QTest::newRow("unread missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << true << true << QTime(0, 0, 0);
+                                 << true << true << QTime(0, 0, 0) << QString("remoteParticipant")
+                                 << (QStringList() << "testSenderId");
     QTest::newRow("missed call") << "testAccountId2" << "testThreadId2" << "testEventId2"
                                  << "testSenderId2" << QDateTime::currentDateTime().addDays(-5)
-                                 << false << true << QTime(0, 0, 0);
+                                 << false << true << QTime(0, 0, 0) << QString("remoteParticipant2")
+                                 << (QStringList() << "testSenderId2");
     QTest::newRow("not missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << false << false << QTime(1, 2, 3);
+                                 << false << false << QTime(1, 2, 3) << QString("remoteParticipant")
+                                 << (QStringList() << "testSenderId");
 }
 
 void VoiceEventTest::testCreateNewEvent()
@@ -68,8 +73,10 @@
     QFETCH(bool, newEvent);
     QFETCH(bool, missed);
     QFETCH(QTime, duration);
+    QFETCH(QString, remoteParticipant);
+    QFETCH(QStringList, participants);
     History::VoiceEvent event(accountId, threadId, eventId, senderId, timestamp, newEvent,
-                              missed, duration);
+                              missed, duration, remoteParticipant, participants);
 
     // check that the values are properly set
     QCOMPARE(event.accountId(), accountId);
@@ -80,12 +87,14 @@
     QCOMPARE(event.newEvent(), newEvent);
     QCOMPARE(event.missed(), missed);
     QCOMPARE(event.duration(), duration);
+    QCOMPARE(event.remoteParticipant(), remoteParticipant);
+    QCOMPARE(event.participants(), participants);
 }
 
 void VoiceEventTest::testCastToEventAndBack()
 {
     History::VoiceEvent voiceEvent("oneAccountId", "oneThreadId", "oneEventId", "oneSender", QDateTime::currentDateTime(),
-                                   true, true, QTime(1,2,3));
+                                   true, true, QTime(1,2,3), "remoteParticipant", QStringList() << "oneParticipant");
 
     // test the copy constructor
     History::Event historyEvent(voiceEvent);
@@ -112,16 +121,17 @@
     QTest::addColumn<bool>("newEvent");
     QTest::addColumn<bool>("missed");
     QTest::addColumn<QTime>("duration");
+    QTest::addColumn<QStringList>("participants");
 
     QTest::newRow("unread missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << true << true << QTime(0, 0, 0);
+                                 << true << true << QTime(0, 0, 0) << (QStringList() << "testParticipant");
     QTest::newRow("missed call") << "testAccountId2" << "testThreadId2" << "testEventId2"
                                  << "testSenderId2" << QDateTime::currentDateTime().addDays(-5)
-                                 << false << true << QTime(0, 0, 0);
+                                 << false << true << QTime(0, 0, 0) << (QStringList() << "testParticipant2");
     QTest::newRow("not missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << false << false << QTime(1, 2, 3);
+                                 << false << false << QTime(1, 2, 3) << (QStringList() << "testParticipant");
 }
 
 void VoiceEventTest::testFromProperties()
@@ -134,6 +144,7 @@
     QFETCH(bool, newEvent);
     QFETCH(bool, missed);
     QFETCH(QTime, duration);
+    QFETCH(QStringList, participants);
 
     QVariantMap properties;
     properties[History::FieldAccountId] = accountId;
@@ -144,6 +155,7 @@
     properties[History::FieldNewEvent] = newEvent;
     properties[History::FieldMissed] = missed;
     properties[History::FieldDuration] = QTime(0,0,0,0).secsTo(duration);
+    properties[History::FieldParticipants] = participants;
 
     History::VoiceEvent voiceEvent = History::VoiceEvent::fromProperties(properties);
     QCOMPARE(voiceEvent.accountId(), accountId);
@@ -154,6 +166,7 @@
     QCOMPARE(voiceEvent.newEvent(), newEvent);
     QCOMPARE(voiceEvent.missed(), missed);
     QCOMPARE(voiceEvent.duration(), duration);
+    QCOMPARE(voiceEvent.participants(), participants);
 }
 
 void VoiceEventTest::testFromNullProperties()
@@ -174,16 +187,21 @@
     QTest::addColumn<bool>("newEvent");
     QTest::addColumn<bool>("missed");
     QTest::addColumn<QTime>("duration");
+    QTest::addColumn<QString>("remoteParticipant");
+    QTest::addColumn<QStringList>("participants");
 
     QTest::newRow("unread missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << true << true << QTime(0, 0, 0);
+                                 << true << true << QTime(0, 0, 0) << QString("remoteParticipant")
+                                 << (QStringList() << "testParticipant");
     QTest::newRow("missed call") << "testAccountId2" << "testThreadId2" << "testEventId2"
                                  << "testSenderId2" << QDateTime::currentDateTime().addDays(-5)
-                                 << false << true << QTime(0, 0, 0);
+                                 << false << true << QTime(0, 0, 0) << QString("remoteParticipant2")
+                                 << (QStringList() << "testParticipant2");
     QTest::newRow("not missed call") << "testAccountId" << "testThreadId" << "testEventId"
                                  << "testSenderId" << QDateTime::currentDateTime().addDays(-10)
-                                 << false << false << QTime(1, 2, 3);
+                                 << false << false << QTime(1, 2, 3) << QString("remoteParticipant3")
+                                 << (QStringList() << "testParticipant3");
 }
 
 void VoiceEventTest::testProperties()
@@ -196,8 +214,10 @@
     QFETCH(bool, newEvent);
     QFETCH(bool, missed);
     QFETCH(QTime, duration);
+    QFETCH(QString, remoteParticipant);
+    QFETCH(QStringList, participants);
     History::VoiceEvent event(accountId, threadId, eventId, senderId, timestamp, newEvent,
-                              missed, duration);
+                              missed, duration, remoteParticipant, participants);
 
     // check that the values are properly set
     QVariantMap properties = event.properties();
@@ -209,6 +229,8 @@
     QCOMPARE(properties[History::FieldNewEvent].toBool(), newEvent);
     QCOMPARE(properties[History::FieldMissed].toBool(), missed);
     QCOMPARE(QTime(0,0).addSecs(properties[History::FieldDuration].toInt()), duration);
+    QCOMPARE(properties[History::FieldRemoteParticipant].toString(), remoteParticipant);
+    QCOMPARE(properties[History::FieldParticipants].toStringList(), participants);
 }
 
 QTEST_MAIN(VoiceEventTest)

=== modified file 'src/types.h'
--- src/types.h	2014-09-22 13:27:29 +0000
+++ src/types.h	2015-02-10 17:31:22 +0000
@@ -132,6 +132,7 @@
 // voice event fields
 static const char* FieldMissed = "missed";
 static const char* FieldDuration = "duration";
+static const char* FieldRemoteParticipant = "remoteParticipant";
 
 // sort stuff
 static const char* FieldSortField = "sortField";

=== modified file 'src/voiceevent.cpp'
--- src/voiceevent.cpp	2013-10-08 21:06:20 +0000
+++ src/voiceevent.cpp	2015-02-10 17:31:22 +0000
@@ -38,9 +38,11 @@
                                    const QDateTime &theTimestamp,
                                    bool theNewEvent,
                                    bool theMissed,
-                                   const QTime &theDuration, const QStringList &theParticipants)
+                                   const QTime &theDuration,
+                                   const QString &theRemoteParticipant,
+                                   const QStringList &theParticipants)
     : EventPrivate(theAccountId, theThreadId, theEventId, theSender, theTimestamp, theNewEvent, theParticipants),
-      missed(theMissed), duration(theDuration)
+      missed(theMissed), duration(theDuration), remoteParticipant(theRemoteParticipant)
 {
 }
 
@@ -59,6 +61,7 @@
 
     map[FieldMissed] = missed;
     map[FieldDuration] = QTime(0,0,0,0).secsTo(duration);
+    map[FieldRemoteParticipant] = remoteParticipant;
 
     return map;
 }
@@ -81,8 +84,10 @@
                      const QDateTime &timestamp,
                      bool newEvent,
                      bool missed,
-                     const QTime &duration, const QStringList &participants)
-    : Event(*new VoiceEventPrivate(accountId, threadId, eventId, sender, timestamp, newEvent, missed, duration, participants))
+                     const QTime &duration,
+                     const QString &remoteParticipant,
+                     const QStringList &participants)
+    : Event(*new VoiceEventPrivate(accountId, threadId, eventId, sender, timestamp, newEvent, missed, duration, remoteParticipant, participants))
 {
 }
 
@@ -102,6 +107,12 @@
     return d->duration;
 }
 
+QString VoiceEvent::remoteParticipant() const
+{
+    Q_D(const VoiceEvent);
+    return d->remoteParticipant;
+}
+
 Event VoiceEvent::fromProperties(const QVariantMap &properties)
 {
     Event event;
@@ -117,8 +128,9 @@
     QStringList participants = properties[FieldParticipants].toStringList();
     bool missed = properties[FieldMissed].toBool();
     QTime duration = QTime(0,0,0).addSecs(properties[FieldDuration].toInt());
+    QString remoteParticipant = properties[FieldRemoteParticipant].toString();
     event = VoiceEvent(accountId, threadId, eventId, senderId, timestamp, newEvent,
-                             missed, duration, participants);
+                             missed, duration, remoteParticipant, participants);
     return event;
 }
 

=== modified file 'src/voiceevent.h'
--- src/voiceevent.h	2013-09-26 21:06:50 +0000
+++ src/voiceevent.h	2015-02-10 17:31:22 +0000
@@ -45,6 +45,7 @@
                bool newEvent,
                bool missed,
                const QTime &duration = QTime(),
+               const QString &remoteParticipant = QString::null,
                const QStringList &participants = QStringList());
     ~VoiceEvent();
 
@@ -55,6 +56,12 @@
     bool missed() const;
     QTime duration() const;
 
+    /***
+     * Returns the ID of the remote participant.
+     * On incoming calls that's the same as the sender() property
+     */
+    QString remoteParticipant() const;
+
     static Event fromProperties(const QVariantMap &properties);
 };
 

=== modified file 'src/voiceevent_p.h'
--- src/voiceevent_p.h	2013-09-26 21:06:50 +0000
+++ src/voiceevent_p.h	2015-02-10 17:31:22 +0000
@@ -39,10 +39,12 @@
                     bool theNewEvent,
                     bool theMissed,
                     const QTime &theDuration,
+                    const QString &theRemoteParticipant,
                     const QStringList &theParticipants);
     ~VoiceEventPrivate();
     bool missed;
     QTime duration;
+    QString remoteParticipant;
 
     EventType type() const;
     QVariantMap properties() const;