basic functionality of loading/saving for initial recording with new data model

src/wce_crm/backend/backend.py

@@ -402,11 +402,16 @@ def page_initrec_to_db(
 
             from_db = ret.mappings().fetchall()
             assert len(from_db) == 1, "expected excactly one returned row"
-            data_from_db = from_db[0]
+            data_from_db = dict(from_db[0])
+            data_from_db = _rename_db_data(
+                data_from_db, FIELD_DB_MAPPING_GRUNDERERFASSUNG_PERSONEN
+            )
 
             data.ids.pers_id = data_from_db["pers_id"]
             data.geloescht = data_from_db["geloescht"]
-            data.form_data.person["Metadaten_aktualisierung"] = data_from_db["aktualisiert"]
+            data.form_data.person["Metadaten_aktualisierung"] = data_from_db[
+                "Metadaten_aktualisierung"
+            ]
 
             logger.debug("[AutoForm -- backend] Inserted InitRec Person successfully")
 
@@ -416,7 +421,7 @@ def page_initrec_to_db(
                 db.t_grunderfassung_personen.update()
                 .where(db.t_grunderfassung_personen.c.pers_id == data.ids.pers_id)
                 .returning(
-                    db.t_grunderfassung_personen.c.Metadaten_aktualisierung,
+                    db.t_grunderfassung_personen.c.aktualisiert,
                     db.t_grunderfassung_personen.c.geloescht,
                 )
             )
@@ -424,7 +429,10 @@ def page_initrec_to_db(
 
             from_db = ret.mappings().fetchall()
             assert len(from_db) == 1, "expected excatly one returned row"
-            data_from_db = from_db[0]
+            data_from_db = dict(from_db[0])
+            data_from_db = _rename_db_data(
+                data_from_db, FIELD_DB_MAPPING_GRUNDERERFASSUNG_PERSONEN
+            )
 
             data.geloescht = data_from_db["geloescht"]
             data.form_data.person["Metadaten_aktualisierung"] = data_from_db[
@@ -450,14 +458,28 @@ def page_initrec_to_db(
             )
             conn.execute(stmt)
 
-            # additional information
+            # additional information --> linking table
             dump_data = _rename_db_data(
                 data.form_data.company, FIELD_DB_MAPPING_GRUNDERERFASSUNG_UNTERNEHMEN
             )
-            dump_data["geloescht"] = data.geloescht
+            logger.debug(
+                "[InitRec -- backend] Company - additional info: Dump Data = \n%s",
+                pformat(dump_data),
+            )
+            if "un_id" not in dump_data:
+                # only case when updated
+                dump_data["un_id"] = data.ids.un_id
+                dump_data["an_id"] = data.ids.an_id
+
             stmt = sqlite_insert(db.t_zuordnung_personen_unternehmen).values(
                 **dump_data, pers_id=data.ids.pers_id
             )
+            # dump_data["geloescht"] = data.geloescht
+            # logger.debug(
+            #     "[InitRec -- backend] Company - additional info: Dump Data = \n%s",
+            #     pformat(dump_data),
+            # )
+
             stmt = stmt.on_conflict_do_update(
                 index_elements=["un_id", "pers_id"],
                 index_where=sa.text("geloescht IS NULL"),
@@ -465,13 +487,17 @@ def page_initrec_to_db(
                     "an_id": stmt.excluded.an_id,
                     "Partnersuche__kanal_aufmerksamkeit": stmt.excluded.Partnersuche__kanal_aufmerksamkeit,
                     "aktualisiert": datetime.datetime.now(datetime.UTC),
+                    "geloescht": data.geloescht,
                 },
             ).returning(db.t_zuordnung_personen_unternehmen.c.id)
             ret = conn.execute(stmt)
 
             from_db = ret.mappings().fetchall()
             assert len(from_db) == 1, "expected excatly one returned row"
-            data_from_db = from_db[0]
+            data_from_db = dict(from_db[0])
+            data_from_db = _rename_db_data(
+                data_from_db, FIELD_DB_MAPPING_GRUNDERERFASSUNG_UNTERNEHMEN
+            )
             data.ids.link_id = data_from_db["id"]
 
     return data
@@ -480,35 +506,18 @@ def page_initrec_to_db(
 def page_initrec_from_db(
     ids: EntityIds,
 ) -> InitRec:
+    logger.debug("[InitRec -- backend] Call database loading routine...")
+
     recording_type = RecordingType.WITHOUT_COMPANY
-    if ids.valid(EntityType.COMPANY):
+    if ids.link_id is not None or ids.valid(EntityType.COMPANY):
         recording_type = RecordingType.WITH_COMPANY
 
-    # person
-    assert ids.pers_id, "person ID not set"
-    logger.debug("[AutoForm -- backend] Call database loading routine...")
-    stmt = db.t_grunderfassung_personen.select().where(
-        db.t_grunderfassung_personen.c.pers_id == ids.pers_id
-    )
-    with db.ENGINE.connect() as conn:
-        ret = conn.execute(stmt)
-
-        from_db = ret.mappings().all()
-        assert len(from_db) == 1, "not excactly one company initial recording obtained"
-        data_person_table = dict(from_db[0])
-
-    data_person_table = _rename_db_data(
-        data_person_table, FIELD_DB_MAPPING_GRUNDERERFASSUNG_PERSONEN
-    )
-    geloescht = data_person_table["geloescht"]
-    del data_person_table["geloescht"]
-
     data_company_table: dict[str, Any] = {}
     if recording_type is RecordingType.WITH_COMPANY:
-        assert ids.un_id, "company ID not set"
-
+        logger.debug("[InitRec -- backend] With company. Link ID: %s", ids.link_id)
         if ids.link_id:
             stmt = sa.select(
+                db.t_zuordnung_personen_unternehmen.c.pers_id,
                 db.t_zuordnung_personen_unternehmen.c.un_id,
                 db.t_zuordnung_personen_unternehmen.c.an_id,
                 db.t_zuordnung_personen_unternehmen.c.Partnersuche__kanal_aufmerksamkeit,
@@ -516,7 +525,10 @@ def page_initrec_from_db(
                 db.t_zuordnung_personen_unternehmen.c.id == ids.link_id,
             )
         else:
+            assert ids.un_id, "company ID not set"
+            assert ids.pers_id, "person ID not set"
             stmt = sa.select(
+                db.t_zuordnung_personen_unternehmen.c.pers_id,
                 db.t_zuordnung_personen_unternehmen.c.un_id,
                 db.t_zuordnung_personen_unternehmen.c.an_id,
                 db.t_zuordnung_personen_unternehmen.c.Partnersuche__kanal_aufmerksamkeit,
@@ -533,16 +545,43 @@ def page_initrec_from_db(
             assert len(from_db) == 1, "not excactly one company initial recording obtained"
             data_company_table = dict(from_db[0])
 
+            ids.pers_id = data_company_table.pop("pers_id")
+            ids.un_id = data_company_table["un_id"]
+            ids.an_id = data_company_table["an_id"]
             data_company_table = _rename_db_data(
-                data_person_table, FIELD_DB_MAPPING_GRUNDERERFASSUNG_UNTERNEHMEN
+                data_company_table, FIELD_DB_MAPPING_GRUNDERERFASSUNG_UNTERNEHMEN
             )
 
+    # person
+    assert ids.pers_id, "person ID not set"
+    logger.debug("[InitRec -- backend] Person... Person ID: %s", ids.pers_id)
+    stmt = db.t_grunderfassung_personen.select().where(
+        db.t_grunderfassung_personen.c.pers_id == ids.pers_id
+    )
+    with db.ENGINE.connect() as conn:
+        ret = conn.execute(stmt)
+
+        from_db = ret.mappings().all()
+        assert len(from_db) == 1, "not excactly one company initial recording obtained"
+        data_person_table = dict(from_db[0])
+
+    data_person_table = _rename_db_data(
+        data_person_table, FIELD_DB_MAPPING_GRUNDERERFASSUNG_PERSONEN
+    )
+    geloescht = data_person_table["geloescht"]
+    del data_person_table["geloescht"]
+
     form_data = Page_InitRec_Form_Data(
         metadata={},
         person=data_person_table,
         company=data_company_table,
     )
 
+    if geloescht is not None:
+        logger.warning(
+            "[InitRec -- backend] Loaded entries which seem to be deleted - IDs: %s", ids
+        )
+
     return InitRec(
         ids=ids,
         recording_type=recording_type,