sarlink/sarlink-portal-api
7
0
Fork 0
mirror of https://github.com/i701/sarlink-portal-api.git synced 2025-10-05 13:35:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: add src_bank attribute to Payment and Topup model 🔨
All checks were successful
Build and Push Docker Images / Build and Push Docker Images (push) Successful in 5m4s
Details

Browse Source
This commit is contained in:
i701
2025-09-20 21:03:43 +05:00
parent 4714b6ec15
commit c56140011f
5 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apibase/settings.py
View File

@@ -26,7 +26,7 @@ env.read_env(os.path.join(BASE_DIR, ".env"))
# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = env("SECRET_KEY", default=get_random_secret_key()) SECRET_KEY = env("SECRET_KEY", default=get_random_secret_key()) #type: ignore
DEBUG = env.bool("DJANGO_DEBUG", default=True) # type: ignore DEBUG = env.bool("DJANGO_DEBUG", default=True) # type: ignore

22
billing/migrations/0016_payment_source_bank_topup_source_bank.py Normal file
View File

@@ -0,0 +1,22 @@
# Generated by Django 5.2 on 2025-09-20 16:02
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("billing", "0015_topup_payment_type"),
]
operations = [
migrations.AddField(
model_name="payment",
name="source_bank",
field=models.CharField(blank=True, default="", null=True),
),
migrations.AddField(
model_name="topup",
name="source_bank",
field=models.CharField(blank=True, default="", null=True),
),
]

2
billing/models.py
View File

@@ -17,6 +17,7 @@ class Payment(models.Model):
] ]
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
mib_reference = models.CharField(default="", null=True, blank=True) mib_reference = models.CharField(default="", null=True, blank=True)
source_bank = models.CharField(default="", null=True, blank=True)
number_of_months = models.IntegerField() number_of_months = models.IntegerField()
amount = models.FloatField() amount = models.FloatField()
paid = models.BooleanField(default=False) paid = models.BooleanField(default=False)
@@ -86,6 +87,7 @@ class Topup(models.Model):
default="PENDING", default="PENDING",
) )
mib_reference = models.CharField(default="", null=True, blank=True) mib_reference = models.CharField(default="", null=True, blank=True)
source_bank = models.CharField(default="", null=True, blank=True)
expires_at = models.DateTimeField(null=True, blank=True) expires_at = models.DateTimeField(null=True, blank=True)
expiry_notification_sent = models.BooleanField(default=False) expiry_notification_sent = models.BooleanField(default=False)
created_at = models.DateTimeField(default=timezone.now) created_at = models.DateTimeField(default=timezone.now)

24
billing/views.py
View File

@@ -61,7 +61,7 @@ class InsufficientFundsError(Exception):
class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIView): class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIView):
serializer_class = PaymentSerializer serializer_class = PaymentSerializer
queryset = Payment.objects.all().select_related("user") queryset = Payment.objects.all().select_related("user")
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend] #type: ignore
filterset_fields = "__all__" filterset_fields = "__all__"
filterset_class = PaymentFilter filterset_class = PaymentFilter
@@ -74,7 +74,7 @@ class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIVi
Prefetch("devices", queryset=device_qs) Prefetch("devices", queryset=device_qs)
) )
if not self.request.user.is_superuser: if not self.request.user.is_superuser: #type: ignore
queryset = queryset.filter(user=self.request.user) queryset = queryset.filter(user=self.request.user)
return queryset return queryset
@@ -195,7 +195,7 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
{"message": "Payment has already been verified."}, {"message": "Payment has already been verified."},
status=status.HTTP_400_BAD_REQUEST, status=status.HTTP_400_BAD_REQUEST,
) )
if payment.user != user and not user.is_superuser: if payment.user != user and not user.is_superuser: #type: ignore
return Response( return Response(
{"message": "You are not authorized to verify this payment."}, {"message": "You are not authorized to verify this payment."},
status=status.HTTP_403_FORBIDDEN, status=status.HTTP_403_FORBIDDEN,
@@ -356,6 +356,7 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
payment.paid_at = timezone.now() payment.paid_at = timezone.now()
payment.method = "TRANSFER" payment.method = "TRANSFER"
payment.mib_reference = mib_resp["transaction"]["ref"] or "" payment.mib_reference = mib_resp["transaction"]["ref"] or ""
payment.source_bank = mib_resp["transaction"]["sourceBank"] or ""
payment.save() payment.save()
return PaymentVerificationResponse( return PaymentVerificationResponse(
message=mib_resp["message"], message=mib_resp["message"],
@@ -381,7 +382,7 @@ class CancelPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
{"message": "Payment has already been cancelled."}, {"message": "Payment has already been cancelled."},
status=status.HTTP_400_BAD_REQUEST, status=status.HTTP_400_BAD_REQUEST,
) )
if instance.user != user and not user.is_superuser: if instance.user != user and not user.is_superuser: #type: ignore
return Response( return Response(
{"message": "You are not authorized to cancel this payment."}, {"message": "You are not authorized to cancel this payment."},
status=status.HTTP_403_FORBIDDEN, status=status.HTTP_403_FORBIDDEN,
@@ -401,7 +402,7 @@ class CancelPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
class ListCreateTopupView(StaffEditorPermissionMixin, generics.ListCreateAPIView): class ListCreateTopupView(StaffEditorPermissionMixin, generics.ListCreateAPIView):
queryset = Topup.objects.all().prefetch_related("user") queryset = Topup.objects.all().prefetch_related("user")
serializer_class = TopupSerializer serializer_class = TopupSerializer
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend] #type: ignore
filterset_fields = "__all__" filterset_fields = "__all__"
filterset_class = TopupFilter filterset_class = TopupFilter
@@ -422,7 +423,7 @@ class ListCreateTopupView(StaffEditorPermissionMixin, generics.ListCreateAPIView
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: #type: ignore
return queryset return queryset
return queryset.filter(user=self.request.user) return queryset.filter(user=self.request.user)
@@ -458,7 +459,7 @@ class TopupDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: #type: ignore
return queryset return queryset
return queryset.filter(user=self.request.user) return queryset.filter(user=self.request.user)
@@ -498,6 +499,7 @@ class VerifyTopupPaymentAPIView(StaffEditorPermissionMixin, generics.UpdateAPIVi
topup.paid = True topup.paid = True
topup.mib_reference = mib_resp["transaction"]["ref"] or "" topup.mib_reference = mib_resp["transaction"]["ref"] or ""
topup.paid_at = mib_resp["transaction"]["trxDate"] topup.paid_at = mib_resp["transaction"]["trxDate"]
topup.source_bank = mib_resp["transaction"]["sourceBank"] or ""
topup.save() topup.save()
return PaymentVerificationResponse( return PaymentVerificationResponse(
message=mib_resp["message"], message=mib_resp["message"],
@@ -518,7 +520,7 @@ class VerifyTopupPaymentAPIView(StaffEditorPermissionMixin, generics.UpdateAPIVi
{"message": "Payment has already been verified."}, {"message": "Payment has already been verified."},
status=status.HTTP_400_BAD_REQUEST, status=status.HTTP_400_BAD_REQUEST,
) )
if topup_instance.user != user and not user.is_superuser: if topup_instance.user != user and not user.is_superuser: #type: ignore
return Response( return Response(
{"message": "You are not allowed to pay for this topup."}, {"message": "You are not allowed to pay for this topup."},
status=status.HTTP_403_FORBIDDEN, status=status.HTTP_403_FORBIDDEN,
@@ -585,7 +587,7 @@ class CancelTopupView(StaffEditorPermissionMixin, generics.UpdateAPIView):
if ( if (
instance.user != user instance.user != user
and getattr(user, "is_admin") and getattr(user, "is_admin")
and not user.is_superuser and not user.is_superuser #type: ignore
): ):
return Response( return Response(
{"message": "You are not authorized to delete this topup."}, {"message": "You are not authorized to delete this topup."},
@@ -653,13 +655,13 @@ class AdminTopupCreateView(StaffEditorPermissionMixin, generics.CreateAPIView):
class ListWalletTransactionView(StaffEditorPermissionMixin, generics.ListAPIView): class ListWalletTransactionView(StaffEditorPermissionMixin, generics.ListAPIView):
serializer_class = WalletTransactionSerializer serializer_class = WalletTransactionSerializer
queryset = WalletTransaction.objects.all().select_related("user") queryset = WalletTransaction.objects.all().select_related("user")
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend] #type: ignore
filterset_fields = "__all__" filterset_fields = "__all__"
filterset_class = WalletTransactionFilter filterset_class = WalletTransactionFilter
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: if getattr(self.request.user, "is_admin") or self.request.user.is_superuser: #type: ignore
return queryset return queryset
return queryset.filter(user=self.request.user) return queryset.filter(user=self.request.user)

23
pyrightconfig.json
View File

@@ -1,16 +1,11 @@
{ {
"venvPath": ".", "venvPath": ".",
"venv": ".venv", "venv": ".venv",
"reportMissingImports": "error", "reportMissingImports": "error",
"include": ["src"], "include": ["src"],
"typeCheckingMode": "standard", "typeCheckingMode": "standard",
"reportArgumentType": "warning", "reportArgumentType": "warning",
"reportUnusedVariable": "warning", "reportUnusedVariable": "warning",
"reportFunctionMemberAccess": "none", "reportFunctionMemberAccess": "none",
"exclude": [ "exclude": ["council-api/**/migrations", "**/__pycache__"]
"council-api/**/migrations",
"**/__pycache__",
"src/experimental",
"src/typestubs"
]
} }