ms.shahzeidi/sakhteman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(project):add delay date in update

Browse Source
This commit is contained in:
shahzeydyfah
2025-06-06 20:25:29 +03:30
parent 5cb200b8a8
commit caec8ede86
1 changed files with 81 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/repositories/project.py
+81 -72
View File
@@ -16,12 +16,15 @@ from typing import TypeVar, List
COLLECTION = "project" COLLECTION = "project"
T = TypeVar('T') T = TypeVar('T')
class ProjectRepository(BaseRepository[ProjectModel]): class ProjectRepository(BaseRepository[ProjectModel]):
def __init__(self): def __init__(self):
super().__init__(collection=COLLECTION, model=ProjectModel) super().__init__(collection=COLLECTION, model=ProjectModel)
def create_code(self,coding:ProjectModel):
def create_code(self, coding: ProjectModel):
code = str(coding.counter) code = str(coding.counter)
print("code1",code) print("code1", code)
if len(code) < 4: if len(code) < 4:
code = code.rjust(4, '0') code = code.rjust(4, '0')
print("code2", code) print("code2", code)
@@ -37,7 +40,8 @@ class ProjectRepository(BaseRepository[ProjectModel]):
} }
await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price) await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price)
return True return True
async def update_report_price(self,update:ProjectModel):
async def update_report_price(self, update: ProjectModel):
if update.monitor and update.monitor.detail and update.monitor.detail.first_amount: if update.monitor and update.monitor.detail and update.monitor.detail.first_amount:
price = await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).find_one({'project_id': update.id}) price = await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).find_one({'project_id': update.id})
if not price: if not price:
@@ -48,48 +52,51 @@ class ProjectRepository(BaseRepository[ProjectModel]):
} }
await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price) await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price)
else: else:
await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).update_one({'project_id': update.id}, {'$set':{'first_amount': update.monitor.detail.first_amount}}) await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).update_one({'project_id': update.id}, {
'$set': {'first_amount': update.monitor.detail.first_amount}})
return True return True
async def create(self,coding:ProjectModel): def creat_date_delay(self, coding: ProjectModel):
start_date = coding.monitor.detail.date_create_project
first_time_months = int(coding.monitor.detail.first_time)
new_month = start_date.month + first_time_months
new_year = start_date.year + (new_month - 1) // 12
new_month = (new_month - 1) % 12 + 1
return start_date.replace(year=new_year, month=new_month)
async def create(self, coding: ProjectModel):
coding.counter = 1 coding.counter = 1
last_project = await use_collection(COLLECTION).find({}).sort("$natural",-1).to_list(None) last_project = await use_collection(COLLECTION).find({}).sort("$natural", -1).to_list(None)
if last_project: if last_project:
coding.counter = last_project[0]["counter"]+1 coding.counter = last_project[0]["counter"] + 1
code = self.create_code(coding) code = self.create_code(coding)
coding.design.code = 'D'+code coding.design.code = 'D' + code
coding.init_id().cu_at() coding.init_id().cu_at()
if coding.monitor: if coding.monitor:
coding.monitor.code = 'S'+code coding.monitor.code = 'S' + code
coding.has_monitor = True coding.has_monitor = True
await self.create_report_price(coding) await self.create_report_price(coding)
if coding.monitor.detail.date_create_project and coding.monitor.detail.first_time: if coding.monitor.detail.date_create_project and coding.monitor.detail.first_time:
start_date = coding.monitor.detail.date_create_project coding.date_delay = self.creat_date_delay(coding)
first_time_months = int(coding.monitor.detail.first_time)
new_month = start_date.month + first_time_months
new_year = start_date.year + (new_month - 1) // 12
new_month = (new_month - 1) % 12 + 1
coding.date_delay = start_date.replace(year=new_year, month=new_month)
else: else:
coding.has_monitor = False coding.has_monitor = False
await use_collection(COLLECTION).insert_one(coding.mongo_dict()) await use_collection(COLLECTION).insert_one(coding.mongo_dict())
if coding.design.status_agreement: if coding.design.status_agreement:
_model=ProjectStatusAgreement( _model = ProjectStatusAgreement(
project_id= coding.id, project_id=coding.id,
status= coding.design.status_agreement status=coding.design.status_agreement
).init_id().cu_at() ).init_id().cu_at()
await use_collection(TaskEnv.CLN_PROJECT_AGREEMENT).insert_one(_model.mongo_dict()) await use_collection(TaskEnv.CLN_PROJECT_AGREEMENT).insert_one(_model.mongo_dict())
return await self.get(coding.id) return await self.get(coding.id)
async def update(self, _id: UUID, update: ProjectModel): async def update(self, _id: UUID, update: ProjectModel):
old_project = await use_collection(COLLECTION).find_one({"_id":_id}) old_project = await use_collection(COLLECTION).find_one({"_id": _id})
old_project = ProjectModel(**old_project) old_project = ProjectModel(**old_project)
if update.monitor and not old_project.monitor: if update.monitor and not old_project.monitor:
code = self.create_code(update) code = self.create_code(update)
update.monitor.code = 'S'+code update.monitor.code = 'S' + code
if update.design.nature != old_project.design.nature or update.design.type != old_project.design.type : if update.design.nature != old_project.design.nature or update.design.type != old_project.design.type:
code = self.create_code(update) code = self.create_code(update)
update.design.code = 'D' + code update.design.code = 'D' + code
if update.monitor: if update.monitor:
@@ -97,8 +104,10 @@ class ProjectRepository(BaseRepository[ProjectModel]):
if update.monitor: if update.monitor:
update.has_monitor = True update.has_monitor = True
await self.update_report_price(update) await self.update_report_price(update)
if update.monitor.detail.date_create_project != old_project.monitor.detail.date_create_project or update.monitor.detail.first_amount != old_project.monitor.detail.first_amount:
update.date_delay = self.creat_date_delay(update) + datetime.timedelta(days=update.all_delay_day)
update.u_at() update.u_at()
await use_collection(COLLECTION).update_one({"_id":_id},{"$set":update.mongo_dict()}) await use_collection(COLLECTION).update_one({"_id": _id}, {"$set": update.mongo_dict()})
if old_project.design.status_agreement != update.design.status_agreement: if old_project.design.status_agreement != update.design.status_agreement:
_model = ProjectStatusAgreement( _model = ProjectStatusAgreement(
project_id=_id, project_id=_id,
@@ -108,75 +117,74 @@ class ProjectRepository(BaseRepository[ProjectModel]):
return await self.get(_id) return await self.get(_id)
async def update_design_sts(self, _id: UUID, update: UpdateSts): async def update_design_sts(self, _id: UUID, update: UpdateSts):
old_project = await use_collection(COLLECTION).find_one({"_id":_id}) old_project = await use_collection(COLLECTION).find_one({"_id": _id})
if not old_project: if not old_project:
raise HTTPException(status_code=400,detail='این پروژه وجود ندارد') raise HTTPException(status_code=400, detail='این پروژه وجود ندارد')
await use_collection(COLLECTION).update_one({"_id":_id},{"$set":{ await use_collection(COLLECTION).update_one({"_id": _id}, {"$set": {
'design.sts':update.sts,'design.reason_stop':update.reason_stop 'design.sts': update.sts, 'design.reason_stop': update.reason_stop
}}) }})
sts_class = ProjectSts( sts_class = ProjectSts(
project_id= _id, project_id=_id,
type = 'design', type='design',
sts= update.sts, sts=update.sts,
description= update.reason_stop description=update.reason_stop
).init_id().cu_at() ).init_id().cu_at()
await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict()) await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict())
return await self.get(_id) return await self.get(_id)
async def update_monitor_sts(self, _id: UUID, update: UpdateSts): async def update_monitor_sts(self, _id: UUID, update: UpdateSts):
old_project = await use_collection(COLLECTION).find_one({"_id":_id}) old_project = await use_collection(COLLECTION).find_one({"_id": _id})
if not old_project: if not old_project:
raise HTTPException(status_code=400,detail='این پروژه وجود ندارد') raise HTTPException(status_code=400, detail='این پروژه وجود ندارد')
await use_collection(COLLECTION).update_one({"_id":_id},{"$set":{ await use_collection(COLLECTION).update_one({"_id": _id}, {"$set": {
'monitor.sts':update.sts,'monitor.reason_sts':update.reason_stop 'monitor.sts': update.sts, 'monitor.reason_sts': update.reason_stop
}}) }})
sts_class = ProjectSts( sts_class = ProjectSts(
project_id= _id, project_id=_id,
type = 'monitor', type='monitor',
sts= update.sts, sts=update.sts,
description= update.reason_stop description=update.reason_stop
).init_id().cu_at() ).init_id().cu_at()
await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict()) await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict())
return await self.get(_id) return await self.get(_id)
async def delete(self, _id: UUID): async def delete(self, _id: UUID):
old_project = await use_collection(COLLECTION).find_one({"_id":_id}) old_project = await use_collection(COLLECTION).find_one({"_id": _id})
if not old_project: if not old_project:
raise HTTPException(status_code=400,detail='این پروژه وجود ندارد') raise HTTPException(status_code=400, detail='این پروژه وجود ندارد')
await use_collection(COLLECTION).update_one({"_id":_id},{"$set":{ await use_collection(COLLECTION).update_one({"_id": _id}, {"$set": {
'sts':2, 'sts': 2,
}}) }})
return True return True
async def restore(self, _id: UUID): async def restore(self, _id: UUID):
old_project = await use_collection(COLLECTION).find_one({"_id":_id}) old_project = await use_collection(COLLECTION).find_one({"_id": _id})
if not old_project: if not old_project:
raise HTTPException(status_code=400,detail='این پروژه وجود ندارد') raise HTTPException(status_code=400, detail='این پروژه وجود ندارد')
await use_collection(COLLECTION).update_one({"_id":_id},{"$set":{ await use_collection(COLLECTION).update_one({"_id": _id}, {"$set": {
'sts':1, 'sts': 1,
}}) }})
return True return True
async def list_project_design(self): async def list_project_design(self):
project = await use_collection(COLLECTION).find({'monitor':{"$exists":0}}).to_list(None) project = await use_collection(COLLECTION).find({'monitor': {"$exists": 0}}).to_list(None)
return project return project
async def list_project_monitor(self): async def list_project_monitor(self):
project = await use_collection(COLLECTION).find({'monitor':{"$exists":1}}).to_list(None) project = await use_collection(COLLECTION).find({'monitor': {"$exists": 1}}).to_list(None)
return project return project
async def list_sts_design(self,_id:uuid.UUID): async def list_sts_design(self, _id: uuid.UUID):
sts_project = await use_collection(TaskEnv.CLN_PROJECT_STS).find({ sts_project = await use_collection(TaskEnv.CLN_PROJECT_STS).find({
"project_id":_id, "project_id": _id,
"type":"design" "type": "design"
}).to_list(None) }).to_list(None)
return sts_project return sts_project
async def list_sts_monitor(self,_id:uuid.UUID): async def list_sts_monitor(self, _id: uuid.UUID):
sts_project = await use_collection(TaskEnv.CLN_PROJECT_STS).find({ sts_project = await use_collection(TaskEnv.CLN_PROJECT_STS).find({
"project_id":_id, "project_id": _id,
"type":"monitor" "type": "monitor"
}).to_list(None) }).to_list(None)
return sts_project return sts_project
@@ -184,12 +192,12 @@ class ProjectRepository(BaseRepository[ProjectModel]):
project = await use_collection(TaskEnv.CLN_PROJECT).find({}).to_list(None) project = await use_collection(TaskEnv.CLN_PROJECT).find({}).to_list(None)
return project return project
async def set_sts_two_for_monitor(self,project_id:uuid.UUID): async def set_sts_two_for_monitor(self, project_id: uuid.UUID):
project = await use_collection(TaskEnv.CLN_PROJECT).find_one({"_id": project_id}) project = await use_collection(TaskEnv.CLN_PROJECT).find_one({"_id": project_id})
if not ('sts' in project['monitor'] and project['monitor']['sts'] > 1): if not ('sts' in project['monitor'] and project['monitor']['sts'] > 1):
await use_collection(TaskEnv.CLN_PROJECT).update_one( await use_collection(TaskEnv.CLN_PROJECT).update_one(
{'_id': project_id}, {'_id': project_id},
{"$set":{"monitor.sts": 2}}) {"$set": {"monitor.sts": 2}})
sts_class = ProjectSts( sts_class = ProjectSts(
project_id=project_id, project_id=project_id,
@@ -198,7 +206,6 @@ class ProjectRepository(BaseRepository[ProjectModel]):
).init_id().cu_at() ).init_id().cu_at()
await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict()) await use_collection(TaskEnv.CLN_PROJECT_STS).insert_one(sts_class.mongo_dict())
return True return True
async def fetch_delete(self, _input: TableEngineRequestType) -> TableEngineExport[T]: async def fetch_delete(self, _input: TableEngineRequestType) -> TableEngineExport[T]:
@@ -207,7 +214,7 @@ class ProjectRepository(BaseRepository[ProjectModel]):
soft_deleted=True, soft_deleted=True,
model=self.MODEL, model=self.MODEL,
search_cols=['name'], search_cols=['name'],
extra_filter=[{'sts':2}], extra_filter=[{'sts': 2}],
inputs=_input.te) \ inputs=_input.te) \
.to_dict() .to_dict()
@@ -223,20 +230,21 @@ class ProjectRepository(BaseRepository[ProjectModel]):
async def get_all(self): async def get_all(self):
url = 'http://api.khanesaziceco.ir/api/api/project/table' url = 'http://api.khanesaziceco.ir/api/api/project/table'
headers = {'authorization':'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hcGkua2hhbmVzYXppY2Vjby5pclwvYXBpXC9hdXRoXC9sb2dpbiIsImlhdCI6MTcyOTg4MTc2OCwiZXhwIjoxNzMyNDczNzY4LCJuYmYiOjE3Mjk4ODE3NjgsImp0aSI6IjRiUGQ0dW1Wc2ZBSnNFUzUiLCJzdWIiOjEzNiwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.LsinrL84iKAd4HaTHmsaDCALXJPwMLegNpeFhlJL0aY'} headers = {
'authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hcGkua2hhbmVzYXppY2Vjby5pclwvYXBpXC9hdXRoXC9sb2dpbiIsImlhdCI6MTcyOTg4MTc2OCwiZXhwIjoxNzMyNDczNzY4LCJuYmYiOjE3Mjk4ODE3NjgsImp0aSI6IjRiUGQ0dW1Wc2ZBSnNFUzUiLCJzdWIiOjEzNiwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.LsinrL84iKAd4HaTHmsaDCALXJPwMLegNpeFhlJL0aY'}
data = {"page": 1, data = {"page": 1,
"limit": 400, "limit": 400,
"sort":"_id" "sort": "_id"
} }
res = requests.post(url,data=json.dumps(data), headers=headers) res = requests.post(url, data=json.dumps(data), headers=headers)
a = res.json() a = res.json()
print(a['rows'][0]) print(a['rows'][0])
obj = [] obj = []
for i in a['rows']: for i in a['rows']:
_set= ProjectModel( _set = ProjectModel(
sts=1, sts=1,
counter=i['id'], counter=i['id'],
design= Design(**i) design=Design(**i)
).init_id().cu_at() ).init_id().cu_at()
obj.append(_set.mongo_dict()) obj.append(_set.mongo_dict())
print() print()
@@ -247,15 +255,18 @@ class ProjectRepository(BaseRepository[ProjectModel]):
async def create_project_price(self): async def create_project_price(self):
projects = await use_collection(TaskEnv.CLN_PROJECT).find({'monitor.detail.first_amount':{'$exists':1}}).to_list(None) projects = await use_collection(TaskEnv.CLN_PROJECT).find(
{'monitor.detail.first_amount': {'$exists': 1}}).to_list(None)
for project in projects: for project in projects:
sum_status = 0 sum_status = 0
sum_adjust = 0 sum_adjust = 0
status = await use_collection(TaskEnv.CLN_FINANCIAL_STATUS).find({'project_id':project['_id'],'amount':{'$exists':1}}).to_list(None) status = await use_collection(TaskEnv.CLN_FINANCIAL_STATUS).find(
{'project_id': project['_id'], 'amount': {'$exists': 1}}).to_list(None)
if status: if status:
for i in status: for i in status:
sum_status += i['amount'] sum_status += i['amount']
adjust = await use_collection(TaskEnv.CLN_FINANCIAL_ADJUST).find({'project_id':project['_id'],'amount':{'$exists':1}}).to_list(None) adjust = await use_collection(TaskEnv.CLN_FINANCIAL_ADJUST).find(
{'project_id': project['_id'], 'amount': {'$exists': 1}}).to_list(None)
if adjust: if adjust:
for i in adjust: for i in adjust:
sum_adjust += i['amount'] sum_adjust += i['amount']
@@ -263,9 +274,7 @@ class ProjectRepository(BaseRepository[ProjectModel]):
'_id': uuid.uuid4(), '_id': uuid.uuid4(),
'project_id': project['_id'], 'project_id': project['_id'],
'first_amount': project['monitor']['detail']['first_amount'], 'first_amount': project['monitor']['detail']['first_amount'],
'amount_status':sum_status, 'amount_status': sum_status,
'amount_adjust':sum_adjust 'amount_adjust': sum_adjust
} }
await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price) await use_collection(TaskEnv.CLN_PROJECT_PRICE_REPORT).insert_one(price)