add last ordering date of user

Author: cotanoine

app/modules/amap/cruds_amap.py

@@ -2,6 +2,7 @@
 
 import logging
 from collections.abc import Sequence
+from datetime import datetime
 
 from sqlalchemy import delete, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -349,7 +350,7 @@ async def add_cash(db: AsyncSession, user_id: str, amount: float):
         await db.execute(
             update(models_amap.Cash)
             .where(models_amap.Cash.user_id == user_id)
-            .values(user_id=balance.user_id, balance=balance.balance + amount),
+            .values(balance=balance.balance + amount),
         )
         await db.flush()
 
@@ -363,7 +364,21 @@ async def remove_cash(db: AsyncSession, user_id: str, amount: float):
         await db.execute(
             update(models_amap.Cash)
             .where(models_amap.Cash.user_id == user_id)
-            .values(user_id=balance.user_id, balance=balance.balance - amount),
+            .values(balance=balance.balance - amount),
+        )
+        await db.flush()
+
+
+async def update_last_ordering_date(db: AsyncSession, user_id: str, date: datetime):
+    result = await db.execute(
+        select(models_amap.Cash).where(models_amap.Cash.user_id == user_id),
+    )
+    balance = result.scalars().first()
+    if balance is not None:
+        await db.execute(
+            update(models_amap.Cash)
+            .where(models_amap.Cash.user_id == user_id)
+            .values(last_ordering_date=date),
         )
         await db.flush()
 

app/modules/amap/endpoints_amap.py

@@ -456,12 +456,10 @@ async def add_order_to_delievery(
 
     # If the balance does not exist, we create a new one with a balance of 0
     if not balance:
-        new_cash_db = schemas_amap.CashBase(
+        balance = models_amap.Cash(
             balance=0,
             user_id=order.user_id,
-        )
-        balance = models_amap.Cash(
-            **new_cash_db.model_dump(),
+            last_ordering_date=ordering_date,
         )
         await cruds_amap.create_cash_of_user(
             cash=balance,
@@ -492,6 +490,12 @@ async def add_order_to_delievery(
             amount=amount,
         )
 
+        await cruds_amap.update_last_ordering_date(
+            db=db,
+            user_id=order.user_id,
+            date=ordering_date,
+        )
+
         orderret = await cruds_amap.get_order_by_id(order_id=db_order.order_id, db=db)
         productsret = await cruds_amap.get_products_of_order(db=db, order_id=order_id)
 
@@ -619,6 +623,12 @@ async def edit_order_from_delivery(
                 user_id=previous_order.user_id,
                 amount=previous_amount,
             )
+            date = datetime.now(UTC)
+            await cruds_amap.update_last_ordering_date(
+                db=db,
+                user_id=previous_order.user_id,
+                date=date,
+            )
             hyperion_amap_logger.info(
                 f"Edit_order: Order {order_id} has been edited for user {db_order.user_id}. Amount was {previous_amount}€, is now {amount}€. ({request_id})",
             )
@@ -847,6 +857,7 @@ async def get_cash_by_id(
             balance=0,
             user_id=user_id,
             user=schemas_users.CoreUserSimple(**user_db.__dict__),
+            last_ordering_date=datetime.now(UTC),
         )
 
     return cash
@@ -882,7 +893,9 @@ async def create_cash_of_user(
             detail="This user already has a cash.",
         )
 
-    cash_db = models_amap.Cash(user_id=user_id, balance=cash.balance)
+    cash_db = models_amap.Cash(
+        user_id=user_id, balance=cash.balance, last_ordering_date=datetime.now(UTC)
+    )
 
     await cruds_amap.create_cash_of_user(
         cash=cash_db,
@@ -987,7 +1000,7 @@ async def get_orders_of_user(
                 delivery_date=order.delivery.delivery_date,
                 delivery_name=order.delivery.name,
                 **order.__dict__,
-            )
+            ),
         )
     return res
 

app/modules/amap/models_amap.py

@@ -107,6 +107,7 @@ class Cash(Base):
         primary_key=True,
     )
     balance: Mapped[float]
+    last_ordering_date: Mapped[datetime]
     user: Mapped[CoreUser] = relationship("CoreUser", init=False)
 
 

app/modules/amap/schemas_amap.py

@@ -124,6 +124,7 @@ class CashBase(BaseModel):
 
 class CashComplete(CashBase):
     user: CoreUserSimple
+    last_ordering_date: datetime
 
 
 class CashEdit(BaseModel):

migrations/versions/42-amap_add_last_ordering_date.py

@@ -0,0 +1,49 @@
+"""empty message
+
+Create Date: 2025-09-25 13:10:51.977068
+"""
+
+from collections.abc import Sequence
+from datetime import datetime
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pytest_alembic import MigrationContext
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "5351256b1bfc"
+down_revision: str | None = "b72df3765853"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "amap_cash", sa.Column("last_ordering_date", TZDateTime(), nullable=True)
+    )
+    default_time = datetime(2025, 1, 1)
+    op.execute("UPDATE amap_cash SET last_ordering_date = (?)", (default_time,))
+    op.alter_column("amap_cash", "last_ordering_date", nullable=False)
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("amap_cash", "last_ordering_date")
+
+
+def pre_test_upgrade(
+    alembic_runner: "MigrationContext",
+    alembic_connection: sa.Connection,
+) -> None:
+    pass
+
+
+def test_upgrade(
+    alembic_runner: "MigrationContext",
+    alembic_connection: sa.Connection,
+) -> None:
+    pass