fix(views): optimize database queries to solve N+1 problems 🔨🐛

Feat/user verification flow

.gitea/workflows/docker-build.yml

@@ -39,3 +39,7 @@ jobs:
              docker compose --progress plain down portal-api portal-api-nginx && \
              docker compose --progress plain up -d portal-api portal-api-nginx && \
              docker compose exec portal-api python manage.py migrate"
+
+      - name: Clean up dangling images
+        if: github.event_name != 'pull_request'
+        run: ssh root@10.0.1.5 -t "docker image prune -f"

.gitignore

@@ -163,3 +163,4 @@ cython_debug/
 #staticfiles
 staticfiles/
 postgres_data/
+media/

api/admin.py

@@ -47,6 +47,7 @@ class UserAdmin(BaseUserAdmin):
                     "island",
                     "terms_accepted",
                     "policy_accepted",
+                    "agreement",
                 )
             },
         ),

api/filters.py

@@ -6,6 +6,8 @@ class UserFilter(django_filters.FilterSet):
     last_name = django_filters.CharFilter(lookup_expr="icontains")
     first_name = django_filters.CharFilter(lookup_expr="icontains")
     email = django_filters.CharFilter(lookup_expr="icontains")
+    id_card = django_filters.CharFilter(lookup_expr="icontains")
+    mobile = django_filters.CharFilter(lookup_expr="icontains")
 
     class Meta:
         model = User

api/migrations/0017_alter_temporaryuser_t_id_card_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.2 on 2025-07-15 20:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("api", "0016_user_is_admin"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="temporaryuser",
+            name="t_id_card",
+            field=models.CharField(
+                blank=True, db_index=True, max_length=255, null=True, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="temporaryuser",
+            name="t_mobile",
+            field=models.CharField(
+                blank=True, db_index=True, max_length=255, null=True, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="id_card",
+            field=models.CharField(
+                blank=True, db_index=True, max_length=255, null=True, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="mobile",
+            field=models.CharField(
+                blank=True, db_index=True, max_length=255, null=True, unique=True
+            ),
+        ),
+    ]

api/migrations/0018_user_agreement.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2 on 2025-07-24 18:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("api", "0017_alter_temporaryuser_t_id_card_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="agreement",
+            field=models.FileField(
+                blank=True,
+                help_text="Upload the agreement file signed by the user.",
+                null=True,
+                upload_to="agreements/",
+            ),
+        ),
+    ]

api/models.py

@@ -8,15 +8,20 @@ from django.db import models
 from .managers import CustomUserManager
 from django.utils import timezone
 import pyotp
+from billing.models import WalletTransaction
 
 
 class User(AbstractUser):
     address = models.CharField(max_length=255, blank=True)
     email = models.EmailField(blank=True, null=True, unique=True)
-    mobile = models.CharField(max_length=255, blank=True, unique=True, null=True)
+    mobile = models.CharField(
+        max_length=255, blank=True, unique=True, null=True, db_index=True
+    )
     designation = models.CharField(max_length=255, blank=True)
     acc_no = models.CharField(max_length=255, blank=True)
-    id_card = models.CharField(max_length=255, blank=True, unique=True, null=True)
+    id_card = models.CharField(
+        max_length=255, blank=True, unique=True, null=True, db_index=True
+    )
     verified = models.BooleanField(default=False)
     is_admin = models.BooleanField(default=False)
     dob = models.DateField(blank=True, null=True)
@@ -30,12 +35,44 @@ class User(AbstractUser):
     island = models.ForeignKey(
         "Island", on_delete=models.SET_NULL, null=True, blank=True, related_name="users"
     )
+
+    agreement = models.FileField(
+        upload_to="agreements/",
+        blank=True,
+        null=True,
+        help_text="Upload the agreement file signed by the user.",
+    )
     created_at = models.DateTimeField(default=timezone.now)
     updated_at = models.DateTimeField(auto_now=True)
 
     def get_all_fields(self, instance):
         return [field.name for field in instance.get_fields()]
 
+    def add_wallet_funds(self, amount, description="", reference_id=None):
+        self.wallet_balance += amount
+        self.save(update_fields=["wallet_balance"])
+        WalletTransaction.objects.create(
+            user=self,
+            amount=amount,
+            transaction_type="TOPUP",
+            description=description,
+            reference_id=reference_id,
+        )
+
+    def deduct_wallet_funds(self, amount, description="", reference_id=None):
+        if self.wallet_balance >= amount:
+            self.wallet_balance -= amount
+            self.save(update_fields=["wallet_balance"])
+            WalletTransaction.objects.create(
+                user=self,
+                amount=amount,
+                transaction_type="DEBIT",
+                description=description,
+                reference_id=reference_id,
+            )
+            return True
+        return False
+
     objects = CustomUserManager()
 
 
@@ -46,10 +83,14 @@ class TemporaryUser(models.Model):
     t_last_name = models.CharField(max_length=255, blank=True)
     t_address = models.CharField(max_length=255, blank=True)
     t_email = models.EmailField(blank=True, null=True, unique=True)
-    t_mobile = models.CharField(max_length=255, blank=True, unique=True, null=True)
+    t_mobile = models.CharField(
+        max_length=255, blank=True, unique=True, null=True, db_index=True
+    )
     t_designation = models.CharField(max_length=255, blank=True)
     t_acc_no = models.CharField(max_length=255, blank=True)
-    t_id_card = models.CharField(max_length=255, blank=True, unique=True, null=True)
+    t_id_card = models.CharField(
+        max_length=255, blank=True, unique=True, null=True, db_index=True
+    )
     t_verified = models.BooleanField(default=False)
     t_dob = models.DateField(blank=True, null=True)
     t_terms_accepted = models.BooleanField(default=False)
@@ -95,7 +136,7 @@ class TemporaryUser(models.Model):
         verbose_name_plural = "Temporary Users"
 
     def __str__(self) -> str:
-        return str(self.t_username)
+        return f"{self.t_username}"
 
 
 class Atoll(models.Model):

api/serializers.py

@@ -1,9 +1,12 @@
 from knox.models import AuthToken
 from django.contrib.auth import authenticate
-from api.models import User, Atoll, Island, TemporaryUser
+from api.models import Atoll, Island, TemporaryUser
 from django.contrib.auth.models import Permission
 
 from rest_framework import serializers
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
 
 
 class IslandSerializer(serializers.ModelSerializer):
@@ -21,6 +24,40 @@ class AtollSerializer(serializers.ModelSerializer):
         depth = 2
 
 
+class UserProfileUpdateSerializer(serializers.ModelSerializer):
+    class Meta:  # type: ignore
+        model = User
+        fields = (
+            "email",
+            "mobile",
+        )  # Only allow these fields
+
+
+class UserUpdateSerializer(serializers.ModelSerializer):
+    class Meta:  # type: ignore
+        model = User
+        fields = (
+            "id_card",
+            "mobile",
+            "first_name",
+            "last_name",
+            "address",
+            "dob",
+            "atoll",
+            "island",
+            "agreement",
+        )
+
+
+class UserAgreementSerializer(serializers.ModelSerializer):
+    """serializer for the user agreement object"""
+
+    class Meta:  # type: ignore
+        model = User
+        fields = ("agreement",)
+        extra_kwargs = {"agreement": {"required": True, "allow_null": False}}
+
+
 class CustomUserSerializer(serializers.ModelSerializer):
     """serializer for the user object"""
 
@@ -80,7 +117,10 @@ class CustomReadOnlyUserSerializer(serializers.ModelSerializer):
             "username",
             "mobile",
             "address",
+            "acc_no",
             "id_card",
+            "agreement",
+            "wallet_balance",
         )
         depth = 1
 

api/signals.py

@@ -12,12 +12,15 @@ from api.tasks import verify_user_with_person_api_task
 @receiver(post_save, sender=User)
 def assign_device_permissions(sender, instance, created, **kwargs):
     if created:
-        # Assign all permissions for devices and read permission for atoll and island
         device_permissions = Permission.objects.filter(content_type__model="device")
         atoll_read_permission = Permission.objects.get(codename="view_atoll")
         island_read_permission = Permission.objects.get(codename="view_island")
-        payment_permissions = Permission.objects.filter(content_type__model="payment")
-        topup_permissions = Permission.objects.filter(content_type__model="topup")
+        payment_permissions = Permission.objects.filter(
+            content_type__model="payment"
+        ).exclude(codename__startswith="delete_")
+        topup_permissions = Permission.objects.filter(
+            content_type__model="topup"
+        ).exclude(codename__startswith="delete_")
 
         for permission in topup_permissions:
             instance.user_permissions.add(permission)
@@ -29,9 +32,9 @@ def assign_device_permissions(sender, instance, created, **kwargs):
 
 
 @receiver(post_save, sender=User)
-async def verify_user_with_person_api(sender, instance, created, **kwargs):
+def verify_user_with_person_api(sender, instance, created, **kwargs):
     if created:
-        await verify_user_with_person_api_task.defer_async(instance.id)
+        verify_user_with_person_api_task(instance.id)
 
 
 @receiver(reset_password_token_created)

api/tasks.py

@@ -5,10 +5,12 @@ from api.notifications import send_sms
 import os
 import logging
 from django.utils import timezone
-from api.notifications import send_clean_telegram_markdown
+
+# from api.notifications import send_clean_telegram_markdown
 from api.omada import Omada
 from apibase.env import env, BASE_DIR
 from procrastinate.contrib.django import app
+from procrastinate import builtin_tasks
 
 
 logger = logging.getLogger(__name__)
@@ -16,10 +18,21 @@ logger = logging.getLogger(__name__)
 env.read_env(os.path.join(BASE_DIR, ".env"))
 
 
-@app.task
-def add(x, y):
-    logger.info(f"Executing test background task with {x} and {y}")
-    return x + y
+@app.periodic(cron="0 * * * *")  # every 1 hour
+@app.task(
+    queueing_lock="remove_old_jobs",
+    pass_context=True,
+)
+async def remove_old_jobs(context, timestamp):
+    logger.info("Running remove_old_jobs task...")
+    return await builtin_tasks.remove_old_jobs(
+        context,
+        queue="heavy_tasks",
+        max_hours=1,
+        remove_failed=True,
+        remove_cancelled=True,
+        remove_aborted=True,
+    )
 
 
 @app.periodic(
@@ -68,8 +81,7 @@ def add_new_devices_to_omada(new_devices: list[dict]):
     omada_client.add_new_devices_to_omada(new_devices)
 
 
-@app.task
-async def verify_user_with_person_api_task(user_id: int):
+def verify_user_with_person_api_task(user_id: int):
     """
     Verify the user with the Person API.
     :param user_id: The ID of the user to verify.

api/urls.py

@@ -5,7 +5,7 @@ from knox import views as knox_views
 from .views import (
     LoginView,
     CreateTemporaryUserView,
-    ManageUserView,
+    UserprofileAPIView,
     KnoxTokenListApiView,
     ListUserView,
     UserDetailAPIView,
@@ -18,29 +18,36 @@ from .views import (
     RetrieveUpdateDestroyIslandView,
     filter_user,
     filter_temporary_user,
-    UpdateUserWalletView,
     VerifyOTPView,
     UserVerifyAPIView,
+    UserUpdateAPIView,
+    UserRejectAPIView,
+    AgreementUpdateAPIView,
 )
 
 
 urlpatterns = [
     path("register/", CreateTemporaryUserView.as_view(), name="register"),
     path("register/verify/", VerifyOTPView.as_view(), name="verify-otp"),
-    path("profile/", ManageUserView.as_view(), name="profile"),
+    path("profile/", UserprofileAPIView.as_view(), name="profile"),
     path("login/", LoginView.as_view(), name="knox_login"),
     path("logout/", knox_views.LogoutView.as_view(), name="knox_logout"),
     path("logoutall/", knox_views.LogoutAllView.as_view(), name="knox_logoutall"),
     path("tokens/", KnoxTokenListApiView.as_view(), name="knox_tokens"),
     # path("auth/", CustomAuthToken.as_view()),
     path("users/", ListUserView.as_view(), name="users"),
-    path(
-        "update-wallet/<int:pk>/", UpdateUserWalletView.as_view(), name="update-wallet"
-    ),
     path("users/<int:pk>/", UserDetailAPIView.as_view(), name="user-detail"),
-    path("users/<int:pk>/verify/", UserVerifyAPIView.as_view(), name="user-verify"),
+    path("users/<int:pk>/update/", UserUpdateAPIView.as_view(), name="user-update"),
     path("users/filter/", filter_user, name="filter-users"),
     path("users/temp/filter/", filter_temporary_user, name="filter-temporary-users"),
+    # User verification flow
+    path("users/<int:pk>/verify/", UserVerifyAPIView.as_view(), name="user-verify"),
+    path(
+        "users/<int:pk>/agreement/",
+        AgreementUpdateAPIView.as_view(),
+        name="user-agreement-update",
+    ),
+    path("users/<int:pk>/reject/", UserRejectAPIView.as_view(), name="user-reject"),
     path("healthcheck/", healthcheck, name="healthcheck"),
     path("test/", test_email, name="testemail"),
     path("atolls/", ListAtollView.as_view(), name="atolls"),

api/utils.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, TypedDict
+from typing import List, Optional, TypedDict
 import requests
 from decouple import config
 from api.models import User
@@ -40,7 +40,9 @@ def reverse_dhivehi_string(input_str):
 
 class MismatchResult(TypedDict):
     ok: bool
-    mismatch_fields: List[str]
+    mismatch_fields: Optional[List[str]]
+    error: Optional[str]
+    detail: Optional[str]
 
 
 def check_person_api_verification(
@@ -63,20 +65,22 @@ def check_person_api_verification(
         raise ValueError(
             "PERSON_VERIFY_BASE_URL is not set in the environment variables."
         )
-    print(id_card)
     response = requests.get(f"{PERSON_VERIFY_BASE_URL}/api/person/{id_card}")
+    api_reponse = response.json()
+
     if response.status_code != 200:
         logger.error(
             f"Failed to fetch data from Person API for ID Card '{id_card}'. "
             f"Status Code: {response.status_code}, Response: {response.text}"
         )
-        return {"ok": False, "mismatch_fields": ["api_error"]}
-    api_data = response.json()
-    if not api_data:
-        logger.error(
-            f"No data found in Person API for ID Card '{id_card}'. Response: {response.text}"
-        )
-        return {"ok": False, "mismatch_fields": ["no_data"]}
+        return {
+            "ok": False,
+            "mismatch_fields": None,
+            "error": response.json()["error"] if "error" in response.json() else None,
+            "detail": response.json()["detail"]
+            if "detail" in response.json()
+            else None,
+        }
 
     # Initialize a list to hold fields that do not match
     mismatch_fields = []
@@ -86,12 +90,12 @@ def check_person_api_verification(
     user_dob_iso = user_data.dob.isoformat() if user_data.dob else None
 
     # Prepare API data for comparison
-    api_nic = api_data.get("nic")
-    api_name = api_data.get("name_en")
-    api_house_name = api_data.get("house_name_en")
-    api_dob = api_data.get("dob")
-    api_atoll = api_data.get("atoll_en")
-    api_island_name = api_data.get("island_name_en")
+    api_nic = api_reponse.get("nic")
+    api_name = api_reponse.get("name_en")
+    api_house_name = api_reponse.get("house_name_en")
+    api_dob = api_reponse.get("dob")
+    api_atoll = api_reponse.get("atoll_en")
+    api_island_name = api_reponse.get("island_name_en")
 
     # Perform comparisons and identify mismatches
     if user_data.id_card != api_nic:
@@ -134,6 +138,11 @@ def check_person_api_verification(
         )
 
     if mismatch_fields:
-        return {"ok": False, "mismatch_fields": mismatch_fields}
+        return {
+            "ok": False,
+            "mismatch_fields": mismatch_fields,
+            "error": None,
+            "detail": None,
+        }
     else:
-        return {"ok": True, "mismatch_fields": []}
+        return {"ok": True, "mismatch_fields": [], "error": None, "detail": None}

api/views.py

@@ -7,6 +7,7 @@ from rest_framework.authtoken.serializers import AuthTokenSerializer
 from api.filters import UserFilter
 from api.mixins import StaffEditorPermissionMixin
 from api.models import User, Atoll, Island, TemporaryUser
+from api.notifications import send_sms
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.exceptions import ValidationError
@@ -14,9 +15,10 @@ from rest_framework.decorators import api_view, permission_classes
 from api.serializers import (
     AtollSerializer,
     IslandSerializer,
-    CustomUserByWalletBalanceSerializer,
     OTPVerificationSerializer,
     TemporaryUserSerializer,
+    UserUpdateSerializer,
+    UserAgreementSerializer,
 )
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
@@ -31,8 +33,8 @@ from typing import cast, Dict, Any
 from django.core.mail import send_mail
 from django.db.models import Q
 from api.notifications import send_otp
-from .tasks import add
 from .utils import check_person_api_verification
+import uuid
 
 # local apps import
 from .serializers import (
@@ -40,7 +42,7 @@ from .serializers import (
     AuthSerializer,
     CustomUserSerializer,
     CustomReadOnlyUserSerializer,
-    CustomReadOnlyUserByIDCardSerializer,
+    UserProfileUpdateSerializer,
 )
 
 ID_CARD_PATTERN = r"^[A-Z]{1,2}[0-9]{6,7}$"
@@ -60,39 +62,9 @@ class ErrorMessages:
 
 @api_view(["GET"])
 def healthcheck(request):
-    add.defer(1, 2)
     return Response({"status": "Good"}, status=status.HTTP_200_OK)
 
 
-class UpdateUserWalletView(generics.UpdateAPIView):
-    # Create user API view
-    serializer_class = CustomUserByWalletBalanceSerializer
-    permission_classes = (permissions.IsAuthenticated,)
-    queryset = User.objects.all()
-    lookup_field = "pk"
-
-    def update(self, request, *args, **kwargs):
-        id_to_update = kwargs.get("pk")
-        user_id = request.user.id
-        print(f"User ID: {user_id}")
-        print(f"ID to update: {id_to_update}")
-        if user_id != id_to_update:
-            return Response(
-                {"message": "You are not authorized to update this user."},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-        wallet_balance = request.data.get("wallet_balance")
-        if not wallet_balance:
-            return Response(
-                {"message": "wallet_balance is required."},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        user = self.get_object()
-        user.wallet_balance = wallet_balance
-        user.save()
-        return Response({"message": "Wallet balance updated successfully."})
-
-
 class CreateTemporaryUserView(generics.CreateAPIView):
     # Create user API view
     serializer_class = TemporaryUserSerializer
@@ -307,17 +279,129 @@ class LoginView(KnoxLoginView):
             return Response({"message": message}, status=status.HTTP_400_BAD_REQUEST)
 
 
-class ManageUserView(generics.RetrieveUpdateAPIView):
-    """Manage the authenticated user"""
+class UserprofileAPIView(generics.RetrieveUpdateAPIView):
+    """Retrieve user api view"""
 
-    serializer_class = CustomUserSerializer
+    queryset = User.objects.all()
     permission_classes = (permissions.IsAuthenticated,)
 
+    def get_serializer_class(self):
+        """Return the serializer class based on the request method"""
+        if self.request.method == "GET":
+            return CustomReadOnlyUserSerializer
+        elif self.request.method == "PUT" or self.request.method == "PATCH":
+            return UserProfileUpdateSerializer
+        return super().get_serializer_class()
+
     def get_object(self):
         """Retrieve and return authenticated user"""
         return self.request.user
 
 
+class UserUpdateAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
+    serializer_class = UserUpdateSerializer
+    queryset = User.objects.all()
+    lookup_field = "pk"
+
+    def update(self, request, *args, **kwargs):
+        user_id = kwargs.get("pk")
+        user = get_object_or_404(User, pk=user_id)
+        if user.is_superuser:
+            return Response(
+                {"message": "You cannot update a superuser."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        if request.user != user and (
+            not request.user.is_authenticated
+            or not getattr(request.user, "is_admin", False)
+        ):
+            return Response(
+                {"message": "You are not authorized to update this user."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        serializer = self.get_serializer(
+            user,
+            data=request.data,
+            partial=True,
+        )
+        agreement_file = request.data.get("agreement_file")
+        if not agreement_file:
+            return Response(
+                {"message": "Agreement file is required."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if agreement_file.size > 10 * 1024 * 1024:  # 5 MB limit
+            return Response(
+                {"message": "File size exceeds 10 MB limit."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if agreement_file.content_type not in [
+            "application/pdf",
+        ]:
+            return Response(
+                {"message": "Invalid file type. Only PDF files are allowed."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if agreement_file:
+            user.agreement = agreement_file
+        serializer.is_valid(raise_exception=True)
+        user.save()
+        return super().update(request, *args, **kwargs)
+
+
+class AgreementUpdateAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
+    serializer_class = UserAgreementSerializer
+    queryset = User.objects.all()
+    lookup_field = "pk"
+
+    def update(self, request, *args, **kwargs):
+        user_id = kwargs.get("pk")
+        user = get_object_or_404(User, pk=user_id)
+        if user.is_superuser:
+            return Response(
+                {"message": "You cannot update a superuser."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        if request.user != user and (
+            not request.user.is_authenticated
+            or not getattr(request.user, "is_admin", False)
+        ):
+            return Response(
+                {"message": "You are not authorized to update this user."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        serializer = self.get_serializer(
+            user,
+            data=request.data,
+            partial=True,
+        )
+        agreement = request.data.get("agreement")
+        if not agreement:
+            return Response(
+                {"message": "Agreement file is required."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if agreement.size > 10 * 1024 * 1024:  # 5 MB limit
+            return Response(
+                {"message": "File size exceeds 10 MB limit."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if agreement.content_type not in [
+            "application/pdf",
+        ]:
+            return Response(
+                {"message": "Invalid file type. Only PDF files are allowed."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        #  rename the file name to a random UUID followed by user_id
+        agreement.name = f"{uuid.uuid4()}_{user_id}_agreement.pdf"
+        if agreement:
+            user.agreement = agreement
+        serializer.is_valid(raise_exception=True)
+        user.save()
+        return super().update(request, *args, **kwargs)
+
+
 class KnoxTokenListApiView(
     StaffEditorPermissionMixin,
     generics.ListAPIView,
@@ -345,9 +429,9 @@ class ListUserView(StaffEditorPermissionMixin, generics.ListAPIView):
 
     def get_queryset(self):
         user = self.request.user
-        if user.is_authenticated and user.is_staff:
-            return User.objects.all()
-        return User.objects.filter(is_staff=False)
+        if user.is_authenticated and getattr(user, "is_admin"):
+            return User.objects.filter(is_superuser=False)
+        return User.objects.none()
 
 
 class UserVerifyAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
@@ -366,30 +450,80 @@ class UserVerifyAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
                 {"message": "You are not authorized to update this user."},
                 status=status.HTTP_403_FORBIDDEN,
             )
-        serializer = self.get_serializer(user, data=request.data, partial=True)
-        serializer.is_valid(raise_exception=True)
-        verified_person = check_person_api_verification(
-            user_data=user, id_card=user.id_card
-        )
-        if not verified_person["ok"]:
+        if user.verified:
             return Response(
-                {
-                    "message": "User verification failed. Please check sarlink user details.",
-                    "mismatch_fields": verified_person["mismatch_fields"],
-                },
+                {"message": "User is already verified."},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        if verified_person["mismatch_fields"]:
+        serializer = self.get_serializer(user, data=request.data, partial=True)
+        serializer.is_valid(raise_exception=True)
+        result = check_person_api_verification(user_data=user, id_card=user.id_card)
+        # The verification system might not have the records of every user hence can be skipped if not found and verify directly.
+        if result.get("error") == "Not Found":
+            user.verified = True
+            user.save()
             return Response(
                 {
-                    "message": "User verification failed due to mismatched fields.",
-                    "mismatch_fields": verified_person["mismatch_fields"],
+                    "message": "User not found in the verification system. User marked as verified."
                 },
+                status=status.HTTP_404_NOT_FOUND,
+            )
+        if not result["ok"]:
+            return Response(
+                result,
+                status=status.HTTP_404_NOT_FOUND,
+            )
+        if result["mismatch_fields"]:
+            return Response(
+                result,
                 status=status.HTTP_400_BAD_REQUEST,
             )
         user.verified = True
         user.save()
-        return Response({"message": "User verification status updated."})
+        return Response({"message": "User successfully verified."})
+
+
+class UserRejectAPIView(StaffEditorPermissionMixin, generics.DestroyAPIView):
+    serializer_class = CustomUserSerializer
+    queryset = User.objects.all()
+    lookup_field = "pk"
+
+    def destroy(self, request, *args, **kwargs):
+        rejection_details = request.data.get("rejection_details", "")
+        if not rejection_details:
+            return Response(
+                {"message": "Rejection details are required."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        user_id = kwargs.get("pk")
+        user = get_object_or_404(User, pk=user_id)
+        mobile_number = user.mobile
+        if not mobile_number:
+            return Response(
+                {"message": "User does not have a mobile number."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        if user.is_superuser:
+            return Response(
+                {"message": "You cannot remove a superuser."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        if request.user != user and (
+            not request.user.is_authenticated
+            or not getattr(request.user, "is_admin", False)
+        ):
+            return Response(
+                {"message": "You are not authorized to reject this user."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        user.delete()
+        t_user = get_object_or_404(TemporaryUser, t_mobile=user.mobile)
+        t_user.delete()
+        send_sms(message=rejection_details, mobile=mobile_number)
+        return Response(
+            {"message": "User successfully rejected."},
+            status=status.HTTP_204_NO_CONTENT,
+        )
 
 
 @api_view(["GET"])
@@ -444,16 +578,6 @@ def filter_temporary_user(request):
     )
 
 
-class ListUserByIDCardView(generics.ListAPIView):
-    # Create user API view
-    permission_classes = (permissions.AllowAny,)
-    serializer_class = CustomReadOnlyUserByIDCardSerializer
-    filter_backends = [DjangoFilterBackend]
-    filterset_fields = "__all__"
-    filterset_class = UserFilter
-    queryset = User.objects.all()
-
-
 class UserDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
     queryset = User.objects.all()
     serializer_class = CustomReadOnlyUserSerializer
@@ -461,6 +585,16 @@ class UserDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
 
     def retrieve(self, request, *args, **kwargs):
         instance = self.get_object()
+        user = request.user
+        if (
+            user != instance
+            and not getattr(user, "is_admin", False)
+            and not user.is_superuser
+        ):
+            return Response(
+                {"message": "You are not authorized to view this user's details."},
+                status=status.HTTP_403_FORBIDDEN,
+            )
         serializer = self.get_serializer(instance)
         data = serializer.data
 

apibase/settings.py

@@ -235,8 +235,11 @@ REST_FRAMEWORK = {
         "login": "1000/min",
     },
     "EXCEPTION_HANDLER": "api.exceptions.custom_exception_handler",
-    "DEFAULT_RENDERER_CLASSES": ("rest_framework.renderers.JSONRenderer",),
-    # "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema"
+    "DEFAULT_RENDERER_CLASSES": (
+        "rest_framework.renderers.JSONRenderer",
+        # "rest_framework.renderers.BrowsableAPIRenderer",
+    ),
+    # "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
 }
 
 

billing/admin.py

@@ -1,9 +1,28 @@
 from django.contrib import admin
-from .models import Payment, BillFormula, Topup
+from .models import Payment, BillFormula, Topup, WalletTransaction
 
 # Register your models here.
 
 
+class WalletTransactionAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "user",
+        "amount",
+        "transaction_type",
+        "description",
+        "reference_id",
+        "created_at",
+    )
+    search_fields = (
+        "user__first_name",
+        "user__last_name",
+        "user__mobile",
+        "user__id_card",
+    )
+    list_filter = ("transaction_type",)
+
+
 class PaymentAdmin(admin.ModelAdmin):
     list_display = (
         "id",
@@ -14,9 +33,15 @@ class PaymentAdmin(admin.ModelAdmin):
         "paid_at",
         "method",
         "created_at",
+        "expires_at",
+        "is_expired",
         "updated_at",
     )
 
+    @admin.display(boolean=True, description="Expired")
+    def is_expired(self, obj):
+        return obj.is_expired
+
 
 class TopupAdmin(admin.ModelAdmin):
     list_display = (
@@ -47,3 +72,4 @@ class TopupAdmin(admin.ModelAdmin):
 admin.site.register(Payment, PaymentAdmin)
 admin.site.register(BillFormula)
 admin.site.register(Topup, TopupAdmin)
+admin.site.register(WalletTransaction, WalletTransactionAdmin)

billing/filters.py

@@ -1,22 +1,51 @@
 import django_filters
-from .models import Payment, Topup
+from .models import Payment, Topup, WalletTransaction
 from django.db.models import Q
+from django.utils import timezone
 
 
 class PaymentFilter(django_filters.FilterSet):
     amount = django_filters.RangeFilter(field_name="amount")
     number_of_months = django_filters.RangeFilter(field_name="number_of_months")
     paid = django_filters.BooleanFilter(field_name="paid")
+    user = django_filters.CharFilter(method="filter_user_search")
     method = django_filters.ChoiceFilter(
         choices=Payment.PAYMENT_TYPES, lookup_expr="iexact"
     )
     mib_reference = django_filters.CharFilter(lookup_expr="icontains")
     paid_at = django_filters.DateFromToRangeFilter()
     created_at = django_filters.DateFromToRangeFilter()
+    is_expired = django_filters.BooleanFilter(method="filter_is_expired")
+
+    def filter_user_search(self, queryset, name, value):
+        return queryset.filter(
+            Q(user__first_name__icontains=value)
+            | Q(user__last_name__icontains=value)
+            | Q(user__id_card__icontains=value)
+            | Q(user__mobile__icontains=value)
+        )
+
+    def filter_is_expired(self, queryset, name, value):
+        """
+        Filter payments based on whether they are expired or not
+        """
+        now = timezone.now()
+        queryset = queryset.filter(paid=False)
+        if value:
+            return queryset.filter(expires_at__isnull=False, expires_at__lt=now)
+        else:
+            return queryset.filter(Q(expires_at__isnull=True) | Q(expires_at__gte=now))
 
     class Meta:
         model = Payment
-        fields = "__all__"
+        fields = [
+            "amount",
+            "paid",
+            "method",
+            "user",
+            "created_at",
+            "is_expired",
+        ]
 
 
 class TopupFilter(django_filters.FilterSet):
@@ -24,6 +53,46 @@ class TopupFilter(django_filters.FilterSet):
     paid = django_filters.BooleanFilter(field_name="paid")
     user = django_filters.CharFilter(method="filter_user_search")
     created_at = django_filters.DateFromToRangeFilter(field_name="created_at")
+    is_expired = django_filters.BooleanFilter(method="filter_is_expired")
+
+    def filter_user_search(self, queryset, name, value):
+        """
+        Search across multiple user fields: first_name, last_name, id_card, mobile
+        """
+        return queryset.filter(
+            Q(user__first_name__icontains=value)
+            | Q(user__last_name__icontains=value)
+            | Q(user__id_card__icontains=value)
+            | Q(user__mobile__icontains=value)
+        )
+
+    def filter_is_expired(self, queryset, name, value):
+        """
+        Filter topups based on whether they are expired or not
+        """
+        now = timezone.now()
+        queryset = queryset.filter(paid=False)
+        if value:
+            return queryset.filter(expires_at__isnull=False, expires_at__lt=now)
+        else:
+            return queryset.filter(Q(expires_at__isnull=True) | Q(expires_at__gte=now))
+
+    class Meta:
+        model = Topup
+        fields = [
+            "amount",
+            "paid",
+            "status",
+            "user",
+            "created_at",
+            "is_expired",
+        ]
+
+
+class WalletTransactionFilter(django_filters.FilterSet):
+    user = django_filters.CharFilter(method="filter_user_search")
+    amount = django_filters.RangeFilter(field_name="amount")
+    created_at = django_filters.DateFromToRangeFilter(field_name="created_at")
 
     def filter_user_search(self, queryset, name, value):
         """
@@ -37,10 +106,5 @@ class TopupFilter(django_filters.FilterSet):
         )
 
     class Meta:
-        model = Topup  # Assuming Topup is a subclass of Payment
-        fields = [
-            "amount",
-            "paid",
-            "user",
-            "created_at",
-        ]
+        model = WalletTransaction
+        fields = ["user", "amount", "created_at", "transaction_type"]

billing/migrations/0012_payment_status.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2 on 2025-07-06 15:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("billing", "0011_topup_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="payment",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("PENDING", "Pending"),
+                    ("PAID", "Paid"),
+                    ("CANCELLED", "Cancelled"),
+                ],
+                default="PENDING",
+                max_length=20,
+            ),
+        ),
+    ]

billing/migrations/0013_payment_expiry_notification_sent.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2 on 2025-07-09 14:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("billing", "0012_payment_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="payment",
+            name="expiry_notification_sent",
+            field=models.BooleanField(default=False),
+        ),
+    ]

billing/migrations/0014_wallettransaction.py

@@ -0,0 +1,55 @@
+# Generated by Django 5.2 on 2025-07-25 08:34
+
+import django.db.models.deletion
+import django.utils.timezone
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("billing", "0013_payment_expiry_notification_sent"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="WalletTransaction",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("amount", models.FloatField()),
+                (
+                    "transaction_type",
+                    models.CharField(
+                        choices=[("TOPUP", "Topup"), ("DEBIT", "Debit")], max_length=10
+                    ),
+                ),
+                ("description", models.TextField(blank=True, null=True)),
+                (
+                    "reference_id",
+                    models.CharField(blank=True, max_length=255, null=True),
+                ),
+                ("created_at", models.DateTimeField(default=django.utils.timezone.now)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="wallet_transactions",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["-created_at"],
+            },
+        ),
+    ]

billing/models.py

@@ -1,11 +1,11 @@
 from django.db import models
 from django.utils import timezone
-from api.models import User
 import uuid
+from django.conf import settings
+from devices.models import Device
 
 # Create your models here.
-
-from devices.models import Device
+user = settings.AUTH_USER_MODEL
 
 # Create your models here.
 
@@ -20,13 +20,29 @@ class Payment(models.Model):
     number_of_months = models.IntegerField()
     amount = models.FloatField()
     paid = models.BooleanField(default=False)
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="payments")
+    user = models.ForeignKey(user, on_delete=models.CASCADE, related_name="payments")
     paid_at = models.DateTimeField(null=True, blank=True)
     method = models.CharField(max_length=255, choices=PAYMENT_TYPES, default="TRANSFER")
+    expiry_notification_sent = models.BooleanField(default=False)
     expires_at = models.DateTimeField(null=True, blank=True)
     created_at = models.DateTimeField(default=timezone.now)
     updated_at = models.DateTimeField(auto_now=True)
     devices = models.ManyToManyField(Device, related_name="payments")
+    status = models.CharField(
+        max_length=20,
+        choices=[
+            ("PENDING", "Pending"),
+            ("PAID", "Paid"),
+            ("CANCELLED", "Cancelled"),
+        ],
+        default="PENDING",
+    )
+
+    @property
+    def is_expired(self):
+        if self.expires_at is None:
+            return False
+        return timezone.now() > self.expires_at
 
     def __str__(self):
         return f"Payment by {self.user}"
@@ -49,7 +65,7 @@ class BillFormula(models.Model):
 class Topup(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     amount = models.FloatField()
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="topups")
+    user = models.ForeignKey(user, on_delete=models.CASCADE, related_name="topups")
     paid = models.BooleanField(default=False)
     paid_at = models.DateTimeField(null=True, blank=True)
     status = models.CharField(
@@ -78,3 +94,28 @@ class Topup(models.Model):
 
     class Meta:
         ordering = ["-created_at"]
+
+
+class WalletTransaction(models.Model):
+    TRANSACTION_TYPES = [
+        ("TOPUP", "Topup"),
+        ("DEBIT", "Debit"),
+    ]
+
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="wallet_transactions",
+    )
+    amount = models.FloatField()
+    transaction_type = models.CharField(max_length=10, choices=TRANSACTION_TYPES)
+    description = models.TextField(blank=True, null=True)
+    reference_id = models.CharField(max_length=255, blank=True, null=True)
+    created_at = models.DateTimeField(default=timezone.now)
+
+    def __str__(self):
+        return f"{self.transaction_type} {self.amount} ({self.user.username})"
+
+    class Meta:
+        ordering = ["-created_at"]

billing/serializers.py

@@ -1,10 +1,26 @@
 from rest_framework import serializers
-from .models import Payment, Topup
-from devices.serializers import DeviceSerializer
+from .models import Payment, Topup, WalletTransaction
+from devices.serializers import AdminDeviceSerializer
 
 
 class PaymentSerializer(serializers.ModelSerializer):
-    devices = DeviceSerializer(many=True, read_only=True)
+    devices = AdminDeviceSerializer(many=True, read_only=True)
+    is_expired = serializers.SerializerMethodField()
+    user = serializers.SerializerMethodField()
+
+    def get_user(self, obj):
+        user = obj.user
+        if user:
+            return {
+                "id": user.id,
+                "name": user.first_name + " " + user.last_name,
+                "id_card": user.id_card,
+                "mobile": user.mobile,
+            }
+        return None
+
+    def get_is_expired(self, obj):
+        return obj.is_expired
 
     class Meta:  # type: ignore
         model = Payment
@@ -44,6 +60,7 @@ class TopupSerializer(serializers.ModelSerializer):
             "amount",
             "user",
             "paid",
+            "paid_at",
             "status",
             "mib_reference",
             "is_expired",
@@ -52,3 +69,23 @@ class TopupSerializer(serializers.ModelSerializer):
             "updated_at",
         ]
         read_only_fields = ["id", "created_at", "updated_at"]
+
+
+class WalletTransactionSerializer(serializers.ModelSerializer):
+    user = serializers.SerializerMethodField()
+
+    def get_user(self, obj):
+        user = obj.user
+        if user:
+            return {
+                "id": user.id,
+                "name": user.first_name + " " + user.last_name,
+                "id_card": user.id_card,
+                "mobile": user.mobile,
+            }
+        return None
+
+    class Meta:  # type: ignore
+        model = WalletTransaction
+        fields = "__all__"
+        read_only_fields = ["id", "created_at", "updated_at"]

billing/tasks.py

@@ -4,20 +4,26 @@ from django.db import transaction
 from django.utils import timezone
 from procrastinate.contrib.django import app
 from api.notifications import send_sms
-from billing.models import Topup
+from billing.models import Topup, Payment
 from django.utils.timezone import localtime
+from datetime import datetime
 
 logger = logging.getLogger(__name__)
 
 
 @app.periodic(
-    cron="*/30 * * * * *", periodic_id="notify_expired_topups", queue="heavy_tasks"
-)  # every 30 seconds
+    cron="*/1 * * * * *", periodic_id="notify_expired_topups", queue="heavy_tasks"
+)
 @app.task
 def update_expired_topups(timestamp: int):
     expired_topups_qs = Topup.objects.filter(
-        expires_at__lte=timezone.now(), expiry_notification_sent=False
+        expires_at__lte=timezone.now(),
+        expiry_notification_sent=False,
+        paid=False,
     ).select_related("user")
+    if not expired_topups_qs.exists():
+        logger.info("No expired topups found.")
+        return {"total_expired_topups": 0}
 
     with transaction.atomic():
         count = expired_topups_qs.count()
@@ -27,35 +33,117 @@ def update_expired_topups(timestamp: int):
             if topup.user and topup.user.mobile and not topup.expiry_notification_sent:
                 send_sms_task.defer(
                     mobile=topup.user.mobile,
+                    type="TOPUP",
                     amount=topup.amount,
-                    topup_id=str(topup.id),
+                    model_id=str(topup.id),
                     created_at=localtime(topup.created_at).isoformat(),
+                    user=f"{topup.user.first_name + ' ' + topup.user.last_name}"
+                    if topup.user.last_name and topup.user.first_name
+                    else "User",
                 )
-            else:
-                # Mark as notified even if we can't send SMS (no mobile number)
                 topup.expiry_notification_sent = True
                 topup.save()
+            else:
+                topup.expiry_notification_sent = True
+                topup.save()
+                return
 
     return {
         "total_expired_topups": count,
     }
 
 
-# Assuming you have a separate task for sending SMS if you go that route
+@app.periodic(
+    cron="*/1 * * * * *", periodic_id="notify_expired_payments", queue="heavy_tasks"
+)
 @app.task
-def send_sms_task(mobile: str, amount: float, topup_id: str, created_at: str):
+def update_expired_payments(timestamp: int):
+    expired_payments_qs = Payment.objects.filter(
+        expires_at__lte=timezone.now(),
+        expiry_notification_sent=False,
+        paid=False,
+    ).select_related("user")
+    if not expired_payments_qs.exists():
+        logger.info("No expired payments found.")
+        return {"total_expired_payments": 0}
+
+    with transaction.atomic():
+        count = expired_payments_qs.count()
+        logger.info(f"Found {count} payments to expire.")
+
+        for payment in expired_payments_qs:
+            for device in payment.devices.all():
+                device.has_a_pending_payment = False
+                device.save()
+            if (
+                payment.user
+                and payment.user.mobile
+                and not payment.expiry_notification_sent
+            ):
+                send_sms_task.defer(
+                    mobile=payment.user.mobile,
+                    type="PAYMENT",
+                    amount=payment.amount,
+                    model_id=str(payment.id),
+                    created_at=localtime(payment.created_at).isoformat(),
+                    user=f"{payment.user.first_name + ' ' + payment.user.last_name}"
+                    if payment.user.last_name and payment.user.first_name
+                    else "User",
+                )
+                payment.expiry_notification_sent = True
+                payment.save()
+            else:
+                payment.expiry_notification_sent = True
+                payment.save()
+                return
+
+    return {
+        "total_expired_payments": count,
+    }
+
+
+@app.task
+def send_sms_task(
+    user: str,
+    mobile: str,
+    amount: float,
+    model_id: str,
+    created_at: str,
+    type: str = "TOPUP",  # Default to TOPUP if not provided,
+):
+    try:
+        dt = datetime.fromisoformat(created_at)
+        formatted_date = dt.strftime("%d %b %Y, %I:%M %p")
+    except Exception:
+        formatted_date = created_at
+    message: str = ""
+    if type == "TOPUP":
         message = (
-        f"Dear {mobile}, \n\nYour topup of {amount} MVR [created at {created_at}] has expired. "
+            f"Dear {user}, \n\nYour topup of {amount} MVR [created at {formatted_date}] has expired. "
             "Please make a new topup to update your wallet. \n\n- SAR Link"
         )
+    elif type == "PAYMENT":
+        message = f"Dear {user}, \n\nYour payment of {amount} MVR [created at {formatted_date}] has expired. \n\n- SAR Link"
     send_sms(mobile, message)
-    logger.info(f"SMS sent to {mobile} for expired topup of {amount} MVR.")
+    logger.info(f"SMS sent to {mobile} for expired {type} of {amount} MVR.")
 
-    # Mark the topup as notified after successful SMS sending
+    if type == "TOPUP":
         try:
-        topup = Topup.objects.get(id=topup_id)
+            topup = Topup.objects.get(id=model_id)
             topup.expiry_notification_sent = True
             topup.save()
-        logger.info(f"Marked topup {topup_id} as notified.")
+            logger.info(f"Marked topup {model_id} as notified.")
         except Topup.DoesNotExist:
-        logger.error(f"Topup {topup_id} not found when trying to mark as notified.")
+            logger.error(
+                f"Topup id: {model_id} not found when trying to mark as notified."
+            )
+    else:
+        try:
+            topup = Payment.objects.get(id=model_id)
+            topup.expiry_notification_sent = True
+            topup.save()
+            logger.info(f"Marked payment {model_id} as notified.")
+        except Payment.DoesNotExist:
+            logger.error(
+                f"Payment id: {model_id} not found when trying to mark as notified."
+            )

billing/tests.py

@@ -3,7 +3,7 @@ from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APIClient
 from django.contrib.auth import get_user_model
-from .models import Topup
+from .models import Topup, Payment
 from .serializers import TopupSerializer
 from django.utils import timezone
 from datetime import timedelta
@@ -205,3 +205,47 @@ class TopupTests(TestCase):
         response = self.client.delete(url, format="json")
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
         self.assertEqual(Topup.objects.count(), 0)
+
+
+class PaymentTests(TestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.real_user = User.objects.create_user(
+            username="testuser",
+            password="testpassword",
+            first_name=REAL_USER_FIRST_NAME,
+            last_name=REAL_USER_LAST_NAME,
+            acc_no="7770000010629",
+            is_admin=True,
+        )
+        self.user = User.objects.create_user(
+            username="plskillme",
+            password="modewasgayithink",
+            first_name="mode",
+            last_name="hussain",
+            acc_no="1122334455",
+        )
+        self.admin_user = User.objects.create_superuser(
+            username="adminuser",
+            password="adminpassword",
+            email="admin@example.com",
+            first_name="Admin",
+            last_name="User",
+            acc_no="987654321",
+        )
+        self.client.force_authenticate(user=self.real_user)
+
+    def test_cancel_payment(self):
+        payment = Payment.objects.create(
+            amount=100.00,
+            user=self.real_user,
+            status="PENDING",
+            number_of_months=1,
+            paid=False,
+        )
+        url = reverse("cancel-payment", kwargs={"pk": payment.pk})
+        response = self.client.patch(url, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        payment.refresh_from_db()
+        self.assertEqual(payment.status, "CANCELLED")
+        self.assertFalse(payment.paid)

billing/urls.py

@@ -5,11 +5,12 @@ from .views import (
     VerifyPaymentView,
     PaymentDetailAPIView,
     UpdatePaymentAPIView,
-    DeletePaymentView,
+    CancelPaymentView,
     ListCreateTopupView,
     VerifyTopupPaymentAPIView,
     TopupDetailAPIView,
     CancelTopupView,
+    ListWalletTransactionView,
 )
 
 urlpatterns = [
@@ -21,9 +22,9 @@ urlpatterns = [
         name="update-payment",
     ),
     path(
-        "payment/<str:pk>/delete/",
-        DeletePaymentView.as_view(),
-        name="delete-payment",
+        "payment/<str:pk>/cancel/",
+        CancelPaymentView.as_view(),
+        name="cancel-payment",
     ),
     path(
         "payment/<str:pk>/verify/", VerifyPaymentView.as_view(), name="verify-payment"
@@ -41,4 +42,10 @@ urlpatterns = [
         CancelTopupView.as_view(),
         name="cancel-topup",
     ),
+    # Wallet transactions
+    path(
+        "wallet-transactions/",
+        ListWalletTransactionView.as_view(),
+        name="list-wallet-transactions",
+    ),
 ]

billing/views.py

@@ -13,13 +13,20 @@ from rest_framework.response import Response
 from api.mixins import StaffEditorPermissionMixin
 from api.tasks import add_new_devices_to_omada
 from apibase.env import BASE_DIR, env
+from django.db.models import Prefetch
 import logging
 
-from .models import Device, Payment, Topup
-from .serializers import PaymentSerializer, UpdatePaymentSerializer, TopupSerializer
-from .filters import PaymentFilter, TopupFilter
+from .models import Device, Payment, Topup, WalletTransaction
+from .serializers import (
+    PaymentSerializer,
+    UpdatePaymentSerializer,
+    TopupSerializer,
+    WalletTransactionSerializer,
+)
+from .filters import PaymentFilter, TopupFilter, WalletTransactionFilter
 from dataclasses import dataclass, asdict
 from typing import Optional
+from api.models import User
 
 env.read_env(os.path.join(BASE_DIR, ".env"))
 
@@ -28,6 +35,20 @@ PAYMENT_BASE_URL = env("PAYMENT_BASE_URL", default="")  # type: ignore
 logger = logging.getLogger(__name__)
 
 
+@dataclass
+class Transaction:
+    ref: str
+    sourceBank: str
+    trxDate: str
+
+
+@dataclass
+class PaymentVerificationResponse:
+    message: str
+    success: bool
+    transaction: Optional[Transaction] = None
+
+
 class InsufficientFundsError(Exception):
     pass
 
@@ -40,10 +61,18 @@ class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIVi
     filterset_class = PaymentFilter
 
     def get_queryset(self):
-        queryset = super().get_queryset()
-        if self.request.user.is_superuser:
+        unpaid_qs = Payment.objects.filter(paid=False).order_by("-created_at")
+        device_qs = Device.objects.prefetch_related(
+            Prefetch("payments", queryset=unpaid_qs, to_attr="unpaid_payments")
+        )
+        queryset = Payment.objects.select_related("user").prefetch_related(
+            Prefetch("devices", queryset=device_qs)
+        )
+
+        if not self.request.user.is_superuser:
+            queryset = queryset.filter(user=self.request.user)
+
         return queryset
-        return queryset.filter(user=self.request.user)
 
     def create(self, request):
         data = request.data
@@ -52,7 +81,8 @@ class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIVi
         number_of_months = data.get("number_of_months")
         device_ids = data.get("device_ids", [])
         print(amount, number_of_months, device_ids)
-
+        current_time = timezone.now()
+        expires_at = current_time + timedelta(minutes=10)
         for device_id in device_ids:
             device = Device.objects.filter(id=device_id, user=user).first()
             print("DEVICE", device)
@@ -77,6 +107,7 @@ class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIVi
             number_of_months=number_of_months,
             paid=data.get("paid", False),
             user=user,
+            expires_at=expires_at,
         )
 
         # Connect devices to payment
@@ -89,6 +120,30 @@ class ListCreatePaymentView(StaffEditorPermissionMixin, generics.ListCreateAPIVi
         serializer = PaymentSerializer(payment)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        all_payments = request.query_params.get("all_payments", "false").lower() in [
+            "true",
+            "1",
+            "yes",
+        ]
+        if (
+            request.user.is_authenticated
+            and getattr(request.user, "is_admin")
+            and bool(all_payments)
+        ):
+            pass
+        else:
+            queryset = queryset.filter(user=request.user)
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
 
 class PaymentDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
     queryset = Payment.objects.select_related("user").all()
@@ -110,18 +165,17 @@ class UpdatePaymentAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
         serializer.is_valid(raise_exception=True)
         self.perform_update(serializer)
         devices.update(
-            is_active=True, expiry_date=device_expire_date, has_a_pending_payment=False
+            is_active=False, expiry_date=device_expire_date, has_a_pending_payment=False
         )
         return Response(serializer.data)
 
 
 class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
     serializer_class = PaymentSerializer
-    queryset = Payment.objects.all()
+    queryset = Payment.objects.select_related("user").all()
     lookup_field = "pk"
 
     def update(self, request, *args, **kwargs):
-        # TODO: Fix check for success payment
         payment = self.get_object()
         data = request.data
         user = request.user
@@ -145,7 +199,6 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
             )
 
         devices = payment.devices.all()
-        payment_status = False
         if method == "WALLET":
             if user.wallet_balance < payment.amount:  # type: ignore
                 return Response(
@@ -153,23 +206,27 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
             else:
-                payment_status = self.process_wallet_payment(
-                    user,
+                self.process_wallet_payment(
+                    user,  # type: ignore
                     payment,
                 )
+                return Response(
+                    {
+                        "status": True,
+                        "message": "Payment verified successfully using wallet.",
+                    },
+                    status=status.HTTP_200_OK,
+                )
         if method == "TRANSFER":
             data = {
                 "benefName": f"{user.first_name} {user.last_name}",  # type: ignore
                 "accountNo": user.acc_no,  # type: ignore
-                "absAmount": payment.amount,
-                "time": localtime(timezone.now() + timedelta(minutes=5)).strftime(
-                    "%Y-%m-%d %H:%M"
-                ),
+                "absAmount": "{:.2f}".format(payment.amount),
+                "time": localtime(payment.created_at).strftime("%Y-%m-%d %H:%M"),
             }
-            payment_status = self.verify_transfer_payment(data, payment)
+        payment_verification_response = self.verify_transfer_payment(data, payment)
 
-        if payment_status:
-            # Update devices
+        if payment_verification_response.success:
             expiry_date = timezone.now() + timedelta(days=30 * payment.number_of_months)
             devices.update(
                 is_active=True,
@@ -177,7 +234,9 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
                 has_a_pending_payment=False,
                 registered=True,
             )
-            # Need to add to omada if its a new device and not an existing device
+            payment.status = "PAID"
+            payment.save()
+            # add to omada if its a new device and not an existing device
             device_list = []
             for device in devices:
                 device_list.append(
@@ -193,29 +252,42 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
                     device.save()
 
             return Response(
-                {"message": f"Payment verified successfully using [{method}]."},
+                {
+                    "status": payment_verification_response.success,
+                    "message": payment_verification_response.message,
+                    "transaction": asdict(payment_verification_response.transaction)
+                    if payment_verification_response.transaction
+                    else None,
+                },
                 status=status.HTTP_200_OK,
             )
         else:
             return Response(
-                {"message": f"Payment verification FAILED using [{method}]."},
+                {
+                    "status": payment_verification_response.success,
+                    "message": payment_verification_response.message
+                    or "Topup payment verification failed.",
+                },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def process_wallet_payment(self, user, payment):
+    def process_wallet_payment(self, user: User, payment: Payment):
         print("processing wallet payment...")
         print(user, payment.amount)
 
         payment.paid = True
         payment.paid_at = timezone.now()
         payment.method = "WALLET"
+        payment.status = "PAID"
         payment.save()
 
-        user.wallet_balance -= payment.amount
+        user.deduct_wallet_funds(
+            payment.amount, "Wallet payment for devices", payment.id
+        )
         user.save()
         return True
 
-    def verify_transfer_payment(self, data, payment):
+    def verify_transfer_payment(self, data, payment) -> PaymentVerificationResponse:
         if not PAYMENT_BASE_URL:
             raise ValueError(
                 "PAYMENT_BASE_URL is not set. Please set it in your environment variables."
@@ -230,45 +302,66 @@ class VerifyPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
             response.raise_for_status()
         except requests.exceptions.HTTPError as e:
             logger.error(f"HTTPError: {e}")
-            return False
+            return PaymentVerificationResponse(
+                message="Payment verification failed.", success=False, transaction=None
+            )
         mib_resp = response.json()
         logger.info("MIB Verification Response ->", mib_resp)
         if not response.json().get("success"):
-            return mib_resp["success"]
+            return PaymentVerificationResponse(
+                message=mib_resp["message"],
+                success=mib_resp["success"],
+                transaction=None,
+            )
         else:
             payment.paid = True
             payment.paid_at = timezone.now()
             payment.method = "TRANSFER"
             payment.mib_reference = mib_resp["transaction"]["ref"] or ""
             payment.save()
-            return True
+            return PaymentVerificationResponse(
+                message=mib_resp["message"],
+                success=mib_resp["success"],
+                transaction=Transaction(
+                    ref=payment.mib_reference,
+                    sourceBank=mib_resp["transaction"]["sourceBank"],
+                    trxDate=mib_resp["transaction"]["trxDate"],
+                ),
+            )
 
 
-class DeletePaymentView(StaffEditorPermissionMixin, generics.DestroyAPIView):
-    queryset = Payment.objects.all()
+class CancelPaymentView(StaffEditorPermissionMixin, generics.UpdateAPIView):
+    queryset = Payment.objects.select_related("user").all()
     serializer_class = PaymentSerializer
     lookup_field = "pk"
 
-    def delete(self, request, *args, **kwargs):
+    def update(self, request, *args, **kwargs):
         instance = self.get_object()
         user = request.user
+        if instance.status == "CANCELLED":
+            return Response(
+                {"message": "Payment has already been cancelled."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         if instance.user != user and not user.is_superuser:
             return Response(
-                {"message": "You are not authorized to delete this payment."},
+                {"message": "You are not authorized to cancel this payment."},
                 status=status.HTTP_403_FORBIDDEN,
             )
         if instance.paid:
             return Response(
-                {"message": "Paid payments cannot be deleted."},
+                {"message": "Paid payments cannot be cancelled."},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         devices = instance.devices.all()
+        instance.status = "CANCELLED"
+        instance.save()
         devices.update(is_active=False, expiry_date=None, has_a_pending_payment=False)
-        return super().delete(request, *args, **kwargs)
+        return super().update(request, *args, **kwargs)
 
 
 class ListCreateTopupView(StaffEditorPermissionMixin, generics.ListCreateAPIView):
-    queryset = Topup.objects.all()
+    queryset = Topup.objects.all().prefetch_related("user")
     serializer_class = TopupSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_fields = "__all__"
@@ -295,6 +388,30 @@ class ListCreateTopupView(StaffEditorPermissionMixin, generics.ListCreateAPIView
             return queryset
         return queryset.filter(user=self.request.user)
 
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        all_topups = request.query_params.get("all_topups", "false").lower() in [
+            "true",
+            "1",
+            "yes",
+        ]
+        if (
+            request.user.is_authenticated
+            and getattr(request.user, "is_admin")
+            and bool(all_topups)
+        ):
+            pass
+        else:
+            queryset = queryset.filter(user=request.user)
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
 
 class TopupDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
     queryset = Topup.objects.all()
@@ -308,20 +425,6 @@ class TopupDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
         return queryset.filter(user=self.request.user)
 
 
-@dataclass
-class Transaction:
-    ref: str
-    sourceBank: str
-    trxDate: str
-
-
-@dataclass
-class PaymentVerificationResponse:
-    message: str
-    success: bool
-    transaction: Optional[Transaction] = None
-
-
 class VerifyTopupPaymentAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
     queryset = Topup.objects.all()
     serializer_class = TopupSerializer
@@ -394,7 +497,11 @@ class VerifyTopupPaymentAPIView(StaffEditorPermissionMixin, generics.UpdateAPIVi
         topup_verification_response = self.verify_transfer_topup(data, topup_instance)
         print("Topup verification response:", topup_verification_response)
         if topup_verification_response.success:
-            user.wallet_balance += topup_instance.amount  # type: ignore
+            user.add_wallet_funds(  # type: ignore
+                topup_instance.amount,
+                f"Topup of {topup_instance.amount} MVR",
+                topup_instance.id,
+            )
             user.save()
             topup_instance.status = "PAID"
             topup_instance.save()
@@ -454,3 +561,43 @@ class CancelTopupView(StaffEditorPermissionMixin, generics.UpdateAPIView):
         instance.status = "CANCELLED"
         instance.save()
         return super().update(request, *args, **kwargs)
+
+
+class ListWalletTransactionView(StaffEditorPermissionMixin, generics.ListAPIView):
+    serializer_class = WalletTransactionSerializer
+    queryset = WalletTransaction.objects.all().select_related("user")
+    filter_backends = [DjangoFilterBackend]
+    filterset_fields = "__all__"
+    filterset_class = WalletTransactionFilter
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        if getattr(self.request.user, "is_admin") or self.request.user.is_superuser:
+            return queryset
+        return queryset.filter(user=self.request.user)
+
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        all_transations = request.query_params.get(
+            "all_transations", "false"
+        ).lower() in [
+            "true",
+            "1",
+            "yes",
+        ]
+        if (
+            request.user.is_authenticated
+            and getattr(request.user, "is_admin")
+            and bool(all_transations)
+        ):
+            pass
+        else:
+            queryset = queryset.filter(user=request.user)
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)

devices/admin.py

@@ -10,6 +10,7 @@ class DeviceAdmin(admin.ModelAdmin):
         "user",
         "mac",
         "vendor",
+        "expiry_date",
         "blocked_by",
         "name",
         "created_at",

devices/models.py

@@ -1,8 +1,10 @@
 from django.db import models
 from django.utils import timezone
-from api.models import User
 import re
 from django.core.exceptions import ValidationError
+from django.conf import settings
+
+user = settings.AUTH_USER_MODEL
 
 
 def validate_mac_address(value):
@@ -38,7 +40,7 @@ class Device(models.Model):
     created_at = models.DateTimeField(default=timezone.now)
     updated_at = models.DateTimeField(auto_now=True)
     user = models.ForeignKey(
-        User, on_delete=models.SET_NULL, null=True, blank=True, related_name="devices"
+        user, on_delete=models.SET_NULL, null=True, blank=True, related_name="devices"
     )
 
     def __str__(self):

devices/serializers.py

@@ -31,8 +31,16 @@ class BlockDeviceSerializer(serializers.ModelSerializer):
 
 
 class DeviceSerializer(serializers.ModelSerializer):
-    pending_payment_id = serializers.SerializerMethodField()
     user = serializers.SerializerMethodField()
+    pending_payment_id = serializers.SerializerMethodField()
+
+    def get_pending_payment_id(self, obj):
+        unpaid_payment = (
+            obj.unpaid_payments[0]
+            if hasattr(obj, "unpaid_payments") and obj.unpaid_payments
+            else None
+        )
+        return unpaid_payment.id if unpaid_payment else None
 
     def get_user(self, obj):
         user = obj.user
@@ -45,12 +53,19 @@ class DeviceSerializer(serializers.ModelSerializer):
             }
         return None
 
+    class Meta:  # type: ignore
+        model = Device
+        fields = "__all__"
+
+
+class AdminDeviceSerializer(serializers.ModelSerializer):
+    pending_payment_id = serializers.SerializerMethodField()
+
     def get_pending_payment_id(self, obj):
-        # Query the last unpaid payment for the device
         unpaid_payment = (
-            Payment.objects.filter(devices=obj, paid=False)
-            .order_by("-created_at")
-            .first()
+            obj.unpaid_payments[0]
+            if hasattr(obj, "unpaid_payments") and obj.unpaid_payments
+            else None
         )
         return unpaid_payment.id if unpaid_payment else None
 

devices/views.py

@@ -3,7 +3,9 @@ from xmlrpc.client import Boolean
 from rest_framework import generics, status
 from rest_framework.response import Response
 from django_filters.rest_framework import DjangoFilterBackend
+from billing.models import Payment
 from .models import Device
+from django.db.models import Prefetch
 from .serializers import (
     CreateDeviceSerializer,
     DeviceSerializer,
@@ -28,6 +30,13 @@ class DeviceListCreateAPIView(
     filterset_fields = "__all__"
     filterset_class = DeviceFilter
 
+    def get_queryset(self):
+        unpaid_qs = Payment.objects.filter(paid=False).order_by("-created_at")
+        base_qs = Device.objects.select_related("user").prefetch_related(
+            Prefetch("payments", queryset=unpaid_qs, to_attr="unpaid_payments")
+        )
+        return base_qs.all()
+
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
         all_devices = request.query_params.get("all_devices", "false").lower() in [
@@ -90,7 +99,7 @@ class DeviceDetailAPIView(StaffEditorPermissionMixin, generics.RetrieveAPIView):
 
 
 class DeviceUpdateAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
-    queryset = Device.objects.all()
+    queryset = Device.objects.select_related("user").all()
     serializer_class = CreateDeviceSerializer
     lookup_field = "pk"
 
@@ -116,7 +125,7 @@ class DeviceUpdateAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
 
 
 class DeviceBlockAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
-    queryset = Device.objects.all()
+    queryset = Device.objects.select_related("user").all()
     serializer_class = BlockDeviceSerializer
     lookup_field = "pk"
 
@@ -154,7 +163,7 @@ class DeviceBlockAPIView(StaffEditorPermissionMixin, generics.UpdateAPIView):
 
 
 class DeviceDestroyAPIView(StaffEditorPermissionMixin, generics.DestroyAPIView):
-    queryset = Device.objects.all()
+    queryset = Device.objects.select_related("user").all()
     serializer_class = DeviceSerializer
     lookup_field = "pk"