fix(docworker): Fix enriching document context

Author: MarekSuchanek

packages/dsw-database/dsw/database/database.py

@@ -40,9 +40,9 @@ class Database:
                         'WHERE project_uuid = %s AND tenant_uuid = %s;')
     SELECT_DOCUMENT_SUBMISSIONS = ('SELECT * FROM submission '
                                    'WHERE document_uuid = %s AND tenant_uuid = %s;')
-    SELECT_SUBMISSIONS = ('SELECT s.* '
-                          'FROM document d JOIN submission s ON d.uuid = s.document_uuid '
-                          'WHERE d.project_uuid = %s AND d.tenant_uuid = %s;')
+    SELECT_PROJECT_SUBMISSIONS = ('SELECT s.* '
+                                  'FROM document d JOIN submission s ON d.uuid = s.document_uuid '
+                                  'WHERE d.project_uuid = %s AND d.tenant_uuid = %s;')
     SELECT_PROJECT_SIMPLE = ('SELECT p.* FROM project p '
                              'WHERE p.uuid = %s AND p.tenant_uuid = %s;')
     SELECT_TENANT_LIMIT = ('SELECT uuid, storage FROM tenant_limit_bundle '
@@ -303,10 +303,10 @@ def fetch_document_submissions(self, document_uuid: str,
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
     def fetch_project_submissions(self, project_uuid: str,
-                          tenant_uuid: str) -> list[DBSubmission]:
+                                  tenant_uuid: str) -> list[DBSubmission]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
-                query=self.SELECT_SUBMISSIONS,
+                query=self.SELECT_PROJECT_SUBMISSIONS,
                 params=(project_uuid, tenant_uuid),
             )
             return [DBSubmission.from_dict_row(x) for x in cursor.fetchall()]

packages/dsw-document-worker/dsw/document_worker/worker.py

@@ -35,7 +35,7 @@ def handled_step(job, *args, **kwargs):
             try:
                 return func(job, *args, **kwargs)
             except Exception as e:
-                LOG.debug('Handling exception', exc_info=True)
+                LOG.info('Handling exception', exc_info=True)
                 new_exception = create_job_exception(
                     job_id=job.doc_uuid,
                     message=message,
@@ -159,9 +159,9 @@ def _enrich_context_config(self):
                          self.ctx.app.cfg.context.default_primary_color)
         illustrations_color = (old.get('illustrationsColor', None) or
                                self.ctx.app.cfg.context.default_illustrations_color)
-        logo_url = (old.get('logoUrl', None) or
-                    self.ctx.app.cfg.context.default_logo_url)
-        logo_url.replace('{{clientUrl}}', client_url)
+        logo_url_template = (old.get('logoUrl', None) or
+                             self.ctx.app.cfg.context.default_logo_url)
+        logo_url = logo_url_template.replace('{{clientUrl}}', client_url)
 
         self.doc_context['config'].update({
             'serviceName': self.ctx.app.cfg.context.service_name,
@@ -187,11 +187,18 @@ def _enrich_context(self):
                 )
             extras['submissions'] = [s.to_dict() for s in submissions]
         if self.safe_format.requires_via_extras('questionnaire'):
+            # older deprecated variant (questionnaire -> project)
             questionnaire = self.ctx.app.db.fetch_project_simple(
                 project_uuid=self.safe_doc.project_uuid,
                 tenant_uuid=self.tenant_uuid,
             )
             extras['questionnaire'] = questionnaire.to_dict()
+        if self.safe_format.requires_via_extras('project'):
+            project = self.ctx.app.db.fetch_project_simple(
+                project_uuid=self.safe_doc.project_uuid,
+                tenant_uuid=self.tenant_uuid,
+            )
+            extras['project'] = project.to_dict()
         self.doc_context['extras'] = extras
         self._enrich_context_config()