evyos-center-server/wag-managment-api-service-version-2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

events updated

Browse Source
This commit is contained in:
berkay
2024-11-13 10:38:00 +03:00
parent 952d742999
commit 077d264b28
48 changed files with 277300 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
databases/sql_models/company/company.py
View File

@@ -69,12 +69,12 @@ class RelationshipDutyCompany(CrudCollection):
)
list_match_company_id = []
send_duties = Duties.filter_one(
Duties.uu_id==data.duty_uu_id,
Duties.uu_id == data.duty_uu_id,
*Duties.valid_record_args(Duties),
)
send_user_duties = Duties.filter_one(
Duties.duties_id==send_duties.id,
Duties.company_id==token_duties_id,
Duties.duties_id == send_duties.id,
Duties.company_id == token_duties_id,
*Duties.valid_record_args(Duties),
)
if not send_user_duties:
@@ -84,13 +84,13 @@ class RelationshipDutyCompany(CrudCollection):
for company_uu_id in list(data.match_company_uu_id):
company = Companies.filter_one(
Companies.uu_id==company_uu_id,
Companies.uu_id == company_uu_id,
*Companies.valid_record_args(Companies),
)
bulk_company = RelationshipDutyCompany.filter_one(
RelationshipDutyCompany.owner_id==token_company_id,
RelationshipDutyCompany.relationship_type=="Bulk",
RelationshipDutyCompany.member_id==company.id,
RelationshipDutyCompany.owner_id == token_company_id,
RelationshipDutyCompany.relationship_type == "Bulk",
RelationshipDutyCompany.member_id == company.id,
*RelationshipDutyCompany.valid_record_args(RelationshipDutyCompany),
)
if not bulk_company:
@@ -121,12 +121,12 @@ class RelationshipDutyCompany(CrudCollection):
)
list_match_company_id = []
send_duties = Duties.filter_one(
Duties.uu_id==data.duty_uu_id,
Duties.uu_id == data.duty_uu_id,
*Duties.valid_record_args(Duties),
)
send_user_duties = Duties.filter_one(
Duties.duties_id==send_duties.id,
Duties.company_id==token_duties_id,
Duties.duties_id == send_duties.id,
Duties.company_id == token_duties_id,
*Duties.valid_record_args(Duties),
)
if not send_user_duties:
@@ -136,13 +136,13 @@ class RelationshipDutyCompany(CrudCollection):
for company_uu_id in list(data.match_company_uu_id):
company = Companies.filter_one(
Companies.uu_id==company_uu_id,
Companies.uu_id == company_uu_id,
*Companies.valid_record_args(Companies),
)
bulk_company = RelationshipDutyCompany.filter_one(
RelationshipDutyCompany.owner_id==token_company_id,
RelationshipDutyCompany.relationship_type=="Bulk",
RelationshipDutyCompany.member_id==company.id,
RelationshipDutyCompany.owner_id == token_company_id,
RelationshipDutyCompany.relationship_type == "Bulk",
RelationshipDutyCompany.member_id == company.id,
*RelationshipDutyCompany.valid_record_args(RelationshipDutyCompany),
)
if not bulk_company:
@@ -249,7 +249,7 @@ class Companies(CrudCollection, SelectAction):
if cls.filter_one(cls.tax_no == str(data.tax_no).strip(), system=True).data:
raise HTTPException(
status_code=400,
detail="Company already exists. Please ask supervisor to make company visible for your duty."
detail="Company already exists. Please ask supervisor to make company visible for your duty.",
)
official_address = Addresses.filter_one(
@@ -298,7 +298,7 @@ class Companies(CrudCollection, SelectAction):
company_id = token.get("company_id")
if data.official_address_uu_id:
official_address = Addresses.filter_one(
Addresses.uu_id==data.official_address_uu_id,
Addresses.uu_id == data.official_address_uu_id,
*Addresses.valid_record_args(Addresses),
).data
data_dict["official_address_id"] = official_address.id

4
databases/sql_models/company/department.py
View File

@@ -182,7 +182,9 @@ class Duties(CrudCollection):
def get_bulk_duties_of_a_company(cls, company_id):
duties_id = Duty.filter_by_one(system=True, duty_code="BULK").data
if bulk_duties := Duties.filter_by_one(
duties_id=getattr(duties_id,'id', None), company_id=company_id, **Duties.valid_record_dict
duties_id=getattr(duties_id, "id", None),
company_id=company_id,
**Duties.valid_record_dict,
).data:
return bulk_duties
raise Exception("Bulk Duty not found. Please contact with supervisor.")

18
databases/sql_models/core_mixin.py
View File

@@ -199,8 +199,8 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
if getattr(cls.creds, "person_id", None) and getattr(
cls.creds, "person_name", None
):
cls.created_by_id = cls.creds.get('person_id', "Unknown")
cls.created_by = cls.creds.get('person_name', "Unknown")
cls.created_by_id = cls.creds.get("person_id", "Unknown")
cls.created_by = cls.creds.get("person_name", "Unknown")
created_record.flush()
return created_record
@@ -223,14 +223,14 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
if getattr(self.creds, "person_id", None) and getattr(
self.creds, "person_name", None
):
self.confirmed_by_id = self.creds.get('person_id', "Unknown")
self.confirmed_by = self.creds.get('person_name', "Unknown")
self.confirmed_by_id = self.creds.get("person_id", "Unknown")
self.confirmed_by = self.creds.get("person_name", "Unknown")
else:
if getattr(self.creds, "person_id", None) and getattr(
self.creds, "person_name", None
):
self.updated_by_id = self.creds.get('person_id', "Unknown")
self.updated_by = self.creds.get('person_id', "Unknown")
self.updated_by_id = self.creds.get("person_id", "Unknown")
self.updated_by = self.creds.get("person_id", "Unknown")
self.flush()
return self
@@ -273,7 +273,11 @@ class CrudMixin(Base, SmartQueryMixin, SessionMixin, FilterAttributes):
self.__exclude__fields__ or [] + self.__system_default_model__
)
columns_list = list(set(self.columns).difference(set(exclude_list)))
columns_list = [columns for columns in columns_list if str(columns)[-2:] != "id" and 'uu_id' not in str(columns)]
columns_list = [
columns
for columns in columns_list
if str(columns)[-2:] != "id" and "uu_id" not in str(columns)
]
for key in list(columns_list):
val = getattr(self, key)
correct, value_of_database = self.iterate_over_variables(val, key)