Merge pull request #35 from akirachix/feature/bug-fix

Feature/bug fix

Author: Ndichu-shee

api/serializers.py

@@ -420,7 +420,7 @@ def update(self, instance, validated_data):
                 profile.practice_number = practice_number
                 profile.save()
             if cpd_points_2025 is not None:
-                profile.cpd_points_2025 = cpd_points_2025 + 1
+                profile.cpd_points_2025 = cpd_points_2025
                 profile.save()
 
         return instance

api/urls.py

@@ -1,6 +1,6 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
-from api.views import CaseAssignmentViewSet, CaseViewSet,CPDPointViewSet,DetaineeViewSet, LawyerRegistrationView, ForgotPasswordView, VerifyCodeView, ResetPasswordView,UsersViewSet, UserSignupView, LoginView
+from api.views import CaseAssignmentViewSet, CaseViewSet,CPDPointViewSet,DetaineeViewSet, LawyerRegistrationView, ForgotPasswordView, VerifyCodeView, ResetPasswordView,UsersViewSet, UserSignupView, LoginView,ApplicantCaseViewSet
 from rest_framework.authtoken.views import obtain_auth_token
 
 
@@ -10,7 +10,8 @@
 router.register(r'case-assignments', CaseAssignmentViewSet, basename='case-assignment')
 router.register(r"users", UsersViewSet, basename="users")
 router.register(r"detainees", DetaineeViewSet, basename="detainees")
-# router.register(r"my-cases", MyCaseViewSet, basename="my-cases")
+router.register(r"applicant-cases", ApplicantCaseViewSet, basename="applicant-cases")
+
 
 
 

api/views.py

@@ -1,7 +1,7 @@
 from rest_framework import viewsets, generics, status
 from rest_framework.permissions import AllowAny
 from django.shortcuts import render
-from rest_framework import viewsets, status
+from rest_framework import viewsets, status,permissions
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from .serializers import CaseAssignmentSerializer, CaseSerializer,CPDPointSerializer,DetaineeSerializer
@@ -257,6 +257,13 @@ def update(self, request, *args, **kwargs):
 
     permission_classes = [AllowAny]  
 
+class ApplicantCaseViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = CaseSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self):
+        return Case.objects.filter(user=self.request.user)
+ 
 class UsersViewSet(viewsets.ModelViewSet):
     queryset = User.objects.all()
     serializer_class = UserSerializer

cases/migrations/0016_case_user.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.6 on 2025-10-16 05:31
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cases", "0015_remove_case_assigned_lawyer"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="case",
+            name="user",
+            field=models.ForeignKey(
+                blank=True,
+                limit_choices_to={"role": "applicant"},
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

cases/models.py

@@ -80,13 +80,21 @@ class Case(models.Model):
         null=True,
         blank=True
     )
+    user = models.ForeignKey(
+       User,
+       on_delete=models.CASCADE,
+       null=True,
+       blank=True,
+       limit_choices_to={'role': 'applicant'}
+   )
     predicted_urgency_level = models.CharField(
         max_length=20,
         choices=[('high', 'High'), ('medium', 'Medium'), ('low', 'Low')],
         null=True,
         blank=True
     )
     date_of_offense = models.DateField(null=True, blank=True)
+
     trial_date = models.DateField(null=True, blank=True)
     police_station = models.CharField(max_length=255, null=True, blank=True)
     latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)

cases/services.py

@@ -63,13 +63,31 @@ def assign_case_automatically(case_id):
         'environment': 'environment_law',
         'employment': 'employment_law',
         'civil': 'civil_law',
-        'other': 'criminal_law'
+        'other': 'criminal_law',
+        'theft': 'criminal_law',
+        'assault': 'criminal_law',
+        'murder': 'criminal_law',
+        'abduction': 'criminal_law',
+        'fraud': 'corporate_law',
+        'harassment': 'employment_law',
     }
-
-    field_name = specialization_map.get(case.predicted_case_type.lower(), None)
+    case_type = case.predicted_case_type.lower().strip()
+    if " - " in case_type:
+            case_type = case_type.split(" - ")[0].strip()
+    elif "/" in case_type:
+            case_type = case_type.split("/")[0].strip()
+    field_name = specialization_map.get(case_type)
     if not field_name:
+        for key, value in specialization_map.items():
+            if key in case_type:
+                field_name = value
+                break
         logger.error(f"Unknown predicted case type: {case.predicted_case_type}")
         return None
+    if not field_name:
+        logger.error(f"Unknown predicted case type: {case.predicted_case_type}")
+        return None
+
 
     lawyers = LawyerProfile.objects.filter(verified=True, **{field_name: True})