generated from dopt-python/py311
added new data model principle to auto forms
This commit is contained in:
@@ -14,7 +14,7 @@ from wce_crm.constants import TIMEZONE_CEST
|
||||
from wce_crm.data_models import (
|
||||
Beratungsgespraech_Einzelgespraech,
|
||||
Beratungsgespraech_Vorgang,
|
||||
Initrec_FromDb,
|
||||
Initrec,
|
||||
)
|
||||
from wce_crm.logging import logger_back as logger
|
||||
from wce_crm.types import (
|
||||
@@ -28,7 +28,6 @@ from wce_crm.types import (
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from wce_crm.data_models import AutoForm_State, Initrec
|
||||
from wce_crm.types import ConsId, ExtAnId, ExtMaId, RecId
|
||||
|
||||
|
||||
@@ -153,7 +152,7 @@ def initrec_company_to_db(
|
||||
) -> Initrec:
|
||||
logger.debug("[AutoForm -- backend] Call database saving routine...")
|
||||
|
||||
dump_data = copy.deepcopy(auto_form_data.form_data)
|
||||
dump_data = copy.deepcopy(auto_form_data.db_data)
|
||||
dump_data["geloescht"] = auto_form_data.geloescht
|
||||
|
||||
with db.ENGINE.begin() as conn:
|
||||
@@ -174,7 +173,7 @@ def initrec_company_to_db(
|
||||
data_from_db = from_db[0]
|
||||
auto_form_data.rec_id = data_from_db["un_id"]
|
||||
auto_form_data.geloescht = data_from_db["geloescht"]
|
||||
auto_form_data.form_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
auto_form_data.db_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
"Metadaten_aktualisierung"
|
||||
]
|
||||
|
||||
@@ -183,7 +182,7 @@ def initrec_company_to_db(
|
||||
else:
|
||||
logger.debug("[AutoForm -- backend] Update...")
|
||||
stmt = (
|
||||
db.beratung_vorgang.update()
|
||||
db.grunderfassung_unternehmen.update()
|
||||
.where(db.grunderfassung_unternehmen.c.un_id == auto_form_data.rec_id)
|
||||
.returning(
|
||||
db.grunderfassung_unternehmen.c.Metadaten_aktualisierung,
|
||||
@@ -196,8 +195,7 @@ def initrec_company_to_db(
|
||||
assert len(from_db) == 1, "expected excatly one returned row"
|
||||
data_from_db = from_db[0]
|
||||
|
||||
auto_form_data.geloescht = data_from_db["geloescht"]
|
||||
auto_form_data.form_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
auto_form_data.db_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
"Metadaten_aktualisierung"
|
||||
]
|
||||
|
||||
@@ -229,7 +227,7 @@ def initrec_company_from_db(
|
||||
return Initrec(
|
||||
rec_id=id_,
|
||||
geloescht=geloescht,
|
||||
form_data=data_from_db,
|
||||
db_data=data_from_db,
|
||||
)
|
||||
|
||||
|
||||
@@ -238,7 +236,7 @@ def initrec_person_to_db(
|
||||
) -> Initrec:
|
||||
logger.debug("[AutoForm -- backend] Call database saving routine...")
|
||||
|
||||
dump_data = copy.deepcopy(auto_form_data.form_data)
|
||||
dump_data = copy.deepcopy(auto_form_data.db_data)
|
||||
dump_data["geloescht"] = auto_form_data.geloescht
|
||||
|
||||
with db.ENGINE.begin() as conn:
|
||||
@@ -259,7 +257,7 @@ def initrec_person_to_db(
|
||||
data_from_db = from_db[0]
|
||||
auto_form_data.rec_id = data_from_db["un_id"]
|
||||
auto_form_data.geloescht = data_from_db["geloescht"]
|
||||
auto_form_data.form_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
auto_form_data.db_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
"Metadaten_aktualisierung"
|
||||
]
|
||||
|
||||
@@ -268,7 +266,7 @@ def initrec_person_to_db(
|
||||
else:
|
||||
logger.debug("[AutoForm -- backend] Update...")
|
||||
stmt = (
|
||||
db.beratung_vorgang.update()
|
||||
db.grunderfassung_personen.update()
|
||||
.where(db.grunderfassung_personen.c.pers_id == auto_form_data.rec_id)
|
||||
.returning(
|
||||
db.grunderfassung_personen.c.Metadaten_aktualisierung,
|
||||
@@ -281,8 +279,7 @@ def initrec_person_to_db(
|
||||
assert len(from_db) == 1, "expected excatly one returned row"
|
||||
data_from_db = from_db[0]
|
||||
|
||||
auto_form_data.geloescht = data_from_db["geloescht"]
|
||||
auto_form_data.form_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
auto_form_data.db_data["Metadaten_aktualisierung"] = data_from_db[
|
||||
"Metadaten_aktualisierung"
|
||||
]
|
||||
|
||||
@@ -314,7 +311,7 @@ def initrec_person_from_db(
|
||||
return Initrec(
|
||||
rec_id=id_,
|
||||
geloescht=geloescht,
|
||||
form_data=data_from_db,
|
||||
db_data=data_from_db,
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user