Skip to content
Snippets Groups Projects
Verified Commit 12f492ab authored by hanfi's avatar hanfi
Browse files

get undelivered items list

parent a5e6f903
Branches
No related tags found
No related merge requests found
...@@ -56,6 +56,11 @@ def get_item(item_uuid: str, db: Session = Depends(get_db)): ...@@ -56,6 +56,11 @@ def get_item(item_uuid: str, db: Session = Depends(get_db)):
return item return item
@app.get("/items", response_model=list[schemas.Item])
def get_items(db: Session = Depends(get_db)):
return utils.get_stored_items(db)
@app.get("/tag/{tag}", response_model=schemas.Item) @app.get("/tag/{tag}", response_model=schemas.Item)
def get_item_by_tag(tag: str, db: Session = Depends(get_db)): def get_item_by_tag(tag: str, db: Session = Depends(get_db)):
item = utils.get_item_by_tag(db, tag) item = utils.get_item_by_tag(db, tag)
... ...
......
...@@ -17,6 +17,7 @@ class Item(db_Base): ...@@ -17,6 +17,7 @@ class Item(db_Base):
uuid = sql_Column(sql_Uuid, primary_key=True, default=uuid4) uuid = sql_Column(sql_Uuid, primary_key=True, default=uuid4)
amount = sql_Column(sql_Integer, default=1) amount = sql_Column(sql_Integer, default=1)
received_amount = sql_Column(sql_Integer, nullable=True, default=None)
created_at = sql_Column(sql_DateTime(timezone=True), server_default=sql_now()) created_at = sql_Column(sql_DateTime(timezone=True), server_default=sql_now())
received_at = sql_Column(sql_DateTime(timezone=True), nullable=True, default=None) received_at = sql_Column(sql_DateTime(timezone=True), nullable=True, default=None)
... ...
......
...@@ -25,6 +25,16 @@ def get_storage(db: Session, storage_name: str): ...@@ -25,6 +25,16 @@ def get_storage(db: Session, storage_name: str):
return db.get(models.Storage, storage_name) return db.get(models.Storage, storage_name)
def get_stored_items(db: Session):
return (
db.query(models.Item)
.filter(models.Item.received_at != None) # noqa: E711
.filter(models.Item.deployed_at == None) # noqa: E711
.order_by(models.Item.storage, models.Item.addressee)
.all()
)
def get_storages(db: Session): def get_storages(db: Session):
return db.query(models.Storage).all() return db.query(models.Storage).all()
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment