Functional foreign key account selector and path generator

api/app/account/models.py

@@ -6,6 +6,7 @@ from fastapi_filter.contrib.sqlalchemy import Filter
 from pydantic.json_schema import SkipJsonSchema
 from sqlmodel import Field, SQLModel, select, Relationship
 from pydantic import Field as PydField
+from sqlalchemy.sql import text
 
 
 class AccountBase(SQLModel):
@@ -13,7 +14,7 @@ class AccountBase(SQLModel):
     parent_account_id: Optional[UUID] = Field(default=None, foreign_key="account.id")
 
 class AccountBaseId(AccountBase):
-    id: UUID | None = Field(default_factory=uuid4, primary_key=True)
+    id: UUID | None = Field(default=uuid4(), primary_key=True)
     type: str = Field(index=True)
     path: str = Field(index=True)
 
@@ -25,11 +26,15 @@ class Account(AccountBaseId, table=True):
     children_accounts: list["Account"] = Relationship(back_populates='parent_account')
 
     def get_child_path(self):
-        return f"{self.path}/{self.name}"
+        return f"{self.path}{self.name}/"
 
     def get_root_path(self):
         root = "/Categories" if self.is_category() else "/Accounts"
-        return f"{root}/{self.type}"
+        return f"{root}/{self.type}/"
+
+    def update_children_path(self, session, old_path):
+        request = f"UPDATE {self.__tablename__} SET path=REPLACE(path, '{old_path}', '{self.path}') WHERE path LIKE '{old_path}{self.name }/%'"
+        session.exec(text(request))
 
     def is_category(self):
         return self.type in [v.value for v in CategoryType]
@@ -42,8 +47,17 @@ class Account(AccountBaseId, table=True):
         return parent.get_child_path()
 
     @classmethod
-    def schema_to_model(cls, session, schema):
-        model = cls.model_validate(schema)
+    def schema_to_model(cls, session, schema, model=None):
+
+        try:
+            if model:
+                model = cls.model_validate(model, update=schema)
+            else:
+                schema['path'] = ""
+                model = cls.model_validate(schema)
+        except Exception as e:
+            print(e)
+
         model.path = model.get_path(session)
         return model
 
@@ -76,19 +90,13 @@ class Account(AccountBaseId, table=True):
     def get(cls, session, account_id):
         return session.get(Account, account_id)
 
-    def update_children_path(self, session):
-        for child in self.children_accounts:
-            child.path = self.get_child_path()
-            session.add(child)
-            child.update_children_path(session)
-
     @classmethod
     def update(cls, session, account_db, account_data):
         previous_path = account_db.path
-        account_db.sqlmodel_update(cls.schema_to_model(session, account_data))
-        session.add(account_db)
+        account_db.sqlmodel_update(cls.schema_to_model(session, account_data, account_db))
         if previous_path != account_db.path:
-            account_db.update_children_path(session, account_db)
+            account_db.update_children_path(session, previous_path)
+        session.add(account_db)
         session.commit()
         session.refresh(account_db)
         return account_db
@@ -137,7 +145,7 @@ class Liability(Enum):
 class AccountWrite(AccountBase):
     type: Asset | Liability = Field()
     path: SkipJsonSchema[str] = Field(default="")
-    parent_account_id: UUID = PydField(default=None, json_schema_extra={
+    parent_account_id: UUID | None = PydField(default=None, json_schema_extra={
         "foreign_key": {
             "reference": {
                 "resource": "accounts",