database: migrate to per account database

Gitlab: #407
Change-Id: I834cf0d216dfd9e6badab8d7aab951b8875c1bd6

CMakeLists.txt

@@ -280,7 +280,7 @@ SET( libringclient_LIB_SRCS
   src/conversationmodel.cpp
   src/database.cpp
   src/authority/daemon.cpp
-  src/authority/databasehelper.cpp
+  src/authority/storagehelper.cpp
   src/lrc.cpp
   src/newaccountmodel.cpp
   src/peerdiscoverymodel.cpp

src/api/call.h

@@ -131,7 +131,7 @@ struct Info
     std::chrono::steady_clock::time_point startTime;
     Status status = Status::INVALID;
     Type type = Type::INVALID;
-    std::string peer;
+    std::string peerUri;
     bool isOutgoing;
     bool audioMuted = false;
     bool videoMuted = false;

src/api/contact.h

@@ -33,6 +33,13 @@ namespace api
 namespace contact
 {
 
+/**
+ * @var profileInfo
+ * @var registeredName
+ * @var isTrusted
+ * @var isPresent
+ * @var isBanned
+ */
 struct Info
 {
     profile::Info profileInfo;

src/api/contactmodel.h

@@ -57,7 +57,7 @@ public:
     const account::Info& owner;
 
     ContactModel(const account::Info& owner,
-                 Database& database,
+                 Database& db,
                  const CallbacksHandler& callbacksHandler,
                  const BehaviorController& behaviorController);
     ~ContactModel();
@@ -85,18 +85,6 @@ public:
      * @return list of banned contacts uris as string
      */
     const std::list<std::string>& getBannedContacts() const;
-    /**
-     * @param  uri
-     * @param  isAccount
-     * @return empty string if no contact, else the uri in db
-     */
-    const std::string getProfileId(const std::string &ur, bool isAccount = false) const;
-    /**
-     * @deprecated use getProfileId
-     * @param  contactUri
-     * @return empty string if no contact, else the uri in db
-     */
-    const std::string getContactProfileId(const std::string& contactUri) const;
     /**
      * @return all contacts for this account.
      */

src/api/interaction.h

@@ -36,8 +36,8 @@ enum class Type {
     TEXT,
     CALL,
     CONTACT,
-    OUTGOING_DATA_TRANSFER,
-    INCOMING_DATA_TRANSFER
+    DATA_TRANSFER,
+    COUNT__
 };
 
 static inline const std::string
@@ -50,11 +50,10 @@ to_string(const Type& type)
         return "CALL";
     case Type::CONTACT:
         return "CONTACT";
-    case Type::OUTGOING_DATA_TRANSFER:
-        return "OUTGOING_DATA_TRANSFER";
-    case Type::INCOMING_DATA_TRANSFER:
-        return "INCOMING_DATA_TRANSFER";
+    case Type::DATA_TRANSFER:
+        return "DATA_TRANSFER";
     case Type::INVALID:
+    case Type::COUNT__:
     default:
         return "INVALID";
     }
@@ -69,24 +68,19 @@ to_type(const std::string& type)
         return interaction::Type::CALL;
     else if (type == "CONTACT")
         return interaction::Type::CONTACT;
-    else if (type == "OUTGOING_DATA_TRANSFER")
-        return interaction::Type::OUTGOING_DATA_TRANSFER;
-    else if (type == "INCOMING_DATA_TRANSFER")
-        return interaction::Type::INCOMING_DATA_TRANSFER;
+    else if (type == "DATA_TRANSFER")
+        return interaction::Type::DATA_TRANSFER;
     else
         return interaction::Type::INVALID;
 }
 
-
 enum class Status {
     INVALID,
     UNKNOWN,
     SENDING,
-    FAILED,
-    SUCCEED,
-    READ,
-    UNREAD,
-    TRANSFER_CREATED, /*[jn] mettre à jour les fonctions de conversion */
+    FAILURE,
+    SUCCESS,
+    TRANSFER_CREATED,
     TRANSFER_ACCEPTED,
     TRANSFER_CANCELED,
     TRANSFER_ERROR,
@@ -95,7 +89,8 @@ enum class Status {
     TRANSFER_AWAITING_PEER,
     TRANSFER_AWAITING_HOST,
     TRANSFER_TIMEOUT_EXPIRED,
-    TRANSFER_FINISHED
+    TRANSFER_FINISHED,
+    COUNT__
 };
 
 static inline const std::string
@@ -106,14 +101,10 @@ to_string(const Status& status)
         return "UNKNOWN";
     case Status::SENDING:
         return "SENDING";
-    case Status::FAILED:
-        return "FAILED";
-    case Status::SUCCEED:
-        return "SUCCEED";
-    case Status::READ:
-        return "READ";
-    case Status::UNREAD:
-        return "UNREAD";
+    case Status::FAILURE:
+        return "FAILURE";
+    case Status::SUCCESS:
+        return "SUCCESS";
     case Status::TRANSFER_CREATED:
         return "TRANSFER_CREATED";
     case Status::TRANSFER_ACCEPTED:
@@ -135,6 +126,7 @@ to_string(const Status& status)
     case Status::TRANSFER_FINISHED:
         return "TRANSFER_FINISHED";
     case Status::INVALID:
+    case Status::COUNT__:
     default:
         return "INVALID";
     }
@@ -144,56 +136,60 @@ static inline Status
 to_status(const std::string& status)
 {
     if (status == "UNKNOWN")
-        return interaction::Status::UNKNOWN;
+        return Status::UNKNOWN;
     else if (status == "SENDING")
-        return interaction::Status::SENDING;
-    else if (status == "FAILED")
-        return interaction::Status::FAILED;
-    else if (status == "SUCCEED")
-        return interaction::Status::SUCCEED;
-    else if (status == "READ")
-        return interaction::Status::READ;
-    else if (status == "UNREAD")
-        return interaction::Status::UNREAD;
+        return Status::SENDING;
+    else if (status == "FAILURE")
+        return Status::FAILURE;
+    else if (status == "SUCCESS")
+        return Status::SUCCESS;
     else if (status == "TRANSFER_CREATED")
-        return interaction::Status::TRANSFER_CREATED;
+        return Status::TRANSFER_CREATED;
     else if (status == "TRANSFER_ACCEPTED")
-        return interaction::Status::TRANSFER_ACCEPTED;
+        return Status::TRANSFER_ACCEPTED;
     else if (status == "TRANSFER_CANCELED")
-        return interaction::Status::TRANSFER_CANCELED;
+        return Status::TRANSFER_CANCELED;
     else if (status == "TRANSFER_ERROR")
-        return interaction::Status::TRANSFER_ERROR;
+        return Status::TRANSFER_ERROR;
     else if (status == "TRANSFER_UNJOINABLE_PEER")
-        return interaction::Status::TRANSFER_UNJOINABLE_PEER;
+        return Status::TRANSFER_UNJOINABLE_PEER;
     else if (status == "TRANSFER_ONGOING")
-        return interaction::Status::TRANSFER_ONGOING;
+        return Status::TRANSFER_ONGOING;
     else if (status == "TRANSFER_AWAITING_HOST")
-        return interaction::Status::TRANSFER_AWAITING_HOST;
+        return Status::TRANSFER_AWAITING_HOST;
     else if (status == "TRANSFER_AWAITING_PEER")
-        return interaction::Status::TRANSFER_AWAITING_PEER;
+        return Status::TRANSFER_AWAITING_PEER;
     else if (status == "TRANSFER_TIMEOUT_EXPIRED")
-        return interaction::Status::TRANSFER_TIMEOUT_EXPIRED;
+        return Status::TRANSFER_TIMEOUT_EXPIRED;
     else if (status == "TRANSFER_FINISHED")
-        return interaction::Status::TRANSFER_FINISHED;
+        return Status::TRANSFER_FINISHED;
     else
-        return interaction::Status::INVALID;
+        return Status::INVALID;
 
 }
 
+/**
+ * @var authorUri
+ * @var body
+ * @var timestamp
+ * @var duration
+ * @var type
+ * @var status
+ * @var isRead
+ */
 struct Info
 {
     std::string authorUri;
     std::string body;
     std::time_t timestamp = 0;
+    std::time_t duration = 0;
     Type type = Type::INVALID;
     Status status = Status::INVALID;
+    bool isRead = false;
 };
 
 static inline bool isOutgoing(const Info& interaction) {
-    return (interaction.status != lrc::api::interaction::Status::READ
-    && interaction.status != lrc::api::interaction::Status::UNREAD
-    && interaction.type != lrc::api::interaction::Type::INCOMING_DATA_TRANSFER)
-    || interaction.type == lrc::api::interaction::Type::OUTGOING_DATA_TRANSFER;
+    return interaction.authorUri.empty();
 }
 
 } // namespace interaction

