Fix some bugs
This commit is contained in:
parent
b83f5fd606
commit
7955b5884a
@ -22,7 +22,7 @@ async def init_deployment(
|
|||||||
async def update_deployment(
|
async def update_deployment(
|
||||||
request: Deployment,
|
request: Deployment,
|
||||||
service: DeploymentService = Depends(get_deployment_service)
|
service: DeploymentService = Depends(get_deployment_service)
|
||||||
) -> bool:
|
) -> Deployment:
|
||||||
return await service.update_deployment_status(request)
|
return await service.update_deployment_status(request)
|
||||||
|
|
||||||
@router.get("/checkDeploymentStatus")
|
@router.get("/checkDeploymentStatus")
|
||||||
|
|||||||
@ -60,7 +60,7 @@ class DeploymentService:
|
|||||||
)
|
)
|
||||||
|
|
||||||
await self._start_deployment(deployment)
|
await self._start_deployment(deployment)
|
||||||
res = await dao.create_deployment(deployment)
|
res = await Deployment.insert(deployment)
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ class DeploymentService:
|
|||||||
async def update_deployment_status(
|
async def update_deployment_status(
|
||||||
self,
|
self,
|
||||||
deployment: Deployment
|
deployment: Deployment
|
||||||
) -> bool:
|
) -> Deployment:
|
||||||
latest_record = await Deployment.find_one(
|
latest_record = await Deployment.find_one(
|
||||||
Deployment.deployment_id == deployment.deployment_id,
|
Deployment.deployment_id == deployment.deployment_id,
|
||||||
sort=[("created_at", -1)]
|
sort=[("created_at", -1)]
|
||||||
@ -100,19 +100,22 @@ class DeploymentService:
|
|||||||
|
|
||||||
# TODO add more sanity check logic here
|
# TODO add more sanity check logic here
|
||||||
|
|
||||||
if deployment.deployment_stage == latest_record.deployment_status:
|
# if updating the same stage, just update the status and timestamp
|
||||||
|
# else, create a new record with the same deployment_id
|
||||||
|
res = None
|
||||||
|
if deployment.deployment_stage == latest_record.deployment_stage:
|
||||||
# update existing record
|
# update existing record
|
||||||
latest_record.deployment_status = deployment.deployment_status
|
latest_record.deployment_status = deployment.deployment_status
|
||||||
latest_record.updated_at = deployment.updated_at or datetime.now()
|
latest_record.updated_at = deployment.updated_at or datetime.now()
|
||||||
await latest_record.save()
|
res = await latest_record.save()
|
||||||
else:
|
else:
|
||||||
# create new record
|
# create new record
|
||||||
deployment.deployment_id = latest_record.deployment_id
|
deployment.deployment_id = latest_record.deployment_id
|
||||||
deployment.created_at = latest_record.created_at
|
deployment.created_at = datetime.now()
|
||||||
deployment.updated_at = datetime.now()
|
deployment.updated_at = datetime.now()
|
||||||
await deployment.insert()
|
res = await deployment.insert()
|
||||||
|
|
||||||
return True
|
return res
|
||||||
|
|
||||||
async def _get_code_depot_by_product_id(
|
async def _get_code_depot_by_product_id(
|
||||||
self,
|
self,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user