Couple of prod fixes
This commit is contained in:
@@ -305,6 +305,7 @@ class DispensingCreate(BaseModel):
|
|||||||
requested_pack_id: Optional[int] = None
|
requested_pack_id: Optional[int] = None
|
||||||
requested_pack_count: Optional[float] = None
|
requested_pack_count: Optional[float] = None
|
||||||
animal_name: Optional[str] = None
|
animal_name: Optional[str] = None
|
||||||
|
prescribing_vet: Optional[str] = None
|
||||||
user_name: Optional[str] = None
|
user_name: Optional[str] = None
|
||||||
notes: Optional[str] = None
|
notes: Optional[str] = None
|
||||||
allocations: List[DispensingAllocationCreate] = []
|
allocations: List[DispensingAllocationCreate] = []
|
||||||
@@ -327,6 +328,7 @@ class DispensingResponse(BaseModel):
|
|||||||
requested_pack_id: Optional[int] = None
|
requested_pack_id: Optional[int] = None
|
||||||
requested_pack_count: Optional[float] = None
|
requested_pack_count: Optional[float] = None
|
||||||
animal_name: Optional[str] = None
|
animal_name: Optional[str] = None
|
||||||
|
prescribing_vet: Optional[str] = None
|
||||||
user_name: str
|
user_name: str
|
||||||
notes: Optional[str] = None
|
notes: Optional[str] = None
|
||||||
dispensed_at: datetime
|
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_id=resolved["pack_id"],
|
||||||
requested_pack_count=resolved["pack_count"],
|
requested_pack_count=resolved["pack_count"],
|
||||||
animal_name=dispensing.animal_name,
|
animal_name=dispensing.animal_name,
|
||||||
|
prescribing_vet=dispensing.prescribing_vet,
|
||||||
user_name=user_name,
|
user_name=user_name,
|
||||||
notes=dispensing.notes,
|
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_id": item.requested_pack_id,
|
||||||
"requested_pack_count": item.requested_pack_count,
|
"requested_pack_count": item.requested_pack_count,
|
||||||
"animal_name": item.animal_name,
|
"animal_name": item.animal_name,
|
||||||
|
"prescribing_vet": item.prescribing_vet,
|
||||||
"user_name": item.user_name,
|
"user_name": item.user_name,
|
||||||
"notes": item.notes,
|
"notes": item.notes,
|
||||||
"dispensed_at": item.dispensed_at,
|
"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_id": item.requested_pack_id,
|
||||||
"requested_pack_count": item.requested_pack_count,
|
"requested_pack_count": item.requested_pack_count,
|
||||||
"animal_name": item.animal_name,
|
"animal_name": item.animal_name,
|
||||||
|
"prescribing_vet": item.prescribing_vet,
|
||||||
"user_name": item.user_name,
|
"user_name": item.user_name,
|
||||||
"notes": item.notes,
|
"notes": item.notes,
|
||||||
"dispensed_at": item.dispensed_at,
|
"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_id": item.requested_pack_id,
|
||||||
"requested_pack_count": item.requested_pack_count,
|
"requested_pack_count": item.requested_pack_count,
|
||||||
"animal_name": item.animal_name,
|
"animal_name": item.animal_name,
|
||||||
|
"prescribing_vet": item.prescribing_vet,
|
||||||
"user_name": item.user_name,
|
"user_name": item.user_name,
|
||||||
"notes": item.notes,
|
"notes": item.notes,
|
||||||
"dispensed_at": item.dispensed_at,
|
"dispensed_at": item.dispensed_at,
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ def migrate_compliance_schema() -> None:
|
|||||||
CREATE TABLE variant_packs (
|
CREATE TABLE variant_packs (
|
||||||
id INTEGER PRIMARY KEY,
|
id INTEGER PRIMARY KEY,
|
||||||
drug_variant_id INTEGER NOT NULL,
|
drug_variant_id INTEGER NOT NULL,
|
||||||
label VARCHAR NOT NULL,
|
|
||||||
pack_unit_name VARCHAR NOT NULL DEFAULT 'pack',
|
pack_unit_name VARCHAR NOT NULL DEFAULT 'pack',
|
||||||
pack_size_in_base_units FLOAT NOT NULL DEFAULT 1,
|
pack_size_in_base_units FLOAT NOT NULL DEFAULT 1,
|
||||||
is_active BOOLEAN 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"):
|
if _table_exists(cursor, "variant_packs") and _table_exists(cursor, "drug_variants"):
|
||||||
cursor.execute(
|
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,
|
SELECT v.id,
|
||||||
'1 ' || COALESCE(NULLIF(v.unit, ''), 'unit'),
|
|
||||||
COALESCE(NULLIF(v.unit, ''), 'unit'),
|
COALESCE(NULLIF(v.unit, ''), 'unit'),
|
||||||
1,
|
1,
|
||||||
1
|
1
|
||||||
|
|||||||
Reference in New Issue
Block a user