fix: complete stars purchase (#4)

Author: emptybutton

pyproject.toml

@@ -107,7 +107,7 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 "src/ttt/infrastructure/adapters/*" = ["ARG002"]
 "src/ttt/presentation/adapters/*" = ["ARG002"]
-"src/ttt/presentation/aiogram/*" = ["RUF001"]
+"src/ttt/presentation/*" = ["RUF001"]
 "tests/*" = ["S101", "PT013", "PLR2004", "D400", "D415"]
 "tests/test_tgdb/test_entities/test_horizon.py" = ["D400", "D415"]
 

src/ttt/application/player/start_stars_purchase_payment.py

@@ -34,7 +34,7 @@ async def __call__(self, player_id: int, purchase_id: UUID) -> None:
 
             tracking = Tracking()
             try:
-                player.process_stars_purchase_payment(
+                player.start_stars_purchase_payment(
                     purchase_id, payment_id, current_datetime, tracking,
                 )
             except PaymentIsAlreadyBeingMadeError:

src/ttt/entities/core/player/player.py

@@ -9,9 +9,11 @@
 from ttt.entities.core.player.stars_purchase import StarsPurchase
 from ttt.entities.core.player.win import Win
 from ttt.entities.core.stars import Stars
-from ttt.entities.finance.payment.payment import cancel_payment, complete_payment
+from ttt.entities.finance.payment.payment import (
+    cancel_payment,
+    complete_payment,
+)
 from ttt.entities.finance.payment.success import PaymentSuccess
-from ttt.entities.finance.rubles import Rubles
 from ttt.entities.math.random import Random, deviated_int
 from ttt.entities.text.emoji import Emoji
 from ttt.entities.tools.assertion import assert_
@@ -205,7 +207,7 @@ def start_stars_purchase(
         )
         self.stars_purchases.append(stars_purchase)
 
-    def process_stars_purchase_payment(
+    def start_stars_purchase_payment(
         self,
         purchase_id: UUID,
         payment_id: UUID,

src/ttt/infrastructure/alembic/versions/1dd1ac771b91_add_state_to_payments_table.py

@@ -0,0 +1,73 @@
+"""
+add `state` to `payments` table.
+
+Revision ID: 1dd1ac771b91
+Revises: ce3ee64d0d3b
+Create Date: 2025-07-02 05:32:15.368212
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+
+revision: str = "1dd1ac771b91"
+down_revision: str | None = "ce3ee64d0d3b"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    sa.Enum(
+        "in_process",
+        "cancelled",
+        "completed",
+        name="payment_state",
+    ).create(op.get_bind())
+
+    op.add_column(
+        "payments",
+        sa.Column(
+            "state",
+            postgresql.ENUM(
+                "in_process",
+                "cancelled",
+                "completed",
+                name="payment_state",
+                create_type=False,
+            ),
+            nullable=True,
+        ),
+    )
+
+    op.execute("""
+        UPDATE payments SET state = 'cancelled' WHERE is_cancelled;
+    """)
+    op.execute("""
+        UPDATE payments SET state = 'completed' WHERE success_id IS NOT NULL;
+    """)
+    op.execute("""
+        UPDATE payments SET state = 'in_process'
+        WHERE NOT is_cancelled AND success_id IS NULL;
+    """)
+
+    op.drop_column("payments", "is_cancelled")
+    op.alter_column("payments", "state", nullable=False)
+
+
+def downgrade() -> None:
+    op.add_column(
+        "payments",
+        sa.Column(
+            "is_cancelled", sa.BOOLEAN(), autoincrement=False, nullable=True,
+        ),
+    )
+    op.execute("""
+        UPDATE payments SET is_cancelled = true WHERE state = 'cancelled';
+    """)
+    op.alter_column("payments", "is_cancelled", nullable=False)
+
+    op.drop_column("payments", "state")

src/ttt/infrastructure/alembic/versions/46880a6a8cff_rename_stars_purchases_new_stars_to_.py

@@ -0,0 +1,33 @@
+"""
+rename `stars_purchases.new_stars` to `stars_purchases.stars`.
+
+Revision ID: 46880a6a8cff
+Revises: b19b4f555d6d
+Create Date: 2025-07-02 05:11:35.208443
+
+"""
+from collections.abc import Sequence
+
+from alembic import op
+
+
+revision: str = "46880a6a8cff"
+down_revision: str | None = "b19b4f555d6d"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.alter_column(
+        "stars_purchases",
+        "new_stars",
+        new_column_name="stars",
+    )
+
+
+def downgrade() -> None:
+    op.alter_column(
+        "stars_purchases",
+        "stars",
+        new_column_name="new_stars",
+    )

src/ttt/infrastructure/alembic/versions/86d75da6c607_make_stars_purchases_payment_id_nullable.py

@@ -0,0 +1,34 @@
+"""
+make `stars_purchases.payment_id` nullable.
+
+Revision ID: 86d75da6c607
+Revises: 46880a6a8cff
+Create Date: 2025-07-02 05:15:03.842458
+
+"""
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+
+revision: str = "86d75da6c607"
+down_revision: str | None = "46880a6a8cff"
+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.alter_column("stars_purchases", "payment_id",
+               existing_type=sa.UUID(),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("stars_purchases", "payment_id",
+               existing_type=sa.UUID(),
+               nullable=False)
+    # ### end Alembic commands ###

src/ttt/infrastructure/alembic/versions/ce3ee64d0d3b_exclude_nulls_from_ix_stars_purchases_.py

@@ -0,0 +1,48 @@
+"""
+exclude nulls from `ix_stars_purchases_payment_id`.
+
+Revision ID: ce3ee64d0d3b
+Revises: 86d75da6c607
+Create Date: 2025-07-02 05:19:22.411169
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+
+revision: str = "ce3ee64d0d3b"
+down_revision: str | None = "86d75da6c607"
+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.drop_index(
+        op.f("ix_stars_purchases_payment_id"), table_name="stars_purchases",
+    )
+    op.create_index(
+        op.f("ix_stars_purchases_payment_id"),
+        "stars_purchases",
+        ["payment_id"],
+        unique=False,
+        postgresql_where=sa.text("payment_id IS NOT NULL"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(
+        op.f("ix_stars_purchases_payment_id"), table_name="stars_purchases",
+    )
+    op.create_index(
+        op.f("ix_stars_purchases_payment_id"),
+        "stars_purchases",
+        ["payment_id"],
+        unique=False,
+    )
+    # ### end Alembic commands ###

src/ttt/infrastructure/sqlalchemy/tables.py

@@ -4,7 +4,7 @@
 from enum import StrEnum
 from uuid import UUID
 
-from sqlalchemy import CHAR, BigInteger, ForeignKey
+from sqlalchemy import CHAR, BigInteger, ForeignKey, Index
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
 
@@ -25,7 +25,7 @@
 from ttt.entities.core.player.player import Player
 from ttt.entities.core.player.stars_purchase import StarsPurchase
 from ttt.entities.core.player.win import Win
-from ttt.entities.finance.payment.payment import Payment
+from ttt.entities.finance.payment.payment import Payment, PaymentState
 from ttt.entities.finance.payment.success import PaymentSuccess
 from ttt.entities.finance.rubles import Rubles
 from ttt.entities.math.matrix import Matrix
@@ -36,6 +36,34 @@
 class Base(DeclarativeBase): ...
 
 
+class TablePaymentState(StrEnum):
+    in_process = "in_process"
+    cancelled = "cancelled"
+    completed = "completed"
+
+    def entity(self) -> PaymentState:
+        match self:
+            case TablePaymentState.in_process:
+                return PaymentState.in_process
+            case TablePaymentState.cancelled:
+                return PaymentState.cancelled
+            case TablePaymentState.completed:
+                return PaymentState.completed
+
+    @classmethod
+    def of(cls, it: PaymentState) -> "TablePaymentState":
+        match it:
+            case PaymentState.in_process:
+                return TablePaymentState.in_process
+            case PaymentState.cancelled:
+                return TablePaymentState.cancelled
+            case PaymentState.completed:
+                return TablePaymentState.completed
+
+
+payment_state = postgresql.ENUM(TablePaymentState, name="payment_state")
+
+
 class TablePayment(Base):
     __tablename__ = "payments"
 
@@ -45,21 +73,25 @@ class TablePayment(Base):
     completion_datetime: Mapped[datetime | None]
     success_id: Mapped[str | None]
     success_gateway_id: Mapped[str | None]
-    is_cancelled: Mapped[bool]
+    state: Mapped[TablePaymentState] = mapped_column(payment_state)
 
     def entity(self) -> Payment:
         if self.success_id is None or self.success_gateway_id is None:
             success = None
         else:
             success = PaymentSuccess(self.success_id, self.success_gateway_id)
 
+        paid_rubles = Rubles.with_total_kopecks(
+            self.paid_rubles_total_kopecks,
+        )
+
         return Payment(
-            self.id,
-            Rubles.with_total_kopecks(self.paid_rubles_total_kopecks),
-            self.start_datetime,
-            self.completion_datetime,
-            success,
-            self.is_cancelled,
+            id_=self.id,
+            paid_rubles=paid_rubles,
+            start_datetime=self.start_datetime,
+            completion_datetime=self.completion_datetime,
+            success=success,
+            state=self.state.entity(),
         )
 
     @classmethod
@@ -78,7 +110,7 @@ def of(cls, it: Payment) -> "TablePayment":
             completion_datetime=it.completion_datetime,
             success_id=success_id,
             success_gateway_id=success_gateway_id,
-            is_cancelled=it.is_cancelled,
+            state=TablePaymentState.of(it.state),
         )
 
 
@@ -120,13 +152,23 @@ class TableStarsPurchase(Base):
         index=True,
     )
     location_chat_id: Mapped[int] = mapped_column(BigInteger())
-    new_stars: Mapped[int]
-    payment_id: Mapped[UUID] = mapped_column(
+    stars: Mapped[int]
+    payment_id: Mapped[UUID | None] = mapped_column(
         ForeignKey("payments.id", deferrable=True, initially="DEFERRED"),
-        index=True,
     )
 
-    payment = relationship(TablePayment, lazy="joined")
+    payment: Mapped[TablePayment | None] = relationship(
+        TablePayment,
+        lazy="joined",
+    )
+
+    __table_args__ = (
+        Index(
+            "ix_stars_purchases_payment_id",
+            payment_id,
+            postgresql_where=(payment_id.is_not(None)),
+        ),
+    )
 
     def entity(self) -> StarsPurchase:
         return StarsPurchase(
@@ -135,8 +177,8 @@ def entity(self) -> StarsPurchase:
                 self.location_player_id,
                 self.location_chat_id,
             ),
-            new_stars=self.new_stars,
-            payment=self.payment.entity(),
+            stars=self.stars,
+            payment=None if self.payment is None else self.payment.entity(),
         )
 
     @classmethod
@@ -145,8 +187,8 @@ def of(cls, it: StarsPurchase) -> "TableStarsPurchase":
             id=it.id_,
             location_player_id=it.location.player_id,
             location_chat_id=it.location.chat_id,
-            new_stars=it.new_stars,
-            payment_id=it.payment.id_,
+            stars=it.stars,
+            payment_id=None if it.payment is None else it.payment.id_,
         )