Merge pull request #36 from hoosnick/master

fix: account_id field

Author: Muhammadali-Akbarov

payme/migrations/0004_alter_paymetransactions_account_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-25 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("payme", "0003_alter_paymetransactions_fiscal_data"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="paymetransactions",
+            name="account_id",
+            field=models.CharField(max_length=256),
+        ),
+    ]

payme/models.py

@@ -26,7 +26,7 @@ class PaymeTransactions(models.Model):
     ]
 
     transaction_id = models.CharField(max_length=50)
-    account_id = models.BigIntegerField(null=False)
+    account_id = models.CharField(max_length=256, null=False)
     amount = models.DecimalField(max_digits=10, decimal_places=2)
     state = models.IntegerField(choices=STATE, default=CREATED)
     fiscal_data = models.JSONField(default=dict)

payme/views.py

@@ -4,6 +4,7 @@
 from decimal import Decimal
 
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.utils.module_loading import import_string
 from rest_framework import views
 from rest_framework.response import Response
@@ -33,6 +34,9 @@ def wrapper(*args, **kwargs):
             logger.error(f"Account does not exist: {exc} {args} {kwargs}")
             raise exceptions.AccountDoesNotExist(str(exc)) from exc
 
+        except ValidationError:
+            raise exceptions.AccountDoesNotExist("Invalid account identifier.")
+
         except PaymeTransactions.DoesNotExist as exc:
             logger.error(f"Transaction does not exist: {exc} {args} {kwargs}")
             raise exceptions.AccountDoesNotExist(str(exc)) from exc
@@ -112,17 +116,11 @@ def fetch_account(self, params: dict):
         """
         Fetch account based on settings and params.
         """
-        account_field = settings.PAYME_ACCOUNT_FIELD
-
-        account_value = params['account'].get(account_field)
+        account_value = params["account"].get(settings.PAYME_ACCOUNT_FIELD)
         if not account_value:
             raise exceptions.InvalidAccount("Missing account field in parameters.")
 
-        # hard change
-        if account_field == "order_id":
-            account_field = "id"
-
-        account = AccountModel.objects.get(**{account_field: account_value})
+        account = AccountModel.objects.get(pk=account_value)
 
         return account
 
@@ -169,13 +167,17 @@ def create_transaction(self, params) -> response.CreateTransaction:
         defaults = {
             "amount": amount,
             "state": PaymeTransactions.INITIATING,
-            "account_id": account.id,
+            "account_id": account.pk,
         }
 
         # Handle already existing transaction with the same ID for one-time payments
         if settings.PAYME_ONE_TIME_PAYMENT:
             # Check for an existing transaction with a different transaction_id for the given account
-            if PaymeTransactions.objects.filter(account_id=account.id).exclude(transaction_id=transaction_id).exists():
+            if (
+                PaymeTransactions.objects.filter(account_id=account.pk)
+                .exclude(transaction_id=transaction_id)
+                .exists()
+            ):
                 message = f"Transaction {transaction_id} already exists (Payme)."
                 logger.warning(message)
                 raise exceptions.TransactionAlreadyExists(message)