src/api/lrc.h

@@ -41,7 +41,15 @@ class AVModel;
 
 class LIB_EXPORT Lrc {
 public:
-    Lrc();
+    /**
+     * Construct an Lrc object and optionally invoke callbacks
+     * to control ui informing the user of a possibly lengthy
+     * migration process.
+     * @param willMigrateCb
+     * @param didMigrateCb
+     */
+    Lrc(MigrationCb willMigrateCb = {},
+        MigrationCb didMigrateCb = {});
     ~Lrc();
     /**
      * get a reference on account model.
@@ -77,6 +85,10 @@ public:
      * Can communicate with the daemon via dbus
      */
     static bool dbusIsValid();
+    /**
+     * Connect to debugMessageReceived signal
+     */
+    void subscribeToDebugReceived();
 
     /**
      * Helper: get call list from daemon

src/api/newaccountmodel.h

@@ -53,12 +53,11 @@ class BehaviorController;
 class LIB_EXPORT NewAccountModel : public QObject {
     Q_OBJECT
 public:
-    using AccountInfoMap = std::map<std::string, account::Info>;
-
     NewAccountModel(Lrc& lrc,
-                    Database& database,
                     const CallbacksHandler& callbackHandler,
-                    const api::BehaviorController& behaviorController);
+                    const api::BehaviorController& behaviorController,
+                    MigrationCb& willMigrateCb,
+                    MigrationCb& didMigrateCb);
 
     ~NewAccountModel();
     /**
@@ -173,13 +172,13 @@ public:
      * Set an account to the first position
      */
     void setTopAccount(const std::string& accountId);
+
     /**
-     * Build the vCard for an account
+     * Get the vCard for an account
      * @param id
      * @return vcard of the account
      */
     std::string accountVCard(const std::string& accountId, bool compressImage = true) const;
-    std::string compressedAvatar(const std::string& img) const;
 
 Q_SIGNALS:
     /**

src/api/newcallmodel.h

@@ -72,11 +72,12 @@ public:
 
     /**
      * Create a new call with a contact
-     * @param  url of the contact to call
+     * @param  uri of the contact to call
      * @param  isAudioOnly, set to false by default
      * @return the call uid created. Empty string is returned if call couldn't be created.
      */
-    std::string createCall(const std::string& url, bool isAudioOnly = false);
+    std::string createCall(const std::string& uri, bool isAudioOnly = false);
+
     /**
      * Get the call from its call id
      * @param  uid
@@ -84,6 +85,7 @@ public:
      * @throw out_of_range exception if not found
      */
     const call::Info& getCall(const std::string& uid) const;
+
     /**
      * Get the call from the peer uri
      * @param  uri
@@ -92,6 +94,7 @@ public:
      * @throw out_of_range exception if not found
      */
     const call::Info& getCallFromURI(const std::string& uri, bool notOver = false) const;
+
     /**
      * Get conference from a peer uri
      * @param  uri
@@ -99,11 +102,13 @@ public:
      * @throw out_of_range exception if not found
      */
     const call::Info& getConferenceFromURI(const std::string& uri) const;
+
     /**
      * @param  callId to test
      * @return true if callId is presend else false.
      */
     bool hasCall(const std::string& callId) const;
+
     /**
      * Send a text message to a SIP call
      * @param callId
@@ -116,64 +121,76 @@ public:
      * @param callId
      */
     void accept(const std::string& callId) const;
+
     /**
      * Hang up a call
      * @param callId
      */
     void hangUp(const std::string& callId) const;
+
     /**
      * Refuse a call
      * @param callId
      */
     void refuse(const std::string& callId) const;
+
     /**
      * Toggle audio record on a call
      * @param callId
      */
     void toggleAudioRecord(const std::string& callId) const;
+
     /**
      * Play DTMF in a call
      * @param callId
      * @param value to play
      */
     void playDTMF(const std::string& callId, const std::string& value) const;
+
     /**
      * Toggle pause on a call
      * @param callId
      */
     void togglePause(const std::string& callId) const;
+
     /**
      * Toggle a media on a call
      * @param callId
      * @param media {AUDIO, VIDEO}
      */
     void toggleMedia(const std::string& callId, const NewCallModel::Media media) const;
+
     /**
      * Not implemented yet
      */
     void setQuality(const std::string& callId, const double quality) const;
+
     /**
      * Blind transfer. Directly transfer a call to a sip number
      * @param callId: the call to transfer
      * @param to: the sip number (for example: "sip:1412")
      */
     void transfer(const std::string& callId, const std::string& to) const;
+
     /**
      * Perform an attended. Transfer a call to another call
      * @param callIdSrc: the call to transfer
      * @param callIdDest: the destination's call
      */
     void transferToCall(const std::string& callIdSrc, const std::string& callIdDest) const;
+
     /**
      * Create a conference from 2 calls.
      * @param callIdA uid of the call A
      * @param callIdB uid of the call B
      */
     void joinCalls(const std::string& callIdA, const std::string& callIdB) const;
+
     /**
      * Not implemented yet
      */
     void removeParticipant(const std::string& callId, const std::string& participant) const;
+
     /**
      * @param  callId
      * @return a human readable call duration (M:ss)

src/api/profile.h

@@ -35,7 +35,8 @@ enum class Type {
     RING,
     SIP,
     PENDING,
-    TEMPORARY
+    TEMPORARY,
+    COUNT__
 };
 
 static inline const std::string
@@ -51,6 +52,7 @@ to_string(const Type& type)
     case Type::TEMPORARY:
         return "TEMPORARY";
     case Type::INVALID:
+    case Type::COUNT__:
     default:
         return "INVALID";
     }
@@ -71,6 +73,12 @@ to_type(const std::string& type)
         return Type::INVALID;
 }
 
+/**
+ * @var uri
+ * @var avatar
+ * @var alias
+ * @var type
+ */
 struct Info
 {
     std::string uri = "";

src/authority/databasehelper.h → src/authority/storagehelper.h

 /****************************************************************************
- *    Copyright (C) 2017-2019 Savoir-faire Linux Inc.                             *
+ *    Copyright (C) 2017-2019 Savoir-faire Linux Inc.                       *
  *   Author: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>             *
  *   Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>           *
  *   Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>       *
+ *   Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>         *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
@@ -37,96 +38,114 @@ struct Info;
 namespace authority
 {
 
-namespace database
+namespace storage
 {
 
 /**
- * Get id from database for a given uri
- * @param db
- * @param accountId
- * @param isAccount
- * @param uri
- * @return the id
- * @note "" if no id
- */
-std::string getProfileId(Database& db,
-            const std::string& accountId,
-            const std::string& isAccount,
-            const std::string& uri="");
-
- /**
- * Get id for a profile. If the profile doesn't exist, create it.
- * @param db
- * @param contactUri
- * @param accountId
- * @param isAccount
- * @param alias
- * @param avatar
- * @return the id
+ * Get the base path for the application's local storage
+ * @return local storage path
+ */
+QString getPath();
+
+/**
+ * Get a formatted for local storage
+ * @param uri that may have a scheme prefixed
+ * @param type of account for which to transform the uri
+ * @return formatted uri
+ */
+std::string prepareUri(const std::string& uri, api::profile::Type type);
+
+/**
+ * Get a formatted string for a call interaction's body
+ * @param author_uri
+ * @param duration of the call
+ * @return the formatted and translated call message string
+ */
+std::string
+getCallInteractionString(const std::string& authorUri,
+                         const std::time_t& duration);
+
+/**
+ * Get a formatted string for a contact interaction's body
+ * @param author_uri
+ * @param status
+ * @return the formatted and translated call message string
+ */
+std::string
+getContactInteractionString(const std::string& authorUri,
+                            const api::interaction::Status& status);
+
+namespace vcard
+{
+
+/**
+ * Build the vCard for a profile
+ * @param profileInfo
+ * @param compressImage
+ * @return vcard string of the profile
+ */
+std::string profileToVcard(const api::profile::Info& profileInfo,
+                           bool compressImage = false);
+
+} // namespace vcard
+
+/**
+ * @param  duration
+ * @return a human readable call duration (M:ss)
  */
- std::string getOrInsertProfile(Database& db,
-                                const std::string& contactUri,
-                                const std::string& accountId,
-                                bool  isAccount,
-                                const std::string& type,
-                                const std::string& alias = "",
-                                const std::string& avatar = "");
+std::string getFormattedCallDuration(const std::time_t duration);
 
 /**
- * Get conversations for a given profile.
+ * Get all conversations with a given participant's URI
  * @param db
- * @param profileId
+ * @param participant_uri
  */
-std::vector<std::string> getConversationsForProfile(Database& db,
-                                                    const std::string& profileId);
+std::vector<std::string> getConversationsWithPeer(Database& db,
+                                                  const std::string& participant_uri);
 
 /**
- * Get peer participant for a conversation linked to a profile.
+ * Get all peer participant(s) URIs for a given conversation id
  * @param db
- * @param profileId
  * @param conversationId
- * @note we don't verify if profileId is in the conversation
  */
 std::vector<std::string> getPeerParticipantsForConversation(Database& db,
-                                                            const std::string& profileId,
                                                             const std::string& conversationId);
 
 /**
- * @param  db
- * @param  profileId
- * @return the avatar in the database for a profile
- */
-std::string getAvatarForProfileId(Database& db, const std::string& profileId);
-
-/**
- * Check if the profile could be removed
- * @param  db
- * @param  profileId
+ * Creates or updates a contact or account vCard file with profile data.
+ * @param  accountId
+ * @param  profileInfo the contact info containing peer profile information
+ * @param  isPeer indicates that a the profileInfo is that of a peer
  */
-bool profileCouldBeRemoved(Database& db, const std::string& profileId);
+void createOrUpdateProfile(const std::string& accountId,
+                           const api::profile::Info& profileInfo,
+                           const bool isPeer = false);
 
 /**
- * @param  db
- * @param  profileId
- * @param  avatar
+ * Gets the account's avatar from the profile.vcf file
+ * @param  accountId
+ * @return the account's base64 avatar
  */
-void setAvatarForProfileId(Database& db, const std::string& profileId, const std::string& avatar);
+std::string
+getAccountAvatar(const std::string& accountId);
 
 /**
- * @param  db
- * @param  profileId
- * @return the alias in the database for a profile
+ * Build a contact info struct from a vCard
+ * @param  accountId
+ * @param  peer_uri
+ * @param  type of contact to build
+ * @return the contact info containing peer profile information
  */
-std::string getAliasForProfileId(Database& db, const std::string& profileId);
+api::contact::Info buildContactFromProfile(const std::string & accountId,
+                                           const std::string& peer_uri,
+                                           const api::profile::Type& type);
 
 /**
- * @param  db
- * @param  profileId
- * @param  alias
+ * Get all conversations for an account in the database.
+ * @param db
+ * @return conversations id for all conversations
  */
-void setAliasForProfileId(Database& db, const std::string& profileId, const std::string& alias);
-
-api::contact::Info buildContactFromProfileId(Database& db, const std::string& profileId);
+std::vector<std::string> getAllConversations(Database& db);
 
 /**
  * Get conversations shared between an account and a contact.
@@ -143,15 +162,13 @@ std::vector<std::string> getConversationsBetween(Database& db,
  * Start a conversation between account and contact. Creates an entry in the conversations table
  * and an entry in the interactions table.
  * @param db
- * @param accountProfile the id of the account in the database
- * @param contactProfile the id of the contact in the database