This commit is contained in:
Shubhankar45
2026-10-27 12:03:31 +00:00
parent 2ed3945b5d
commit 4e5e95775d
104 changed files with 5210 additions and 606 deletions
+69 -8
View File
@@ -7,14 +7,22 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.audit.service import AuditService
from app.auth.dependencies import assert_can_view_hq, visible_hq_ids
from app.common.enums import AuditAction, EntityType, Role
from app.common import master_approval
from app.common.enums import AuditAction, EntityType, MasterApproval, Role, FIELD_ROLES
from app.common.exceptions import ConflictError, NotFoundError, ValidationError
from app.common.utils import snapshot
from app.doctors.models import Doctor, DoctorAssignment
from app.doctors.schemas import DoctorCreate, DoctorUpdate
from app.users.models import User
_AUDIT_FIELDS = ["name", "clinic_address", "speciality", "is_core_doctor", "is_active"]
_AUDIT_FIELDS = [
"name",
"clinic_address",
"speciality",
"date_of_birth",
"is_core_doctor",
"is_active",
]
class DoctorService:
@@ -23,10 +31,35 @@ class DoctorService:
self.audit = AuditService(db)
async def create(self, data: DoctorCreate, actor: User, ip: str | None = None) -> Doctor:
# A2/A3 — masters are owned by ADMIN/GM. An MR cannot create a doctor.
# A2/A3 — masters belong to a headquarters. An MR may add one only to their own.
await assert_can_view_hq(self.db, actor, data.headquarters_id)
doctor = Doctor(**data.model_dump())
values = data.model_dump()
# Added by an MR: it waits for the Area Manager. One they were refused is sent again.
twin = None
if actor.role in FIELD_ROLES:
twin = await master_approval.rejected_twin(
self.db, Doctor, {k: values[k] for k in ('headquarters_id', 'name', 'clinic_address')}
)
if twin is not None:
await master_approval.resubmit(self.db, twin, values, actor, DoctorAssignment, "doctor_id")
await self.audit.log(
actor_user_id=actor.id,
entity_type=EntityType.DOCTOR,
entity_id=twin.id,
action=AuditAction.SUBMIT,
after=snapshot(twin, _AUDIT_FIELDS),
ip_address=ip,
)
await self.db.commit()
await self.db.refresh(twin)
return twin
doctor = Doctor(
**values,
approval_status=master_approval.initial_status(actor),
requested_by_user_id=actor.id if actor.role in FIELD_ROLES else None,
)
self.db.add(doctor)
try:
await self.db.flush()
@@ -45,7 +78,22 @@ class DoctorService:
after=snapshot(doctor, _AUDIT_FIELDS),
ip_address=ip,
)
# An MR only sees assigned doctors, so the one they add is assigned to them.
if actor.role in FIELD_ROLES:
start = date.today()
self.db.add(
DoctorAssignment(doctor_id=doctor.id, mr_user_id=actor.id, effective_from=start)
)
await self.audit.log(
actor_user_id=actor.id,
entity_type=EntityType.DOCTOR,
entity_id=doctor.id,
action=AuditAction.ASSIGN,
after={"mr_user_id": str(actor.id), "effective_from": start.isoformat()},
ip_address=ip,
)
await self.db.commit()
await self.db.refresh(doctor)
return doctor
async def update(
@@ -74,7 +122,7 @@ class DoctorService:
async def list_for(self, actor: User) -> list[Doctor]:
"""An MR sees ONLY doctors currently assigned to them (R5)."""
if actor.role == Role.MR:
if actor.role in FIELD_ROLES:
stmt = (
select(Doctor)
.join(DoctorAssignment, DoctorAssignment.doctor_id == Doctor.id)
@@ -82,13 +130,14 @@ class DoctorService:
DoctorAssignment.mr_user_id == actor.id,
DoctorAssignment.effective_to.is_(None),
Doctor.is_active.is_(True),
Doctor.approval_status == MasterApproval.APPROVED,
)
.order_by(Doctor.name)
)
return list((await self.db.execute(stmt)).scalars().all())
allowed = await visible_hq_ids(self.db, actor)
stmt = select(Doctor).order_by(Doctor.name)
stmt = select(Doctor).where(Doctor.approval_status == MasterApproval.APPROVED).order_by(Doctor.name)
if allowed is not None:
stmt = stmt.where(Doctor.headquarters_id.in_(allowed or [None]))
return list((await self.db.execute(stmt)).scalars().all())
@@ -105,14 +154,16 @@ class DoctorService:
if doctor is None:
raise NotFoundError("Doctor not found")
await assert_can_view_hq(self.db, actor, doctor.headquarters_id)
if doctor.approval_status != MasterApproval.APPROVED:
raise ValidationError("This doctor is still waiting for the Area Manager's approval")
mr = await self.db.get(User, mr_user_id)
if mr is None:
raise NotFoundError("MR not found")
if mr.role != Role.MR:
if mr.role not in FIELD_ROLES:
raise ValidationError("Doctors can only be assigned to an MR")
# An MR may only be given doctors from their own headquarters.
if mr.headquarters_id != doctor.headquarters_id:
if doctor.headquarters_id not in mr.covered_headquarter_ids:
raise ValidationError(
"MR and doctor belong to different headquarters",
{
@@ -150,3 +201,13 @@ class DoctorService:
)
await self.db.commit()
return assignment
async def requests_for(self, actor: User) -> list[Doctor]:
return await master_approval.requests_for(self.db, Doctor, actor)
async def review(
self, doctor_id: uuid.UUID, approve: bool, reason: str | None, actor: User, ip: str | None = None
) -> Doctor:
return await master_approval.review(
self.db, Doctor, EntityType.DOCTOR, doctor_id, approve, reason, actor, ip
)