save and confirmed added

service_app_init/initialize_app/event_initator.py

@@ -103,9 +103,7 @@ def add_events_all_services_and_occupant_types():
                 event_id=event_id,
                 event_uu_id=event_uu_id,
             )
-            service_events.save()
-            service_events.is_confirmed = True
-            service_events.save()
+            service_events.save_and_confirm()
     return
 
 

service_app_init/initialize_app/initialize_default_department.py

@@ -141,9 +141,7 @@ def create_occupant_types_defaults():
 
     for list_occupant_type in list_occupant_types:
         created_type = OccupantTypes.find_or_create(**list_occupant_type)
-        created_type.save()
-        created_type.is_confirmed = True
-        created_type.save()
+        created_type.save_and_confirm()
 
 
 def create_application_defaults():
@@ -438,6 +436,5 @@ def create_application_defaults():
     )
     People.save()
     for created_list_item in created_list:
-        created_list_item.is_confirmed = True
-        created_list_item.save()
+        created_list_item.save_and_confirm()
     print("All Defaults Create is now completed")

service_app_init/initialize_app/initiator.py

@@ -94,9 +94,14 @@ def init_api_enums_build_types():
         },
         {
             "enum_class": "BuildDuesTypes",
-            "type_code": "BDT-sf",
+            "type_code": "BDT-S",
             "type_name": "Service fee",
         },
+        {
+            "enum_class": "BuildDuesTypes",
+            "type_code": "BDT-I",
+            "type_name": "Information",
+        },
         {
             "enum_class": "AccountingReceiptTypes",
             "type_code": "ART-A",

service_app_init/initialize_app/modules_and_services_init.py

@@ -29,9 +29,7 @@ def create_endpoints_from_api_functions(routers):
                 )
             )
             restriction.endpoint_code = f"AR{str(restriction.id).zfill(3)}"
-            restriction.save()
-            restriction.is_confirmed = True
-            restriction.save()
+            restriction.save_and_confirm()
 
     EndpointRestriction.save()
     return api_app
@@ -54,72 +52,56 @@ def create_services_building(module_dict: dict):
         service_description="Building Management Service",
         service_code="SR-BLD-MNG",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Legal Affairs",
         service_description="Building Legal Affairs Service",
         service_code="SR-BLD-LGL",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Cleaning",
         service_description="Building Cleaning Service",
         service_code="SR-BLD-CLN",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Heating System",
         service_description="Building Heating System Service",
         service_code="SR-BLD-HTS",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Security System",
         service_description="Building Security System Service",
         service_code="SR-BLD-SEC",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Maintenance",
         service_description="Building Maintenance Service",
         service_code="SR-BLD-MNT",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Repair",
         service_description="Building Repair Service",
         service_code="SR-BLD-RPR",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Building Observation",
         service_description="Building Observation Service",
         service_code="SR-BLD-OBS",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     return
 
 
@@ -137,46 +119,35 @@ def create_services_flat(module_dict: dict):
         service_description="Flat Rent Service",
         service_code="SR-FLT-RNT",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
-
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Flat Sale",
         service_description="Flat Sale Service",
         service_code="SR-FLT-SAL",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Flat Renovation",
         service_description="Flat Renovation Service",
         service_code="SR-FLT-RNV",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Flat Cleaning",
         service_description="Flat Cleaning Service",
         service_code="SR-FLT-CLN",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Flat Observation",
         service_description="Flat Observation Service",
         service_code="SR-FLT-OBS",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     return
 
 
@@ -187,9 +158,7 @@ def create_services_authenticate(module_dict: dict):
         service_description="Authenticate Service",
         service_code="AUTH",
     )
-    authentication_service.save()
-    authentication_service.is_confirmed = True
-    authentication_service.save()
+    authentication_service.save_and_confirm()
     return
 
 
@@ -201,27 +170,21 @@ def create_services_meeting(module_dict: dict):
         service_description="Regular Meeting Service",
         service_code="MEET-REG",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Meeting Emergency",
         service_description="Emergency Meeting Service",
         service_code="MEET-EMR",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     created_service = Services.find_or_create(
         **module_dict,
         service_name="Meeting Demand",
         service_description="Demand Meeting Service",
         service_code="MEET-DMN",
     )
-    created_service.save()
-    created_service.is_confirmed = True
-    created_service.save()
+    created_service.save_and_confirm()
     return
 
 
@@ -236,9 +199,7 @@ def create_modules_and_services_and_actions():
             "is_default_module": False,
         }
     )
-    erp_module.save()
-    erp_module.is_confirmed = True
-    erp_module.save()
+    erp_module.save_and_confirm()
 
     build_module = Modules.find_or_create(
         **{
@@ -249,9 +210,7 @@ def create_modules_and_services_and_actions():
             "is_default_module": False,
         }
     )
-    build_module.save()
-    build_module.is_confirmed = True
-    build_module.save()
+    build_module.save_and_confirm()
 
     user_module = Modules.find_or_create(
         **{
@@ -262,9 +221,7 @@ def create_modules_and_services_and_actions():
             "is_default_module": True,
         }
     )
-    user_module.save()
-    user_module.is_confirmed = True
-    user_module.save()
+    user_module.save_and_confirm()
 
     erp_module_module_dict = dict(
         module_id=erp_module.id,
@@ -289,9 +246,7 @@ def create_modules_and_services_and_actions():
             service_description=duty_object.duty_description,
             service_code=f"SRE-{duty_object.duty_code}",
         )
-        created_service.save()
-        created_service.is_confirmed = True
-        created_service.save()
+        created_service.save_and_confirm()
 
     occupant_types = OccupantTypes.filter_all()
     for occupant_type in occupant_types.data:
@@ -301,9 +256,7 @@ def create_modules_and_services_and_actions():
             service_description=occupant_type.occupant_description,
             service_code=f"SRO-{occupant_type.occupant_code}",
         )
-        created_service.save()
-        created_service.is_confirmed = True
-        created_service.save()
+        created_service.save_and_confirm()
 
     create_services_authenticate(module_dict=user_module_module_dict)
     create_services_meeting(module_dict=build_module_module_dict)