Merge pull request #21 from akirachix/develop

Develop

Author: Ndichu-shee

api/views.py

@@ -37,6 +37,7 @@
 from .serializers import ReviewSerializer
 from django_filters.rest_framework import DjangoFilterBackend
 import json
+from django.core.cache import cache
 
 class ReviewViewSet(viewsets.ModelViewSet):
    queryset = Review.objects.all()
@@ -112,6 +113,7 @@ def post(self, request):
 
 
        otp = str(random.randint(1000, 9999))
+       cache.set(f'otp_{email}',otp,timeout=300)
        otp_storage[email] = otp 
 
 
@@ -132,12 +134,10 @@ def post(self, request):
        serializer.is_valid(raise_exception=True)
        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"},status=status.HTTP_400_BAD_REQUEST)
+       cache.delete(f"otp_{email}")
        return Response({"detail": "OTP verified."})
 
 
@@ -147,17 +147,18 @@ def post(self, request):
        serializer.is_valid(raise_exception=True)
        email = serializer.validated_data['email']
        password = serializer.validated_data['password']
-
-
        try:
            user = User.objects.get(email=email)
+
+
        except User.DoesNotExist:
            return Response({"detail": "User with this email does not exist."}, status=status.HTTP_400_BAD_REQUEST)
 
 
        user.set_password(password)
        user.save()
-       otp_storage.pop(email, None)
+       cache.delete(f"otp_{email}")
+  
        return Response({"detail": "Password reset successful."})
 
 class OrderViewSet(viewsets.ModelViewSet):

feedlink/settings.py

@@ -13,6 +13,7 @@
 from dotenv import load_dotenv
 import dj_database_url
 
+
 load_dotenv()
 import environ
 

inventory/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.6 on 2025-09-12 07:21
+# Generated by Django 4.2.24 on 2025-09-25 07:16
 
 from django.db import migrations, models
 
@@ -7,28 +7,71 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Listing',
+            name="Listing",
             fields=[
-                ('listing_id', models.AutoField(primary_key=True, serialize=False)),
-                ('product_type', models.CharField(choices=[('edible', 'Edible'), ('inedible', 'Inedible')], max_length=10)),
-                ('category', models.CharField(max_length=50)),
-                ('description', models.CharField(max_length=200)),
-                ('quantity', models.DecimalField(decimal_places=2, max_digits=10)),
-                ('original_price', models.DecimalField(decimal_places=2, max_digits=10)),
-                ('expiry_date', models.DateTimeField()),
-                ('discounted_price', models.DecimalField(decimal_places=2, max_digits=10)),
-                ('image', models.ImageField(blank=True, null=True, upload_to='listing_images/')),
-                ('image_url', models.URLField(blank=True, null=True)),
-                ('status', models.CharField(choices=[('available', 'Available'), ('expired', 'Expired')], default='available', max_length=20)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('upload_method', models.CharField(choices=[('manual', 'Manual'), ('csv', 'CSV')], max_length=10)),
-                ('pickup_window_duration', models.DateTimeField()),
+                ("listing_id", models.AutoField(primary_key=True, serialize=False)),
+                (
+                    "product_type",
+                    models.CharField(
+                        choices=[("edible", "Edible"), ("inedible", "Inedible")],
+                        max_length=10,
+                    ),
+                ),
+                ("category", models.CharField(blank=True, max_length=50, null=True)),
+                (
+                    "description",
+                    models.CharField(blank=True, max_length=200, null=True),
+                ),
+                ("quantity", models.DecimalField(decimal_places=2, max_digits=10)),
+                (
+                    "original_price",
+                    models.DecimalField(
+                        blank=True, decimal_places=2, max_digits=10, null=True
+                    ),
+                ),
+                ("expiry_date", models.DateTimeField(blank=True, null=True)),
+                (
+                    "discounted_price",
+                    models.DecimalField(
+                        blank=True, decimal_places=2, max_digits=10, null=True
+                    ),
+                ),
+                (
+                    "image",
+                    models.ImageField(
+                        blank=True, null=True, upload_to="listing_images/"
+                    ),
+                ),
+                ("image_url", models.URLField(blank=True, null=True)),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[("available", "Available"), ("expired", "Expired")],
+                        default="available",
+                        max_length=20,
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "upload_method",
+                    models.CharField(
+                        choices=[("manual", "Manual"), ("csv", "CSV")], max_length=10
+                    ),
+                ),
+                ("pickup_window_duration", models.DateTimeField()),
+                (
+                    "unit",
+                    models.CharField(
+                        choices=[("kg", "kg"), ("L", "L"), ("unit", "unit")],
+                        help_text="Select the unit: kg (weight), L (volume), or unit (count of items)",
+                        max_length=10,
+                    ),
+                ),
             ],
         ),
     ]

…tory/migrations/0002_listing_producer.py inventory/migrations/0002_initial.pyinventory/migrations/0002_listing_producer.py renamed to inventory/migrations/0002_initial.py inventory/migrations/0002_listing_producer.py renamed to inventory/migrations/0002_initial.py

@@ -1,12 +1,14 @@
-# Generated by Django 5.2.6 on 2025-09-12 14:43
+# Generated by Django 4.2.24 on 2025-09-25 07:16
 
-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
         ("inventory", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -17,12 +19,9 @@ class Migration(migrations.Migration):
             model_name="listing",
             name="producer",
             field=models.ForeignKey(
-                default=1,
                 limit_choices_to={"role": "producer"},
-                null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 to=settings.AUTH_USER_MODEL,
-                # preserve_default=False,
             ),
         ),
     ]

inventory/migrations/0003_alter_listing_category_alter_listing_description_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.6 on 2025-09-12 07:21
+# Generated by Django 4.2.24 on 2025-09-25 07:16
 
 from django.db import migrations, models
 
@@ -7,17 +7,35 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='UserLocation',
+            name="UserLocation",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('address', models.CharField(blank=True, max_length=100, null=True)),
-                ('latitude', models.DecimalField(blank=True, decimal_places=7, max_digits=10, null=True)),
-                ('longitude', models.DecimalField(blank=True, decimal_places=7, max_digits=10, null=True)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("address", models.CharField(blank=True, max_length=100, null=True)),
+                (
+                    "latitude",
+                    models.DecimalField(
+                        blank=True, decimal_places=7, max_digits=10, null=True
+                    ),
+                ),
+                (
+                    "longitude",
+                    models.DecimalField(
+                        blank=True, decimal_places=7, max_digits=10, null=True
+                    ),
+                ),
+                ("radius_km", models.FloatField(default=0.5)),
             ],
         ),
     ]

inventory/migrations/0004_alter_listing_quantity.py

@@ -1,23 +1,27 @@
-# Generated by Django 5.2.6 on 2025-09-12 07:21
+# Generated by Django 4.2.24 on 2025-09-25 07:16
 
-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        ('location', '0001_initial'),
+        ("location", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='userlocation',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='location', to=settings.AUTH_USER_MODEL),
+            model_name="userlocation",
+            name="user",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="location",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
     ]