Server backup 2026-11-07 of uncommitted work in projects/pharma-web-celtic
Snapshot of the working tree on srv1071960 (branch main), taken during server cleanup. .env files, node_modules, builds, logs and media were excluded.
This commit is contained in:
+23
-9
@@ -12,6 +12,7 @@ from app.pdf.service import PDFService
|
||||
from app.reports.schemas import (
|
||||
ApproveRequest,
|
||||
ChemistCallCreate,
|
||||
StockistCallCreate,
|
||||
DCRCreate,
|
||||
DCRListItem,
|
||||
DCRRead,
|
||||
@@ -111,7 +112,7 @@ async def download_pdf(
|
||||
async def create_report(
|
||||
payload: DCRCreate,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(await DCRService(db).create(payload, current_user, client_ip(request)))
|
||||
@@ -122,7 +123,7 @@ async def update_report(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: DCRUpdate,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
@@ -137,7 +138,7 @@ async def add_doctor_call(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: DoctorCallCreate,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
@@ -150,7 +151,7 @@ async def add_chemist_call(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: ChemistCallCreate,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
@@ -158,12 +159,25 @@ async def add_chemist_call(
|
||||
)
|
||||
|
||||
|
||||
@router.post("/{dcr_id}/calls/stockist", response_model=DCRRead, status_code=201)
|
||||
async def add_stockist_call(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: StockistCallCreate,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
await DCRService(db).add_stockist_call(dcr_id, payload, current_user, client_ip(request))
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{dcr_id}/calls/{call_id}", response_model=DCRRead)
|
||||
async def delete_call(
|
||||
dcr_id: uuid.UUID,
|
||||
call_id: uuid.UUID,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
@@ -207,7 +221,7 @@ async def clear_missed_reason(
|
||||
async def submit(
|
||||
dcr_id: uuid.UUID,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.MR, Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.MR, Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(await DCRService(db).submit(dcr_id, current_user, client_ip(request)))
|
||||
@@ -218,7 +232,7 @@ async def return_report(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: ReturnRequest,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
return to_read(
|
||||
@@ -233,10 +247,10 @@ async def approve(
|
||||
dcr_id: uuid.UUID,
|
||||
payload: ApproveRequest,
|
||||
request: Request,
|
||||
current_user: User = Depends(require_role(Role.AM)),
|
||||
current_user: User = Depends(require_role(Role.ABM)),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> DCRRead:
|
||||
"""Area Manager final approval (headquarters scope is enforced by the service)."""
|
||||
"""Area Business Manager final approval (headquarters scope is enforced by the service)."""
|
||||
return to_read(
|
||||
await DCRService(db).approve(dcr_id, payload.comment, current_user, client_ip(request))
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user