gotthard_g/aaredb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated models and schemas for shipments and dewars

Browse Source
This commit is contained in:
GotthardG
2024-11-11 11:43:49 +01:00
parent d5c7e7e6f3
commit 701c42c0dd
8 changed files with 96 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/app/models.py
View File

@@ -7,7 +7,7 @@ from app.calculations import calculate_number_of_pucks, calculate_number_of_samp
class Shipment(Base):
__tablename__ = "shipments"
shipment_id = Column(Integer, primary_key=True, index=True, autoincrement=True)
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
shipment_name = Column(String, index=True)
shipment_date = Column(Date)
shipment_status = Column(String)
@@ -49,7 +49,7 @@ class Address(Base):
class Dewar(Base):
__tablename__ = "dewars"
id = Column(String, primary_key=True, index=True)
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
dewar_name = Column(String)
tracking_number = Column(String)
status = Column(String)
@@ -58,7 +58,7 @@ class Dewar(Base):
arrival_date = Column(Date, nullable=True)
returning_date = Column(Date, nullable=True)
qrcode = Column(String)
shipment_id = Column(String, ForeignKey("shipments.shipment_id"))
shipment_id = Column(Integer, ForeignKey("shipments.id"))
return_address_id = Column(Integer, ForeignKey("addresses.id"))
contact_person_id = Column(Integer, ForeignKey("contact_persons.id"))
@@ -92,7 +92,7 @@ class Puck(Base):
puck_name = Column(String)
puck_type = Column(String)
puck_location_in_dewar = Column(Integer)
dewar_id = Column(String, ForeignKey('dewars.id')) # Note: changed to String
dewar_id = Column(Integer, ForeignKey('dewars.id')) # Note: changed to String
positions = relationship("Sample", back_populates="puck")
dewar = relationship("Dewar", back_populates="pucks")