dsw-database 4.17.0__tar.gz → 4.18.1__tar.gz

{dsw_database-4.17.0/dsw_database.egg-info → dsw_database-4.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.17.0
+Version: 4.18.1
 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.17.0
+Requires-Dist: dsw-config==4.18.1
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

{dsw_database-4.17.0 → dsw_database-4.18.1}/dsw/database/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.17.0~ac8947f',
-    built_at='2025-04-01 06:47:43Z',
-    sha='ac8947fd0b7824e803d28f8d15215263a810aee8',
+    version='v4.18.1~91c8ad3',
+    built_at='2025-05-08 06:40:31Z',
+    sha='91c8ad3de64417b0caecd45420300dbfe2b2ae08',
     branch='HEAD',
-    tag='v4.17.0',
+    tag='v4.18.1',
 )

{dsw_database-4.17.0 → dsw_database-4.18.1}/dsw/database/database.py

@@ -13,7 +13,8 @@ from dsw.config.model import DatabaseConfig
 from .model import DBDocumentTemplate, DBDocumentTemplateFile, \
     DBDocumentTemplateAsset, DBDocument, DBComponent, \
     DocumentState, DBTenantConfig, DBTenantLimits, DBSubmission, \
-    DBInstanceConfigMail, DBQuestionnaireSimple
+    DBInstanceConfigMail, DBQuestionnaireSimple, \
+    DBUserEntity, DBLocale
 
 LOG = logging.getLogger(__name__)
 
@@ -59,10 +60,8 @@ class Database:
                               'WHERE document_template_id = %s AND tenant_uuid = %s;')
     CHECK_TABLE_EXISTS = ('SELECT EXISTS(SELECT * FROM information_schema.tables'
                           '                       WHERE table_name = %(table_name)s)')
-    SELECT_MAIL_CONFIG = ('SELECT icm.* '
-                          'FROM tenant_config tc JOIN instance_config_mail icm '
-                          'ON tc.mail_config_uuid = icm.uuid '
-                          'WHERE tc.uuid = %(tenant_uuid)s;')
+    SELECT_MAIL_CONFIG = ('SELECT * FROM instance_config_mail '
+                          'WHERE uuid = %(mail_config_uuid)s;')
     UPDATE_COMPONENT_INFO = ('INSERT INTO component '
                              '(name, version, built_at, created_at, updated_at) '
                              'VALUES (%(name)s, %(version)s, %(built_at)s, '
@@ -78,6 +77,14 @@ class Database:
                       '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) '
                       'FROM questionnaire_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;')
+    SELECT_DEFAULT_LOCALE = ('SELECT * FROM locale '
+                             'WHERE default_locale IS TRUE AND '
+                             '  enabled is TRUE AND '
+                             '  tenant_uuid = %(tenant_uuid)s;')
+    SELECT_LOCALE = ('SELECT * FROM locale '
+                     'WHERE id = %(locale_id)s AND tenant_uuid = %(tenant_uuid)s;')
 
     def __init__(self, cfg: DatabaseConfig, connect: bool = True,
                  with_queue: bool = True):
@@ -397,24 +404,99 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def get_mail_config(self, tenant_uuid: str) -> DBInstanceConfigMail | None:
+    def get_mail_config(self, mail_config_uuid: str) -> DBInstanceConfigMail | None:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             if not self._check_table_exists(table_name='instance_config_mail'):
                 return None
             try:
                 cursor.execute(
                     query=self.SELECT_MAIL_CONFIG,
-                    params={'tenant_uuid': tenant_uuid},
+                    params={'mail_config_uuid': mail_config_uuid},
                 )
                 result = cursor.fetchone()
                 if result is None:
                     return None
                 return DBInstanceConfigMail.from_dict_row(data=result)
             except Exception as e:
