Merge pull request #772 from vtexier/dev

Fix UID missing in certifiers table #771

src/sakia/gui/navigation/identity/model.py

@@ -53,9 +53,11 @@ class IdentityModel(QObject):
     async def refresh_identity_data(self):
         identity = self.identities_service.get_identity(self.connection.pubkey, self.connection.uid)
         identity = await self.identities_service.load_requirements(identity)
-        certifiers = await self.identities_service.load_certifiers_of(identity)
-        certified = await self.identities_service.load_certified_by(identity)
-        await self.identities_service.load_certs_in_lookup(identity, certifiers, certified)
+
+        # update identities in database from the network
+        await self.identities_service.initialize_certifications(identity, None, None)
+
+        # update identities from database
         self.table_model.init_certifiers()
 
     def table_data(self, index):

src/sakia/services/identities.py

@@ -237,29 +237,35 @@ class IdentitiesService(QObject):
             logging.debug(str(e))
         return certifications
 
-    async def initialize_certifications(self, identity, log_stream, progress):
+    async def initialize_certifications(self, identity, log_stream=None, progress=None):
         """
         Initialize certifications to and from a given identity
         :param sakia.data.entities.Identity identity:
-        :param function log_stream:
-        :param function progress:
+        :param function log_stream: Logger function
+        :param function progress: Progress function for progress bar
         """
+        if log_stream:
             log_stream("Requesting certifiers of data")
         certifiers = await self.load_certifiers_of(identity)
 
+        if log_stream:
             log_stream("Requesting certified by data")
         certified = await self.load_certified_by(identity)
 
+        if log_stream:
             log_stream("Requesting lookup data")
         certifiers, certified = await self.load_certs_in_lookup(identity, certifiers, certified)
 
+        if log_stream:
             log_stream("Requesting identities of certifications")
         identities = []
         i = 0
         nb_certs = len(certified + certifiers)
         for cert in certifiers:
+            if log_stream:
                 log_stream("Requesting identity... {0}/{1}".format(i, nb_certs))
             i += 1
+            if progress:
                 progress(1/nb_certs)
             certifier = self.get_identity(cert.certifier)
             if not certifier:
@@ -268,15 +274,17 @@ class IdentitiesService(QObject):
                 identities.append(certifier)
 
         for cert in certified:
+            if log_stream:
                 log_stream("Requesting identity... {0}/{1}".format(i, nb_certs))
             i += 1
+            if progress:
                 progress(1/nb_certs)
             certified = self.get_identity(cert.certified)
             if not certified:
                 certified = await self.find_from_pubkey(cert.certified)
                 certified = await self.load_requirements(certified)
                 identities.append(certified)
-
+        if log_stream:
             log_stream("Commiting identities...")
         for idty in identities:
             self._identities_processor.insert_or_update_identity(idty)