jamesp/mt-drugs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Couple of prod fixes

Browse Source
This commit is contained in:
James Pattinson
2026-04-26 16:19:13 -04:00
parent 05a093afd3
commit 562494a967
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/main.py
+6
View File
@@ -305,6 +305,7 @@ class DispensingCreate(BaseModel):
requested_pack_id: Optional[int] = None
requested_pack_count: Optional[float] = None
animal_name: Optional[str] = None
prescribing_vet: Optional[str] = None
user_name: Optional[str] = None
notes: Optional[str] = None
allocations: List[DispensingAllocationCreate] = []
@@ -327,6 +328,7 @@ class DispensingResponse(BaseModel):
requested_pack_id: Optional[int] = None
requested_pack_count: Optional[float] = None
animal_name: Optional[str] = None
prescribing_vet: Optional[str] = None
user_name: str
notes: Optional[str] = None
dispensed_at: datetime
@@ -1562,6 +1564,7 @@ def dispense_drug(dispensing: DispensingCreate, db: Session = Depends(get_db), c
requested_pack_id=resolved["pack_id"],
requested_pack_count=resolved["pack_count"],
animal_name=dispensing.animal_name,
prescribing_vet=dispensing.prescribing_vet,
user_name=user_name,
notes=dispensing.notes,
)
@@ -1635,6 +1638,7 @@ def list_dispensings(skip: int = 0, limit: int = 100, db: Session = Depends(get_
"requested_pack_id": item.requested_pack_id,
"requested_pack_count": item.requested_pack_count,
"animal_name": item.animal_name,
"prescribing_vet": item.prescribing_vet,
"user_name": item.user_name,
"notes": item.notes,
"dispensed_at": item.dispensed_at,
@@ -1669,6 +1673,7 @@ def get_drug_dispensings(drug_id: int, db: Session = Depends(get_db), current_us
"requested_pack_id": item.requested_pack_id,
"requested_pack_count": item.requested_pack_count,
"animal_name": item.animal_name,
"prescribing_vet": item.prescribing_vet,
"user_name": item.user_name,
"notes": item.notes,
"dispensed_at": item.dispensed_at,
@@ -1700,6 +1705,7 @@ def get_variant_dispensings(variant_id: int, db: Session = Depends(get_db), curr
"requested_pack_id": item.requested_pack_id,
"requested_pack_count": item.requested_pack_count,
"animal_name": item.animal_name,
"prescribing_vet": item.prescribing_vet,
"user_name": item.user_name,
"notes": item.notes,
"dispensed_at": item.dispensed_at,
backend/app/migrate_compliance.py
+1 -3
View File
@@ -62,7 +62,6 @@ def migrate_compliance_schema() -> None:
CREATE TABLE variant_packs (
id INTEGER PRIMARY KEY,
drug_variant_id INTEGER NOT NULL,
label VARCHAR NOT NULL,
pack_unit_name VARCHAR NOT NULL DEFAULT 'pack',
pack_size_in_base_units FLOAT NOT NULL DEFAULT 1,
is_active BOOLEAN NOT NULL DEFAULT 1,
@@ -138,9 +137,8 @@ def migrate_compliance_schema() -> None:
if _table_exists(cursor, "variant_packs") and _table_exists(cursor, "drug_variants"):
cursor.execute(
"""
INSERT INTO variant_packs (drug_variant_id, label, pack_unit_name, pack_size_in_base_units, is_active)
INSERT INTO variant_packs (drug_variant_id, pack_unit_name, pack_size_in_base_units, is_active)
SELECT v.id,
'1 ' || COALESCE(NULLIF(v.unit, ''), 'unit'),
COALESCE(NULLIF(v.unit, ''), 'unit'),
1,
1