contributions: better update_contributions

Co-Authored-by: Peter Weber <[email protected]>
rero · Mar 10, 2022 · f844062 · f844062
1 parent dc23eae
commit f844062
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/rero_ils/config.py b/rero_ils/config.py
@@ -397,7 +397,7 @@ def _(x):
         # Every week on Saturday at 22:22 UTC,
         'enabled': False
     },
-    'replace_idby-subjects': {
+    'replaceidby-subjects': {
         'task': ('rero_ils.modules.documents.tasks.replace_idby_subjects'),
         'schedule': crontab(minute=22, hour=22, day_of_week=6),
         # Every week on Saturday at 22:22 UTC,

diff --git a/rero_ils/modules/contributions/api.py b/rero_ils/modules/contributions/api.py
@@ -239,20 +239,29 @@ def get_authorized_access_point(self, language):
             language=language
         )
 
-    def documents_pids(self, with_subjects=True):
+    def _search_documents(self, with_subjects=True):
         """Get documents pids."""
         search_filters = Q("term", contribution__agent__pid=self.pid)
         if with_subjects:
             subject_filters = Q("term", subjects__pid=self.pid) & \
                 Q("terms", subjects__type=['bf:Person', 'bf:Organisation'])
             search_filters = search_filters | subject_filters
 
-        search = DocumentsSearch() \
-            .query('bool', filter=[search_filters]) \
-            .source('pid')
+        return DocumentsSearch() \
+            .query('bool', filter=[search_filters])
 
+    def documents_pids(self, with_subjects=True):
+        """Get documents pids."""
+        search = self._search_documents(
+            with_subjects=with_subjects).source('pid')
         return [hit.pid for hit in search.scan()]
 
+    def documents_ids(self, with_subjects=True):
+        """Get documents ids."""
+        search = self._search_documents(
+            with_subjects=with_subjects).source('pid')
+        return [hit.meta.id for hit in search.scan()]
+
     def update_online(self, dbcommit=False, reindex=False, verbose=False):
         """Update record online.
 
@@ -273,24 +282,37 @@ def update_online(self, dbcommit=False, reindex=False, verbose=False):
                     current_app.logger.warning(
                         f'UPDATE ONLINE {pid}: was deleted')
                     action = ContributionUpdateAction.ERROR
-                elif not metadata['sources']:
+                elif not metadata.get('sources'):
                     current_app.logger.warning(
                         f'UPDATE ONLINE {pid}: has no sources')
                     action = ContributionUpdateAction.ERROR
+                elif not metadata.get('type'):
+                    current_app.logger.warning(
+                        f'UPDATE ONLINE {pid}: has no type')
+                    action = ContributionUpdateAction.ERROR
                 elif dict(self) != metadata:
                     action = ContributionUpdateAction.REPLACE
                     self.replace(data=metadata, dbcommit=dbcommit,
                                  reindex=reindex)
                     if reindex:
                         indexer = DocumentsIndexer()
-                        indexer.bulk_index(self.documents_pids())
+                        indexer.bulk_index(self.documents_ids())
                         indexer.process_bulk_queue()
         except Exception as err:
             action = ContributionUpdateAction.ERROR
             current_app.logger.warning(f'UPDATE ONLINE {pid}: {err}')
             # TODO: find new MEF record
         return action, self
 
+    def source_pids(self):
+        """Get agents pids."""
+        sources = current_app.config.get('RERO_ILS_CONTRIBUTIONS_SOURCES', [])
+        pids = {}
+        for source in sources:
+            if source in self:
+                pids[source] = self[source]['pid']
+        return pids
+
 
 class ContributionsIndexer(IlsRecordsIndexer):
     """Contribution indexing class."""

diff --git a/rero_ils/modules/contributions/tasks.py b/rero_ils/modules/contributions/tasks.py
@@ -100,16 +100,18 @@ def update_contributions(pids=None, dbcommit=True, reindex=True, verbose=False,
     pids = pids or Contribution.get_all_pids()
     log = {}
     error_pids = []
-    for pid in pids:
+    if verbose:
+        click.echo(f'Contribution update: {len(pids)}')
+    for idx, pid in enumerate(pids):
         cont = Contribution.get_record_by_pid(pid)
         msg, _ = cont.update_online(dbcommit=dbcommit, reindex=reindex,
                                     verbose=verbose)
         log.setdefault(msg, 0)
+        log[msg] += 1
         if verbose and msg != ContributionUpdateAction.UPTODATE:
-            click.echo(f'{pid:>10}: {msg}')
+            click.echo(f'{idx:>10} mef:{pid:>10} {msg} {cont.source_pids()}')
         if ContributionUpdateAction.ERROR:
             error_pids.append(pid)
-        log[msg] += 1
     if timestamp:
         set_timestamp('update_contributions', **log)
     return log, error_pids