Make it possible to set the attachment key when creating a basket

opengisch · Sep 24, 2024 · 6106469 · 6106469
1 parent 39b6748
commit 6106469
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/modelbaker/dbconnector/db_connector.py b/modelbaker/dbconnector/db_connector.py
@@ -343,7 +343,9 @@ def get_classes_relevance(self):
         """
         return []
 
-    def create_basket(self, dataset_tid, topic, tilitid_value=None):
+    def create_basket(
+        self, dataset_tid, topic, tilitid_value=None, attachment_key="modelbaker"
+    ):
         """
         Returns the state and the errormessage
         """

diff --git a/modelbaker/dbconnector/gpkg_connector.py b/modelbaker/dbconnector/gpkg_connector.py
@@ -917,7 +917,9 @@ def get_classes_relevance(self):
             return contents
         return []
 
-    def create_basket(self, dataset_tid, topic, tilitid_value=None):
+    def create_basket(
+        self, dataset_tid, topic, tilitid_value=None, attachment_key="modelbaker"
+    ):
         if self._table_exists(GPKG_BASKET_TABLE):
             cursor = self.conn.cursor()
             cursor.execute(
@@ -951,7 +953,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                 cursor.execute(
                     """
                     INSERT INTO "{basket_table}" ("{tid_name}", dataset, topic, "{tilitid_name}", attachmentkey )
-                    VALUES (?, ?, ?, ?, 'modelbaker')
+                    VALUES (?, ?, ?, ?, ?)
                     """.format(
                         tid_name=self.tid,
                         tilitid_name=self.tilitid,
@@ -962,6 +964,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                         dataset_tid,
                         topic,
                         tilitid_value,
+                        attachment_key,
                     ),
                 )
                 self.conn.commit()

diff --git a/modelbaker/dbconnector/mssql_connector.py b/modelbaker/dbconnector/mssql_connector.py
@@ -1054,7 +1054,9 @@ def get_classes_relevance(self):
             result = self._get_dict_result(cur)
         return result
 
-    def create_basket(self, dataset_tid, topic, tilitid_value=None):
+    def create_basket(
+        self, dataset_tid, topic, tilitid_value=None, attachment_key="modelbaker"
+    ):
         if self.schema and self._table_exists(BASKET_TABLE):
             cur = self.conn.cursor()
             cur.execute(
@@ -1081,7 +1083,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                 cur.execute(
                     """
                     INSERT INTO {schema}.{basket_table} ({tid_name}, dataset, topic, {tilitid_name}, attachmentkey )
-                    VALUES (NEXT VALUE FOR {schema}.{sequence}, {dataset_tid}, '{topic}', {tilitid}, 'modelbaker')
+                    VALUES (NEXT VALUE FOR {schema}.{sequence}, {dataset_tid}, '{topic}', {tilitid}, {attachment_key})
                 """.format(
                         schema=self.schema,
                         sequence="t_ili2db_seq",
@@ -1091,6 +1093,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                         dataset_tid=dataset_tid,
                         topic=topic,
                         tilitid=tilitid_value,
+                        attachment_key=attachment_key,
                     )
                 )
                 self.conn.commit()

diff --git a/modelbaker/dbconnector/pg_connector.py b/modelbaker/dbconnector/pg_connector.py
@@ -1101,7 +1101,9 @@ def get_classes_relevance(self):
             return cur.fetchall()
         return []
 
-    def create_basket(self, dataset_tid, topic, tilitid_value=None):
+    def create_basket(
+        self, dataset_tid, topic, tilitid_value=None, attachment_key="modelbaker"
+    ):
         if self.schema and self._table_exists(PG_BASKET_TABLE):
             cur = self.conn.cursor()
             cur.execute(
@@ -1129,7 +1131,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                     sql.SQL(
                         """
                         INSERT INTO {schema}.{basket_table} ({tid_name}, dataset, topic, {tilitid_name}, attachmentkey)
-                        VALUES (nextval(%s), %s, %s, %s, 'modelbaker')
+                        VALUES (nextval(%s), %s, %s, %s, %s)
                         """
                     ).format(
                         schema=sql.Identifier(self.schema),
@@ -1142,6 +1144,7 @@ def create_basket(self, dataset_tid, topic, tilitid_value=None):
                         dataset_tid,
                         topic,
                         tilitid_value,
+                        attachment_key,
                     ),
                 )
                 self.conn.commit()