Merge pull request #24 from akirachix/develop

Develop

Author: Ndichu-shee

api/views.py

@@ -24,6 +24,7 @@
 from django.shortcuts import render
 from rest_framework.authtoken.models import Token
 from django.contrib.auth import authenticate
+from django.core.cache import cache
 
 from users.permissions import IsAdmin, IsUser
 
@@ -174,8 +175,7 @@ def post(self, request):
             return Response({"detail": "User with this email does not exist."}, status=status.HTTP_400_BAD_REQUEST)
 
         otp = str(random.randint(1000, 9999))
-        otp_storage[email] = otp
-
+        cache.set(f'otp_{email}', otp, timeout=300)
         send_mail(
             'Your OTP for password reset',
             f'Your OTP is {otp}',
@@ -195,8 +195,12 @@ def post(self, request):
         email = serializer.validated_data['email']
         otp = serializer.validated_data['otp']
 
-        if otp_storage.get(email) != otp:
-            return Response({"detail": "Invalid OTP."}, status=status.HTTP_400_BAD_REQUEST)
+        cached_otp = cache.get(f'otp_{email}')
+        if cached_otp is None:
+          return Response({"detail": "OTP has expired, please request a new one."}, status=status.HTTP_400_BAD_REQUEST)
+        elif cached_otp != otp:
+          return Response({"detail": "Invalid OTP."}, status=status.HTTP_400_BAD_REQUEST)
+        cache.delete(f'otp_{email}')
 
         return Response({"detail": "OTP verified."})
 
@@ -216,7 +220,7 @@ def post(self, request):
 
         user.set_password(password)
         user.save()
-        otp_storage.pop(email, None)
+        cache.delete(f'otp_{email}')
         return Response({"detail": "Password reset successful."})
 
 

cases/migrations/0005_alter_case_predicted_case_type.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.6 on 2025-09-19 06:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cases", "0004_remove_caseassignment_lawyer_id_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="case",
+            name="predicted_case_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("criminal", "Criminal"),
+                    ("Environment", "environment"),
+                    ("Employment", "employment"),
+                    ("civil", "Civil"),
+                    (
+                        "constitutional and human rights",
+                        "Constitutional and Human Rights",
+                    ),
+                    ("family", "Family"),
+                    ("labor", "Labor"),
+                    ("property", "Property"),
+                    ("other", "Other"),
+                ],
+                max_length=50,
+                null=True,
+            ),
+        ),
+    ]

cases/models.py

@@ -65,7 +65,7 @@ class Case(models.Model):
     case_description = models.TextField()
     predicted_case_type = models.CharField(
         max_length=50,
-        choices=[('criminal', 'Criminal'), ('civil', 'Civil'), ('constitutional and human rights', 'Constitutional and Human Rights'), ('family', 'Family'), ('labor', 'Labor'), ('property', 'Property'), ('other', 'Other')],
+        choices=[('criminal', 'Criminal'),('Environment','environment'),('Employment','employment'), ('civil', 'Civil'), ('constitutional and human rights', 'Constitutional and Human Rights'), ('family', 'Family'), ('labor', 'Labor'), ('property', 'Property'), ('other', 'Other')],
         null=True,
         blank=True
     )

users/migrations/0002_alter_user_role.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.6 on 2025-09-19 06:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="role",
+            field=models.CharField(
+                choices=[
+                    ("applicant", "Applicant"),
+                    ("lawyer", "Lawyer"),
+                    ("lsk_admin", "LSK Admin"),
+                    ("admin", "Admin"),
+                ],
+                default="applicant",
+                max_length=100,
+            ),
+        ),
+    ]