-                LOG.warning('Could not retrieve instance_config_mail for tenant "%s": %s',
+                LOG.warning('Could not retrieve instance_config_mail "%s": %s',
+                            mail_config_uuid, str(e))
+                return None
+
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_QUERY_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def get_user(self, user_uuid: str, tenant_uuid: str) -> DBUserEntity | None:
+        if not self._check_table_exists(table_name='user_entity'):
+            return None
+        with self.conn_query.new_cursor(use_dict=True) as cursor:
+            try:
+                cursor.execute(
+                    query=self.SELECT_USER,
+                    params={'user_uuid': user_uuid, 'tenant_uuid': tenant_uuid},
+                )
+                result = cursor.fetchone()
+                if result is None:
+                    return None
+                return DBUserEntity.from_dict_row(data=result)
+            except Exception as e:
+                LOG.warning('Could not retrieve user "%s" for tenant "%s": %s',
+                            user_uuid, tenant_uuid, str(e))
+                return None
+
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_QUERY_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def get_default_locale(self, tenant_uuid: str) -> DBLocale | None:
+        if not self._check_table_exists(table_name='locale'):
+            return None
+        with self.conn_query.new_cursor(use_dict=True) as cursor:
+            try:
+                cursor.execute(
+                    query=self.SELECT_DEFAULT_LOCALE,
+                    params={'tenant_uuid': tenant_uuid},
+                )
+                result = cursor.fetchone()
+                if result is None:
+                    return None
+                return DBLocale.from_dict_row(data=result)
+            except Exception as e:
+                LOG.warning('Could not retrieve default locale for tenant "%s": %s',
                             tenant_uuid, str(e))
                 return None
 
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_QUERY_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def get_locale(self, locale_id: str, tenant_uuid: str) -> DBLocale | None:
+        if not self._check_table_exists(table_name='locale'):
+            return None
+        with self.conn_query.new_cursor(use_dict=True) as cursor:
+            try:
+                cursor.execute(
+                    query=self.SELECT_LOCALE,
+                    params={'locale_id': locale_id, 'tenant_uuid': tenant_uuid},
+                )
+                result = cursor.fetchone()
+                if result is None:
+                    return None
+                return DBLocale.from_dict_row(data=result)
+            except Exception as e:
+                LOG.warning('Could not retrieve locale "%s" for tenant "%s": %s',
+                            locale_id, tenant_uuid, str(e))
+                return None
+
     @tenacity.retry(
         reraise=True,
         wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),

{dsw_database-4.17.0 → dsw_database-4.18.1}/dsw/database/model.py

@@ -382,6 +382,48 @@ class DBQuestionnaireSimple:
         }
 
 
+@dataclasses.dataclass
+class DBUserEntity:
+    TABLE_NAME = 'user_entity'
+
+    uuid: str
+    first_name: str
+    last_name: str
+    email: str
+    locale: str | None
+
+    @staticmethod
+    def from_dict_row(data: dict):
+        return DBUserEntity(
+            uuid=str(data['uuid']),
+            first_name=data['first_name'],
+            last_name=data['last_name'],
+            email=data['email'],
+            locale=data['locale'],
+        )
+
+
+@dataclasses.dataclass
+class DBLocale:
+    TABLE_NAME = 'locale'
+
+    id: str
+    name: str
+    code: str
+    default_locale: bool
+    enabled: bool
+
+    @staticmethod
+    def from_dict_row(data: dict):
+        return DBLocale(
+            id=str(data['id']),
+            name=data['name'],
+            code=data['code'],
+            default_locale=data['default_locale'],
+            enabled=data['enabled'],
+        )
+
+
 @dataclasses.dataclass
 class DBInstanceConfigMail:
     TABLE_NAME = 'instance_config_mail'

{dsw_database-4.17.0 → dsw_database-4.18.1/dsw_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.17.0
+Version: 4.18.1
 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.17.0
+Requires-Dist: dsw-config==4.18.1
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

{dsw_database-4.17.0 → dsw_database-4.18.1}/dsw_database.egg-info/requires.txt

@@ -1,3 +1,3 @@
 psycopg[binary]
 tenacity
-dsw-config==4.17.0
+dsw-config==4.18.1

{dsw_database-4.17.0 → dsw_database-4.18.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "4.17.0"
+version = "4.18.1"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==4.17.0",
+    "dsw-config==4.18.1",
 ]
 
 [project.urls]