feat: Fix target id

Author: AlirezaYousefpourM

mono/payment/domain_hooks.py

@@ -3,6 +3,7 @@
 
 def on_payment_success(payment: Payment):
     if payment.target_type == Payment.TargetType.COMPETITION:
+        # TODO: Fix this
         from competitions.models import TeamRequest
         from competitions.services import mark_payment_final
         tr = TeamRequest.objects.get(id=payment.target_id)
@@ -15,6 +16,7 @@ def on_payment_success(payment: Payment):
         set_status_final(list(regs_qs))
 
 def on_payment_failure(payment: Payment):
+    # TODO: Fix this
     if payment.target_type == Payment.TargetType.COMPETITION:
         from competitions.models import TeamRequest
         from competitions.services import mark_payment_rejected

mono/payment/models.py

@@ -21,7 +21,6 @@ class TargetType(models.TextChoices):
 
     status = models.CharField(max_length=24, choices=Status.choices, default=Status.PENDING)
 
-    # Zarinpal field
     authority = models.CharField(max_length=64, blank=True, db_index=True)
     ref_id = models.CharField(max_length=64, blank=True)
     card_pan = models.CharField(max_length=32, blank=True)

mono/payment/services.py

@@ -1,11 +1,12 @@
 # payment/services.py
 
+from __future__ import annotations
+
 import requests
 from dataclasses import dataclass
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, Any
 from django.conf import settings
 from django.db import transaction
-
 from django.contrib.auth import get_user_model
 
 from acm.exceptions import CustomAPIException
@@ -38,7 +39,7 @@ def _callback_url() -> str:
 
 def _unverified_list() -> List[Dict]:
     """
-    Fetches the list of unverified authorities from Zarinpal.
+    Fetch the list of unverified authorities from Zarinpal.
     Returns [] on non-100 or network error.
     """
     url = f"{Z_BASE}/unVerified.json"
@@ -65,8 +66,6 @@ def _request_payment(
         "metadata": {"email": email, **({"mobile": mobile} if mobile else {})},
     }
     r = requests.post(url, json=payload, headers=HEADERS, timeout=20)
-    # optional debug:
-    # print(f"status code: {r.status_code}, message: {r.text}")
     r.raise_for_status()
     return r.json()
 
@@ -85,15 +84,18 @@ def initiate_payment_for_target(
     *,
     user: User,
     target_type: str,
-    target_id: int,
+    target_id: str,                      # e.g. "PARENT_ID,CHILD_ID_1,CHILD_ID_2"
     amount: int,
     description: str = "",
+    extra_metadata: Optional[Dict[str, Any]] = None,   # attach {"reg_id": ..., "parent_course_id": ..., "child_course_ids":[...], ...}
 ) -> StartPayResult:
     """
     1) Check existing PENDING payments for the user; if any authority is still unverified at the gateway,
        attempt to verify it. If verification succeeds for SAME target, raise conflict.
     2) Create a new Zarinpal request and persist a PENDING Payment with the returned authority.
     3) Return StartPay URL.
+
+    NOTE: target_id is a string so we can store composite IDs (e.g., "42,101,102").
     """
     if not user or not user.is_authenticated:
         raise CustomAPIException(
@@ -128,7 +130,7 @@ def initiate_payment_for_target(
                     p.card_hash = str(d.get("card_hash", "") or "")
                     p.save()
                     # conflict if same purchase already paid
-                    if p.target_type == target_type and p.target_id == target_id:
+                    if p.target_type == target_type and str(p.target_id) == str(target_id):
                         raise CustomAPIException(
                             code=EC.PAY_EXISTING_SUCCESS,
                             message="Existing successful payment found for this purchase",
@@ -151,12 +153,12 @@ def initiate_payment_for_target(
         Payment.objects.create(
             user=user,
             target_type=target_type,
-            target_id=target_id,
+            target_id=str(target_id),
             amount=amount,
             status=Payment.Status.PG_INITIATE_ERROR,
             zarinpal_message=str(e),
             description=description or "",
-            metadata={"stage": "request", "exc": str(e)},
+            metadata={"stage": "request", "exc": str(e), **(extra_metadata or {})},
         )
         raise CustomAPIException(
             code=EC.PAY_INIT_FAILED,
@@ -170,13 +172,13 @@ def initiate_payment_for_target(
         Payment.objects.create(
             user=user,
             target_type=target_type,
-            target_id=target_id,
+            target_id=str(target_id),
             amount=amount,
             status=Payment.Status.PG_INITIATE_ERROR,
             zarinpal_code=str(code),
             zarinpal_message=d.get("message", "") or "",
             description=description or "",
-            metadata={"stage": "request", "resp": d},
+            metadata={"stage": "request", "resp": d, **(extra_metadata or {})},
         )
         raise CustomAPIException(
             code=EC.PAY_GATEWAY_REFUSED,
@@ -188,12 +190,12 @@ def initiate_payment_for_target(
     pay = Payment.objects.create(
         user=user,
         target_type=target_type,
-        target_id=target_id,
+        target_id=str(target_id),   # store as string
         amount=amount,
         status=Payment.Status.PENDING,
         authority=authority,
         description=description or "",
-        metadata={"fee_type": d.get("fee_type"), "fee": d.get("fee")},
+        metadata={"fee_type": d.get("fee_type"), "fee": d.get("fee"), **(extra_metadata or {})},
     )
     startpay_url = f"https://payment.zarinpal.com/pg/StartPay/{authority}"
     return StartPayResult(url=startpay_url, payment=pay)
@@ -204,6 +206,8 @@ def verify_by_authority(*, user: User, authority: str) -> Payment:
     """
     Verify a payment by authority for the given user (frontend passes authority after redirect).
     On success/failure, updates Payment and triggers domain hooks.
+
+    If metadata includes 'reg_id', finalize that registration (parent+children) immediately.
     """
     if not user or not user.is_authenticated:
         raise CustomAPIException(
@@ -222,10 +226,11 @@ def verify_by_authority(*, user: User, authority: str) -> Payment:
         )
 
     if p.status != Payment.Status.PENDING:
-        # Already processed; return as-is (frontend can branch on status)
+        # Already processed; return as-is
         return p
 
     merchant = settings.ZARINPAL_MERCHANT_ID
+
     try:
         res = _verify_payment(merchant_id=merchant, amount=p.amount, authority=authority)
     except requests.RequestException as e:
@@ -251,5 +256,22 @@ def verify_by_authority(*, user: User, authority: str) -> Payment:
         p.status = Payment.Status.FAILED
         p.save()
         on_payment_failure(p)
+        return p
+
+    # If we know the registration that initiated this payment, finalize it now.
+    try:
+        reg_id = (p.metadata or {}).get("reg_id")
+        if reg_id:
+            from presentations.services import set_status_final  # local import to avoid circulars
+            from presentations.models import Registration
+            reg = (
+                Registration.objects
+                .select_for_update()
+                .select_related("course", "user")
+                .get(id=int(reg_id), user=user)
+            )
+            set_status_final([reg])
+    except Exception:
+        pass
 
     return p

mono/presentations/services.py

@@ -16,12 +16,6 @@
 
 
 def _is_full(capacity: int | None, taken: int) -> bool:
-    """
-    Capacity rules:
-      - None => unlimited (never full)
-      - 0    => closed (always full)
-      - >0   => full when taken >= capacity
-    """
     if capacity is None:
         return False
     if capacity == 0:
@@ -37,10 +31,6 @@ def _parent_capacity_full(course: Course) -> bool:
 
 
 def _child_capacity_full(child: Course) -> bool:
-    """
-    A child seat is taken when a Registration that includes this child is
-    APPROVED or FINAL.
-    """
     taken = RegistrationItem.objects.filter(
         child_course=child,
         registration__status__in=[Registration.Status.APPROVED, Registration.Status.FINAL],
@@ -71,13 +61,10 @@ def submit_registration(
     resume_url: str | None = None,
 ) -> Registration:
     """
-    Create/replace a user's registration for a parent course with selected children.
-
-    Behavior:
-      - Do NOT block when full.
-      - If parent OR any child is full => set RESERVED and force approval (even if requires_approval=False).
-      - Else QUEUED.
-      - If no approval required AND status is QUEUED => auto-approve/finalize (free) or create payment link.
+    Do NOT block when full.
+    If parent OR any child is full => set RESERVED and force approval.
+    Else QUEUED.
+    If no approval required AND status is QUEUED => auto-approve/finalize (free) or create payment link.
     """
     if (not user.is_authenticated) or (not getattr(user, "is_email_verified", False)):
         raise CustomAPIException(
@@ -88,7 +75,6 @@ def submit_registration(
 
     child_ids = child_ids or []
 
-    # Validate selected children are active and actually belong to this course
     valid_children_qs = course.children.filter(is_active=True, id__in=child_ids)
     valid_children = list(valid_children_qs)
     if len(valid_children) != len(child_ids):
@@ -98,13 +84,11 @@ def submit_registration(
             status_code=status.HTTP_400_BAD_REQUEST,
         )
 
-    # Capacity snapshot
     parent_full = _parent_capacity_full(course)
     full_children = [c for c in valid_children if _child_capacity_full(c)]
     any_child_full = bool(full_children)
-    forced_waitlist = parent_full or any_child_full  # => RESERVED + approval flow
+    forced_waitlist = parent_full or any_child_full
 
-    # Create or reuse the registration
     reg, created = Registration.objects.get_or_create(course=course, user=user)
     if (not created) and reg.status in [Registration.Status.FINAL]:
         raise CustomAPIException(
@@ -113,16 +97,12 @@ def submit_registration(
             status_code=status.HTTP_409_CONFLICT,
         )
 
-    # Update main fields
     reg.resume_url = resume_url or reg.resume_url
     reg.submitted_at = timezone.now()
     reg.rejection_reason = ""
-
-    # Initial status
     reg.status = Registration.Status.RESERVED if forced_waitlist else Registration.Status.QUEUED
     reg.save()
 
-    # Save extra applicant data (best-effort)
     if extra_updates:
         extra, _ = UserExtraData.objects.get_or_create(user=user)
         extra.answers = {**(extra.answers or {}), **extra_updates}
@@ -135,7 +115,6 @@ def submit_registration(
             extra.codeforces_handle = str(extra_updates["codeforces_handle"])[:64]
         extra.save()
 
-    # Refresh children selections
     RegistrationItem.objects.filter(registration=reg).delete()
     for c in valid_children:
         RegistrationItem.objects.create(
@@ -144,7 +123,6 @@ def submit_registration(
             price=c.price,
         )
 
-    # Notify submit
     send_status_change_email(
         to=user.email,
         status_code="COURSE_REQUEST_SUBMITTED",
@@ -155,7 +133,6 @@ def submit_registration(
         },
     )
 
-    # If any capacity is full, or course/child requires approval, do NOT auto-progress.
     requires_approval = bool(getattr(course, "requires_approval", False)) or any(
         getattr(c, "requires_approval", False) for c in valid_children
     ) or forced_waitlist
@@ -175,22 +152,36 @@ def set_status_approved(
     override_amount: int | None = None,
     description: str | None = None,
 ) -> Registration:
+    """
+    Move a registration to APPROVED and create a payment link.
+    Now pushes a *bundle* target_id and attaches reg_id in metadata so
+    verify step can finalize this registration immediately.
+    """
     reg.status = Registration.Status.APPROVED
 
     if payment_link is None:
         amount = override_amount if override_amount is not None else _compute_total_amount(reg)
-        try:
-            payment_result = initiate_payment_for_target(
-                user=reg.user,
-                target_type=Payment.TargetType.COURSE,  # keep existing target type
-                target_id=reg.course.id,
-                amount=amount,
-                description=description or _compose_description(reg),
-            )
-        except CustomAPIException:
-            # Bubble up payment-layer codes (e.g., PAY_INIT_FAILED / PAY_GATEWAY_REFUSED)
-            raise
-        reg.payment_link = payment_result.url
+
+        parent_id = str(reg.course.id)
+        child_ids = [str(it.child_course_id) for it in reg.items.all()]
+        bundle_target_id = ",".join([parent_id, *child_ids])  # string
+
+        metadata = {
+            "reg_id": reg.id,
+            "parent_course_id": reg.course.id,
+            "child_course_ids": child_ids,
+            "bundle": True,
+        }
+
+        result = initiate_payment_for_target(
+            user=reg.user,
+            target_type="COURSE_BUNDLE",
+            target_id=bundle_target_id,
+            amount=amount,
+            description=description or _compose_description(reg),
+            extra_metadata=metadata,
+        )
+        reg.payment_link = result.url
     else:
         reg.payment_link = payment_link
 
@@ -243,12 +234,8 @@ def set_status_rejected(reg: Registration, *, actor: User | None = None) -> Regi
 
 
 def _auto_progress_to_payment(reg: Registration) -> None:
-    """
-    Auto-approve or auto-finalize (if free) when approval is NOT required and status is QUEUED.
-    """
     total = _compute_total_amount(reg)
     if total <= 0:
-        # Free registration — finalize directly
         reg.status = Registration.Status.FINAL
         reg.decided_at = timezone.now()
         reg.payment_link = ""