payment re-arragend tru raw sql

ServicesApi/Builds/Initial/init_enums.py

@@ -1,17 +1,17 @@
 from pydantic import BaseModel
-from Schemas import BuildTypes, ApiEnumDropdown
+from Schemas import ApiEnumDropdown
 
 
-class InsertBuildTypes(BaseModel):
-    function_code: str
-    type_code: str
-    lang: str
-    type_name: str
+# class InsertBuildTypes(BaseModel):
+#     function_code: str
+#     type_code: str
+#     lang: str
+#     type_name: str
 
 
 def init_api_enums_build_types(db_session):
 
-    BuildTypes.set_session(db_session)
+    # BuildTypes.set_session(db_session)
     ApiEnumDropdown.set_session(db_session)
 
     insert_types = [
@@ -71,24 +71,59 @@ def init_api_enums_build_types(db_session):
         },
     ]
 
-    for insert_type in insert_types:
-        build_types = InsertBuildTypes(
-            function_code="EVYOS",
-            lang=insert_type["lang"],
-            type_code=str(insert_type["type_code"]).upper(),
-            type_name=insert_type["type_name"],
-        )
-        created_build_type = BuildTypes.query.filter_by(
-            function_code=build_types.function_code,
-            type_code=build_types.type_code,
-        ).first()
-        if not created_build_type:
-            created_build_type = BuildTypes.find_or_create(
-                **build_types.model_dump(), is_confirmed=True, db=db_session
-            )
-            created_build_type.save()
+    # for insert_type in insert_types:
+    #     build_types = dict(enum_class="BuildTypes", key=insert_type["type_code"], value=insert_type["type_name"])
+    #     created_build_type = ApiEnumDropdown.query.filter_by(enum_class="BuildTypes", **build_types).first()
+    #     if not created_build_type:
+    #         created_build_type = ApiEnumDropdown.find_or_create(**build_types, is_confirmed=True, db=db_session)
+    #         created_build_type.save()
 
     insert_enums = [
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_KZN",
+            "type_name": "Apartman Kazan Dairesi",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_GRJ",
+            "type_name": "Apartman Garaj",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_DP",
+            "type_name": "Apartman Depo",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "DAIRE",
+            "type_name": "Apartman Dairesi",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT",
+            "type_name": "Apartman Binası",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_YNT",
+            "type_name": "Apartman Yönetimi",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_PRK",
+            "type_name": "Apartman Açık Park Alanı",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_YSL",
+            "type_name": "Apartman Yeşil Alan",
+        },
+        {
+            "enum_class": "BuildTypes",
+            "type_code": "APT_YOL",
+            "type_name": "Apartman Ara Yol",
+        },
         {"enum_class": "BuildDuesTypes", "type_code": "BDT-D", "type_name": "Debit"},
         {
             "enum_class": "BuildDuesTypes",
@@ -274,6 +309,7 @@ def init_api_enums_build_types(db_session):
         created_api_enum = ApiEnumDropdown.query.filter_by(
             enum_class=insert_enum["enum_class"],
             key=str(insert_enum["type_code"]).upper(),
+            lang="tr",
         ).first()
         if not created_api_enum:
             created_api_enum = ApiEnumDropdown.create(

ServicesApi/Builds/Initial/init_occ_defaults.py

@@ -8,7 +8,7 @@ from Schemas import (
     People,
     Build,
     BuildParts,
-    BuildTypes,
+    # BuildTypes,
     ApiEnumDropdown,
     Companies,
     OccupantTypes,
@@ -23,7 +23,7 @@ def create_occupant_defaults(db_session):
     People.set_session(db_session)
     Build.set_session(db_session)
     BuildParts.set_session(db_session)
-    BuildTypes.set_session(db_session)
+    # BuildTypes.set_session(db_session)
     ApiEnumDropdown.set_session(db_session)
     Companies.set_session(db_session)
     OccupantTypes.set_session(db_session)
@@ -34,7 +34,7 @@ def create_occupant_defaults(db_session):
 
     company_id, company_uu_id = company_management.id, str(company_management.uu_id)
     active_row = dict(is_confirmed=True, active=True, deleted=False, is_notification_send=True)
-    build_type = BuildTypes.query.filter_by(type_code = "APT").first()
+    build_type = ApiEnumDropdown.query.filter_by(enum_class = "BuildTypes", key = "APT").first()
     address = Addresses.query.filter_by(letter_address = "Example Address").first()
 
     created_build = Build.query.filter_by(build_name = "Build Example").first()
@@ -52,8 +52,8 @@ def create_occupant_defaults(db_session):
         )
         created_list.append(created_build)
 
-    build_type_created = BuildTypes.query.filter_by(type_code = "APT").first()
-    build_type_flat = BuildTypes.query.filter_by(type_code = "DAIRE").first()
+    build_type_created = ApiEnumDropdown.query.filter_by(enum_class = "BuildTypes", key = "APT").first()
+    build_type_flat = ApiEnumDropdown.query.filter_by(enum_class = "BuildTypes", key = "DAIRE").first()
     enum_dropdown = ApiEnumDropdown.query.filter_by(key = "NE", enum_class = "Directions").first()
 
     occupant_type_prs = OccupantTypes.query.filter_by(occupant_code = "MT-PRS").first()