fix: s3 file sanitize
This commit is contained in:
parent
eaa7519303
commit
945e76bc34
|
|
@ -11,7 +11,7 @@ from interface.common_response import CommonResponse
|
||||||
from sqlalchemy import or_,func, case
|
from sqlalchemy import or_,func, case
|
||||||
from sqlalchemy import text
|
from sqlalchemy import text
|
||||||
|
|
||||||
from services.s3Service import get_signed_url
|
from services.s3Service import get_file_key, get_signed_url
|
||||||
from models import ClinicFileVerifications
|
from models import ClinicFileVerifications
|
||||||
from schemas.BaseSchemas import ClinicFileVerificationBase
|
from schemas.BaseSchemas import ClinicFileVerificationBase
|
||||||
from services.emailService import EmailService
|
from services.emailService import EmailService
|
||||||
|
|
@ -93,6 +93,9 @@ class ClinicServices:
|
||||||
clinic_response.abn_doc = get_signed_url(clinic_response.abn_doc) if clinic_response.abn_doc else None
|
clinic_response.abn_doc = get_signed_url(clinic_response.abn_doc) if clinic_response.abn_doc else None
|
||||||
clinic_response.contract_doc = get_signed_url(clinic_response.contract_doc) if clinic_response.contract_doc else None
|
clinic_response.contract_doc = get_signed_url(clinic_response.contract_doc) if clinic_response.contract_doc else None
|
||||||
|
|
||||||
|
if(clinic.status != ClinicStatus.ACTIVE):
|
||||||
|
clinicFiles = self.db.query(ClinicFileVerifications).filter(ClinicFileVerifications.clinic_id == clinic_id).first()
|
||||||
|
|
||||||
clinic_resp = {
|
clinic_resp = {
|
||||||
"clinic": clinic_response,
|
"clinic": clinic_response,
|
||||||
"creator": {
|
"creator": {
|
||||||
|
|
@ -101,7 +104,8 @@ class ClinicServices:
|
||||||
"phone": clinic.creator.mobile,
|
"phone": clinic.creator.mobile,
|
||||||
"designation": clinic.creator.clinicRole
|
"designation": clinic.creator.clinicRole
|
||||||
},
|
},
|
||||||
"clinic_files": self.get_clinic_files(clinic_id)
|
"clinic_files": self.get_clinic_files(clinic_id),
|
||||||
|
"fileStatus": {"reason":clinicFiles.rejection_reason if clinicFiles else None},
|
||||||
}
|
}
|
||||||
|
|
||||||
return clinic_resp
|
return clinic_resp
|
||||||
|
|
@ -127,6 +131,10 @@ class ClinicServices:
|
||||||
if clinic.creator_id != user["id"]:
|
if clinic.creator_id != user["id"]:
|
||||||
raise UnauthorizedException("You are not authorized to update this clinic")
|
raise UnauthorizedException("You are not authorized to update this clinic")
|
||||||
|
|
||||||
|
clinic_data.abn_doc = get_file_key(clinic_data.abn_doc) if clinic_data.abn_doc else None
|
||||||
|
clinic_data.contract_doc = get_file_key(clinic_data.contract_doc) if clinic_data.contract_doc else None
|
||||||
|
clinic_data.logo = get_file_key(clinic_data.logo) if clinic_data.logo else None
|
||||||
|
|
||||||
update_data = clinic_data.model_dump(exclude_unset=True)
|
update_data = clinic_data.model_dump(exclude_unset=True)
|
||||||
|
|
||||||
for key, value in update_data.items():
|
for key, value in update_data.items():
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue