dsw-database 4.25.0__py2.py3-none-any.whl → 4.26.0__py2.py3-none-any.whl

dsw/database/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.25.0~db7f23b',
-    built_at='2025-12-02 08:22:28Z',
-    sha='db7f23bc582af31b06a5af41a3420190451f86e9',
+    version='v4.26.0~6fb9cb8',
+    built_at='2026-01-06 12:20:06Z',
+    sha='6fb9cb8a23068c7f699e72b0d22ff975db2ead69',
     branch='HEAD',
-    tag='v4.25.0',
+    tag='v4.26.0',
 )

dsw/database/database.py

@@ -14,7 +14,7 @@ from dsw.config.model import DatabaseConfig
 from .model import DBDocumentTemplate, DBDocumentTemplateFile, \
     DBDocumentTemplateAsset, DBDocument, DBComponent, \
     DocumentState, DBTenantLimits, DBSubmission, \
-    DBInstanceConfigMail, DBQuestionnaireSimple, \
+    DBInstanceConfigMail, DBProjectSimple, \
     DBUserEntity, DBLocale, DBDocumentTemplateFormat, \
     DBDocumentTemplateStep
 
@@ -36,15 +36,15 @@ class Database:
 
     SELECT_DOCUMENT = ('SELECT * FROM document '
                        'WHERE uuid = %s AND tenant_uuid = %s LIMIT 1;')
-    SELECT_QTN_DOCUMENTS = ('SELECT * FROM document '
-                            'WHERE questionnaire_uuid = %s AND tenant_uuid = %s;')
+    SELECT_DOCUMENTS = ('SELECT * FROM document '
+                        'WHERE project_uuid = %s AND tenant_uuid = %s;')
     SELECT_DOCUMENT_SUBMISSIONS = ('SELECT * FROM submission '
                                    'WHERE document_uuid = %s AND tenant_uuid = %s;')
-    SELECT_QTN_SUBMISSIONS = ('SELECT s.* '
-                              'FROM document d JOIN submission s ON d.uuid = s.document_uuid '
-                              'WHERE d.questionnaire_uuid = %s AND d.tenant_uuid = %s;')
-    SELECT_QTN_SIMPLE = ('SELECT qtn.* FROM questionnaire qtn '
-                         'WHERE qtn.uuid = %s AND qtn.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 '
                            'WHERE uuid = %(tenant_uuid)s LIMIT 1;')
     UPDATE_DOCUMENT_STATE = 'UPDATE document SET state = %s, worker_log = %s WHERE uuid = %s;'
@@ -79,7 +79,7 @@ class Database:
                       '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) '
                       'FROM document_template_asset WHERE tenant_uuid = %(tenant_uuid)s) '
                       '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) '
-                      'FROM questionnaire_file WHERE tenant_uuid = %(tenant_uuid)s) '
+                      'FROM project_file WHERE tenant_uuid = %(tenant_uuid)s) '
                       'AS result;')
     SELECT_USER = ('SELECT * FROM user_entity '
                    'WHERE uuid = %(user_uuid)s AND tenant_uuid = %(tenant_uuid)s;')
@@ -205,14 +205,10 @@ class Database:
                 query=self.SELECT_TEMPLATE_STEPS,
                 params=(template_id, tenant_uuid),
             )
-            print(f'Format results: {formats_result}')
-            print(f'Formats: {formats}')
             steps_result = cursor.fetchall()
             steps = sorted([
                 DBDocumentTemplateStep.from_dict_row(x) for x in steps_result
             ], key=lambda x: x.position)
-            print(f'Steps results: {formats_result}')
-            print(f'Steps: {steps}')
             steps_dict: dict[str, list[dict]] = {}
             for step in steps:
                 if step.format_uuid not in steps_dict:
@@ -227,7 +223,6 @@ class Database:
                     'name': format_obj.name,
                     'steps': steps_dict.get(format_obj.uuid, []),
                 })
-            print(template.formats)
         return template
 
     @tenacity.retry(
@@ -271,12 +266,11 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_qtn_documents(self, questionnaire_uuid: str,
-                            tenant_uuid: str) -> list[DBDocument]:
+    def fetch_project_documents(self, project_uuid: str, tenant_uuid: str) -> list[DBDocument]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
-                query=self.SELECT_QTN_DOCUMENTS,
-                params=(questionnaire_uuid, tenant_uuid),
+                query=self.SELECT_DOCUMENTS,
+                params=(project_uuid, tenant_uuid),
             )
             return [DBDocument.from_dict_row(x) for x in cursor.fetchall()]
 
@@ -303,12 +297,12 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_questionnaire_submissions(self, questionnaire_uuid: str,
-                                        tenant_uuid: str) -> list[DBSubmission]:
+    def fetch_project_submissions(self, project_uuid: str,
+                                  tenant_uuid: str) -> list[DBSubmission]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
-                query=self.SELECT_QTN_SUBMISSIONS,
-                params=(questionnaire_uuid, tenant_uuid),
+                query=self.SELECT_PROJECT_SUBMISSIONS,
+                params=(project_uuid, tenant_uuid),
             )
             return [DBSubmission.from_dict_row(x) for x in cursor.fetchall()]
 
@@ -319,14 +313,14 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_questionnaire_simple(self, questionnaire_uuid: str,
-                                   tenant_uuid: str) -> DBQuestionnaireSimple:
+    def fetch_project_simple(self, project_uuid: str,
+                             tenant_uuid: str) -> DBProjectSimple:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
-                query=self.SELECT_QTN_SIMPLE,
-                params=(questionnaire_uuid, tenant_uuid),
+                query=self.SELECT_PROJECT_SIMPLE,
+                params=(project_uuid, tenant_uuid),
             )
-            return DBQuestionnaireSimple.from_dict_row(cursor.fetchone())
+            return DBProjectSimple.from_dict_row(cursor.fetchone())
 
     @tenacity.retry(
         reraise=True,

dsw/database/model.py

@@ -45,9 +45,9 @@ class DBDocument:
     name: str
     state: str
     durability: str
-    questionnaire_uuid: str
-    questionnaire_event_uuid: str
-    questionnaire_replies_hash: str
+    project_uuid: str | None
+    project_event_uuid: str | None
+    project_replies_hash: str
     document_template_id: str
     format_uuid: str
     file_name: str
@@ -62,14 +62,16 @@ class DBDocument:
 
     @staticmethod
     def from_dict_row(data: dict):
+        project_uuid = data['project_uuid']
+        event_uuid = data['project_event_uuid']
         return DBDocument(
             uuid=str(data['uuid']),
             name=data['name'],
             state=data['state'],
             durability=data['durability'],
-            questionnaire_uuid=str(data['questionnaire_uuid']),
-            questionnaire_event_uuid=str(data['questionnaire_event_uuid']),
-            questionnaire_replies_hash=data['questionnaire_replies_hash'],
+            project_uuid=str(project_uuid) if project_uuid else None,
+            project_event_uuid=str(event_uuid) if event_uuid else None,
+            project_replies_hash=data['project_replies_hash'],
             document_template_id=data['document_template_id'],
             format_uuid=str(data['format_uuid']),
             created_by=str(data['created_by']),
@@ -323,10 +325,10 @@ class DBSubmission:
 
 
 @dataclasses.dataclass
-class DBQuestionnaireSimple:
+class DBProjectSimple:
     # without: events, answered_questions, unanswered_questions,
     #          squashed, versions, selected_question_tag_uuids
-    TABLE_NAME = 'questionnaire'
+    TABLE_NAME = 'project'
 
     uuid: str
     name: str
@@ -345,7 +347,7 @@ class DBQuestionnaireSimple:
 
     @staticmethod
     def from_dict_row(data: dict):
-        return DBQuestionnaireSimple(
+        return DBProjectSimple(
             uuid=str(data['uuid']),
             name=data['name'],
             visibility=data['visibility'],

{dsw_database-4.25.0.dist-info → dsw_database-4.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.25.0
+Version: 4.26.0
 Summary: Library for managing DSW database
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.25.0
+Requires-Dist: dsw-config==4.26.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

dsw_database-4.26.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+dsw/database/__init__.py,sha256=58ZXZ8i4xzAvvjUdqt8lvdv28hD0yzY_xxI6n9deynw,55
+dsw/database/build_info.py,sha256=p3lrVLUBRLrO68MdoD1aP83OJiH3VGII05wYI-hBRbU,381
+dsw/database/database.py,sha256=Wy-DPFeTQQZlWImZS1XYUtGeJMccA9Yql7qkzn7A8uM,27116
+dsw/database/model.py,sha256=hjtLfZ0UsetgJYGl2LsOhgSrVpIL_K0Squm8g4f_R5o,13612
+dsw_database-4.26.0.dist-info/licenses/LICENSE,sha256=rDtJ4LdsXvf_euOpGD0Q86P78K4JyM5m4yfYz9wZ750,11346
+dsw_database-4.26.0.dist-info/METADATA,sha256=I8e_8UIG9wcaBTaqDfBTEYrHLHnx_v6MIBU1tVAZKAA,1843
+dsw_database-4.26.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+dsw_database-4.26.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
+dsw_database-4.26.0.dist-info/RECORD,,

dsw_database-4.25.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-dsw/database/__init__.py,sha256=58ZXZ8i4xzAvvjUdqt8lvdv28hD0yzY_xxI6n9deynw,55
-dsw/database/build_info.py,sha256=1mQtlgs6eFHdZrfR1EjC3dAj-bMfwwa38JDdWMx9Cpg,381
-dsw/database/database.py,sha256=2hXcU-txscH6qtKz1CT_JHIChdH4G_PgSNcIA6s4Tv8,27457
-dsw/database/model.py,sha256=ECUNCxbzRuy8dPjEWY1dAkaY1AmdobH6DPGBQPZaaKY,13552
-dsw_database-4.25.0.dist-info/licenses/LICENSE,sha256=rDtJ4LdsXvf_euOpGD0Q86P78K4JyM5m4yfYz9wZ750,11346
-dsw_database-4.25.0.dist-info/METADATA,sha256=VaZaYa3lNb6BeqgcDICOo0NBNJORSP79aAF44cHH1Do,1843
-dsw_database-4.25.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-dsw_database-4.25.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
-dsw_database-4.25.0.dist-info/RECORD,,