test application updated@build living space

This commit is contained in:
2024-11-15 19:23:08 +03:00
parent d2cc195ccf
commit 7e1b26f3c4
44 changed files with 261 additions and 321 deletions

View File

@@ -53,7 +53,6 @@ class AddressListEventMethods(MethodToEvent):
street_id[0]
for street_id in AddressPostcode.select_only(
AddressPostcode.id.in_(post_code_id_list),
*AddressPostcode.valid_record_args(AddressPostcode),
select_args=[AddressPostcode.street_id],
order_by=AddressPostcode.street_id.desc(),
).data
@@ -65,11 +64,9 @@ class AddressListEventMethods(MethodToEvent):
)
Addresses.pre_query = Addresses.filter_all(
Addresses.street_id.in_(get_street_ids),
*Addresses.valid_record_args(Addresses),
).query
Addresses.filter_attr = list_options
records = Addresses.filter_all(
*Addresses.valid_record_args(Addresses),
).data
return AlchemyJsonResponse(
completed=True,
@@ -109,7 +106,6 @@ class AddressCreateEventMethods(MethodToEvent):
):
post_code = AddressPostcode.filter_one(
AddressPostcode.uu_id == data.post_code_uu_id,
*AddressPostcode.valid_record_args(AddressPostcode),
).data
if not post_code:
raise HTTPException(
@@ -122,16 +118,9 @@ class AddressCreateEventMethods(MethodToEvent):
data_dict["street_uu_id"] = str(post_code.street_uu_id)
del data_dict["post_code_uu_id"]
address = Addresses.find_or_create(**data_dict)
relation_employee = RelationshipEmployee2PostCode.find_or_create(
employee_id=token_dict.selected_company.employee_id,
member_id=post_code.id,
company_id=token_dict.selected_company.company_id,
)
address.save()
address.update(is_confirmed=True)
address.save()
relation_employee.update(is_confirmed=True)
relation_employee.save()
return JSONResponse(
content={
"completed": True,
@@ -231,7 +220,6 @@ class AddressUpdateEventMethods(MethodToEvent):
if isinstance(token_dict, EmployeeTokenObject):
address = Addresses.filter_one(
Addresses.uu_id == address_uu_id,
*Addresses.valid_record_args(Addresses),
).data
if not address:
raise HTTPException(
@@ -273,13 +261,9 @@ class AddressPatchEventMethods(MethodToEvent):
):
address = Addresses.filter_one(
Addresses.uu_id == address_uu_id,
*Addresses.valid_record_args(Addresses),
).data
post_code = RelationshipEmployee2PostCode.filter_one(
RelationshipEmployee2PostCode.member_id == address.post_code_id,
*RelationshipEmployee2PostCode.valid_record_args(
RelationshipEmployee2PostCode
),
)
if not post_code:
raise HTTPException(
@@ -318,7 +302,6 @@ class AddressPostCodeCreateEventMethods(MethodToEvent):
data_dump = data.excluded_dump()
street = AddressStreet.filter_one(
AddressStreet.uu_id == data.street_uu_id,
*AddressStreet.valid_record_args(AddressStreet),
).data
if not street:
raise HTTPException(
@@ -370,7 +353,6 @@ class AddressPostCodeUpdateEventMethods(MethodToEvent):
)
post_code = AddressPostcode.filter_one(
AddressPostcode.uu_id == post_code_uu_id,
*AddressPostcode.valid_record_args(AddressPostcode),
).data
if not post_code:
raise HTTPException(
@@ -420,7 +402,6 @@ class AddressPostCodeListEventMethods(MethodToEvent):
post_code_list = AddressPostcode.__many__table__.filter_all(
AddressPostcode.__many__table__.company_id
== token_dict.selected_company.company_id,
*AddressPostcode.valid_record_args(AddressPostcode.__many__table__),
).data
if not post_code_list:
raise HTTPException(
@@ -432,12 +413,9 @@ class AddressPostCodeListEventMethods(MethodToEvent):
AddressPostcode.id.in_(
[post_code.member_id for post_code in post_code_list]
),
*AddressPostcode.valid_record_args(AddressPostcode),
).query
AddressPostcode.filter_attr = list_options
records = AddressPostcode.filter_all(
*AddressPostcode.valid_record_args(AddressPostcode),
).data
records = AddressPostcode.filter_all().data
return AlchemyJsonResponse(
completed=True,
message="List Address records",