Payments | Fix

backend/payments/.env.example

@@ -2,7 +2,7 @@ SECRET_KEY='django'
 DEBUG=True
 ALLOWED_HOSTS='*'
 JWT_SECRET_KEY='Token'
-SHOP_AСCOUNT_ID=111111
+SHOP_ACCOUNT_ID=111111
 SHOP_SECRET_KEY='test_1111111111'
 ROLLBAR_ACCESS_TOKEN='1111111111'
 POSTGRES_PASSWORD=postgres

backend/payments/.gitignore

@@ -1 +1,2 @@
 /payment_response_example.py
+/static

backend/payments/.pre-commit-config.yaml

@@ -1,25 +1,34 @@
+files: 'backend/payments*'
 repos:
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: "v5.9.3"
-  hooks:
-  - id: isort
-    args: [--profile=black]
-
-- repo: https://github.com/pycqa/flake8.git
-  rev: 6.0.0
-  hooks:
-  - id: flake8
-    args: [
-      "--ignore=E501"
-    ]
-    additional_dependencies: [
-      "flake8-bugbear",
-      "flake8-builtins",
-      "pep8-naming",
-      "flake8-commas",
-      "flake8-quotes",
-      "flake8-todo",
-      "flake8-django",
-      "flake8-cognitive-complexity",
-      "flake8-isort",
-   ]
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+      - id: black
+        args: [--skip-string-normalization, --line-length=100]
+        language_version: python3.11
+  - repo: https://github.com/asottile/add-trailing-comma
+    rev: v2.4.0
+    hooks:
+    - id: add-trailing-comma
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.12.0 
+    hooks:
+    - id: isort
+      args: [--profile=black]
+  - repo: https://github.com/pycqa/flake8.git
+    rev: 6.0.0
+    hooks:
+    - id: flake8
+      args: [
+        "--max-line-length=100"
+      ]
+      additional_dependencies: [
+        "flake8-bugbear",
+        "flake8-builtins",
+        "pep8-naming",
+        "flake8-commas",
+        "flake8-quotes",
+        "flake8-todo",
+        "flake8-django",
+        "flake8-cognitive-complexity",
+    ]

backend/payments/Dockerfiles/scripts/entrypoint.sh

@@ -48,7 +48,6 @@ done
 >&2 echo "Redis is available"
 
 python manage.py collectstatic --noinput  
-python manage.py makemigrations  --noinput 
 python manage.py migrate
 gunicorn config.wsgi:application --bind :8000 -k gevent
 

backend/payments/README.md

@@ -79,7 +79,7 @@ Subsequently, all indexed files will be checked with `Flake8` before committing.
 
 To check with `Flake8` the files indexed for the commit run:
 ```shell
-pre-commit run  
+pre-commit run --all-files
 ```
 If it's necessary to skip using `pre-commit hook`, the commit should run with the `-n` or `--no-verify` flag:
 ```shell

backend/payments/apps/base/fields.py

@@ -6,14 +6,18 @@
 class MoneyField(DecimalField):
     def __init__(
         self,
-            verbose_name=None,
-            name=None,
-            max_digits=settings.MAX_BALANCE_DIGITS,
-            decimal_places=2,
-            **kwargs,
+        verbose_name=None,
+        name=None,
+        max_digits=settings.MAX_BALANCE_DIGITS,
+        decimal_places=2,
+        **kwargs,
     ):
         super().__init__(
-            verbose_name, name, max_digits, decimal_places, **kwargs,
+            verbose_name,
+            name,
+            max_digits,
+            decimal_places,
+            **kwargs,
         )
 
 
@@ -26,5 +30,8 @@ def __init__(
         **kwargs,
     ):
         super().__init__(
-            max_digits, decimal_places, min_value, **kwargs,
+            max_digits,
+            decimal_places,
+            min_value,
+            **kwargs,
         )

backend/payments/apps/base/utils.py

@@ -2,21 +2,20 @@
 
 import rollbar
 from _decimal import Decimal
+from apps.payment_accounts.models import Account, BalanceChange
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.models import Model
 
-from apps.payment_accounts.models import Account, BalanceChange
-
 DjangoModel = TypeVar('DjangoModel', bound=Model)
 
 
 def parse_model_instance(
-        *,
-        django_model: type[DjangoModel],
-        error_message: str,
-        pk: int,
+    *,
+    django_model: type[DjangoModel],
+    error_message: str,
+    pk: int,
 ) -> DjangoModel | None:
     try:
         django_model_instance = django_model.objects.get(pk=pk)
@@ -28,9 +27,9 @@ def parse_model_instance(
 
 
 def increase_user_balance(
-        *,
-        balance_change_object: BalanceChange,
-        amount: Decimal,
+    *,
+    balance_change_object: BalanceChange,
+    amount: Decimal,
 ) -> None:
     with transaction.atomic():
         balance_change_object.is_accepted = True
@@ -41,10 +40,11 @@ def increase_user_balance(
             pk=balance_change_object.account_id.pk,
             amount=Decimal(amount),
         )
-    rollbar.report_message((
-        f'Deposit {balance_change_object.amount} {settings.DEFAULT_CURRENCY} '
-        f'to user account {balance_change_object.account_id}'
-    ),
+    rollbar.report_message(
+        (
+            f'Deposit {balance_change_object.amount} {settings.DEFAULT_CURRENCY} '
+            f'to user account {balance_change_object.account_id}'
+        ),
         'info',
     )
 
@@ -62,9 +62,10 @@ def decrease_user_balance(*, account: Account, amount: Decimal):
             pk=account.pk,
             amount=Decimal(amount),
         )
-    rollbar.report_message((
-        f'Withdraw {balance_change_object.amount} {settings.DEFAULT_CURRENCY} '
-        f'from user account {balance_change_object.account_id}'
-    ),
+    rollbar.report_message(
+        (
+            f'Withdraw {balance_change_object.amount} {settings.DEFAULT_CURRENCY} '
+            f'from user account {balance_change_object.account_id}'
+        ),
         'info',
     )

backend/payments/apps/external_payments/schemas.py

@@ -3,11 +3,10 @@
 from decimal import Decimal
 from uuid import UUID
 
+from apps.base.schemas import URL
 from dataclasses_json import config, dataclass_json
 from django.conf import settings
 
-from apps.base.schemas import URL
-
 
 class PaymentResponseStatuses(enum.Enum):
     succeeded = 'payment.succeeded'

backend/payments/apps/external_payments/serializers.py

@@ -1,8 +1,7 @@
+from apps.base.fields import MoneySerializerField
 from rest_enumfield import EnumField
 from rest_framework import serializers
 
-from apps.base.fields import MoneySerializerField
-
 from .schemas import PaymentResponseStatuses, PaymentTypes
 
 
@@ -18,6 +17,7 @@ def rename_builtin_names(self, old_data: dict, postfix: str = '_'):
         given postfix.
         e.g. field name is `id` and postfix is `_yookassa`: id -> id_yookassa
         """
+
         def generate_new_key():
             builtin_names = ('id', 'type', 'object')
             if key in builtin_names:

backend/payments/apps/external_payments/services/accept_payment.py

@@ -1,13 +1,15 @@
 from decimal import Decimal
 
 import rollbar
-
 from apps.base import utils
-from apps.external_payments.schemas import (PaymentResponseStatuses,
-                                            YookassaPaymentResponse)
+from apps.external_payments.schemas import (
+    PaymentResponseStatuses,
+    YookassaPaymentResponse,
+)
 from apps.payment_accounts.models import Account, BalanceChange
-from apps.payment_accounts.services.payment_commission import \
-    calculate_payment_without_commission
+from apps.payment_accounts.services.payment_commission import (
+    calculate_payment_without_commission,
+)
 from apps.transactions.models import Invoice
 
 from . import invoice_execution as pay_proc
@@ -64,9 +66,7 @@ def _run_payment_acceptance(self):
     def parse_user_account(self):
         return utils.parse_model_instance(
             django_model=Account,
-            error_message=(
-                f"Can't get user account instance for user id {self.account_id}"
-            ),
+            error_message=(f"Can't get user account instance for user id {self.account_id}"),
             pk=self.account_id,
         )
 
@@ -79,9 +79,7 @@ def __init__(self, yookassa_response: YookassaPaymentResponse):
     def _parse_balance_object(self) -> BalanceChange | None:
         return utils.parse_model_instance(
             django_model=BalanceChange,
-            error_message=(
-                f"Can't get payment instance for payment id {self.payment_body.id_}"
-            ),
+            error_message=(f"Can't get payment instance for payment id {self.payment_body.id_}"),
             pk=int(self.payment_body.metadata['balance_change_id']),
         )
 
@@ -154,9 +152,10 @@ def _is_commission_correct(self):
 
 
 def execute_invoice_operations(
-        *, invoice_instance: Invoice,
-        payer_account: Account,
-        decrease_amount: Decimal,
+    *,
+    invoice_instance: Invoice,
+    payer_account: Account,
+    decrease_amount: Decimal,
 ):
     invoice_executioner = pay_proc.InvoiceExecution(invoice_instance)
     invoice_executioner.process_invoice_transactions()

backend/payments/apps/external_payments/services/create_payment.py

@@ -1,15 +1,13 @@
-from yookassa import Payment
-
 from apps.base.schemas import URL
+from yookassa import Payment
 
 from .. import schemas
 
 
 def get_yookassa_payment_url(
-        payment_data: schemas.PaymentCreateDataClass,
-        metadata: dict,
+    payment_data: schemas.PaymentCreateDataClass,
+    metadata: dict,
 ) -> URL:
-
     yookassa_payment_info = schemas.YookassaPaymentCreate(
         amount=schemas.AmountDataClass(
             value=payment_data.payment_amount,

backend/payments/apps/external_payments/services/invoice_execution.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 
-from django.conf import settings
-
 from apps.transactions.models import Invoice, Transaction, TransactionHistory
+from django.conf import settings
 
 from ..exceptions import ExtraTransactionHistoriesError
 from ..tasks import get_item_for_self_user, gift_item_to_other_user
@@ -33,7 +32,7 @@ def process_transaction(self, invoice_transaction: Transaction) -> None:
 
     @staticmethod
     def get_transaction_execution_date_time(
-            invoice_transaction: Transaction,
+        invoice_transaction: Transaction,
     ) -> datetime:
         transactions_history = invoice_transaction.transactions_history.all()
         if len(transactions_history) > 1: