renammed"last_ordering_date" to"last_order_date" for consistency

Author: cotanoine

app/modules/amap/cruds_amap.py

@@ -378,7 +378,7 @@ async def update_last_ordering_date(db: AsyncSession, user_id: str, date: dateti
         await db.execute(
             update(models_amap.Cash)
             .where(models_amap.Cash.user_id == user_id)
-            .values(last_ordering_date=date),
+            .values(last_order_date=date),
         )
         await db.flush()
 

app/modules/amap/endpoints_amap.py

@@ -459,7 +459,7 @@ async def add_order_to_delievery(
         balance = models_amap.Cash(
             balance=0,
             user_id=order.user_id,
-            last_ordering_date=ordering_date,
+            last_order_date=ordering_date,
         )
         await cruds_amap.create_cash_of_user(
             cash=balance,
@@ -857,7 +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),
+            last_order_date=datetime.now(UTC),
         )
 
     return cash
@@ -894,7 +894,7 @@ async def create_cash_of_user(
         )
 
     cash_db = models_amap.Cash(
-        user_id=user_id, balance=cash.balance, last_ordering_date=datetime.now(UTC)
+        user_id=user_id, balance=cash.balance, last_order_date=datetime.now(UTC)
     )
 
     await cruds_amap.create_cash_of_user(

app/modules/amap/models_amap.py

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

app/modules/amap/schemas_amap.py

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

migrations/versions/42-amap_add_last_ordering_date.py

@@ -13,6 +13,8 @@
 import sqlalchemy as sa
 from alembic import op
 
+from app.types.sqlalchemy import TZDateTime
+
 # revision identifiers, used by Alembic.
 revision: str = "5351256b1bfc"
 down_revision: str | None = "b72df3765853"
@@ -23,16 +25,16 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column(
-        "amap_cash", sa.Column("last_ordering_date", TZDateTime(), nullable=True)
+        "amap_cash", sa.Column("last_order_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)
+    op.execute("UPDATE amap_cash SET last_order_date = (?)", (default_time,))
+    op.alter_column("amap_cash", "last_order_date", nullable=False)
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("amap_cash", "last_ordering_date")
+    op.drop_column("amap_cash", "last_order_date")
 
 
 def pre_test_upgrade(