comment model fixed

civicfix/settings.py

@@ -1,10 +1,6 @@
 import os
 from pathlib import Path
-import dj_database_url
 from dotenv import load_dotenv
-import cloudinary
-import cloudinary.uploader
-import cloudinary.api
 
 # Load .env file (for local dev only, Render will use Environment tab)
 load_dotenv()
@@ -12,9 +8,9 @@ load_dotenv()
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 # Security
-SECRET_KEY = os.getenv("SECRET_KEY", "unsafe-secret-key")
-DEBUG = os.getenv("DEBUG", "False") == "True"
-ALLOWED_HOSTS = ["*", "civicfix.onrender.com"]
+SECRET_KEY = os.getenv("SECRET_KEY")
+DEBUG = True
+ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
 
 # Installed apps
 INSTALLED_APPS = [
@@ -24,19 +20,11 @@ INSTALLED_APPS = [
     'django.contrib.humanize',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'cloudinary',
-    'cloudinary_storage',
     'django.contrib.staticfiles',
     'whitenoise.runserver_nostatic',
     'core.apps.CoreConfig',
 ]
 
-CLOUDINARY_STORAGE = {
-    'CLOUD_NAME': os.getenv('CLOUD_NAME'),
-    'API_KEY': os.getenv('API_KEY'),
-    'API_SECRET': os.getenv('API_SECRET'),
-}
-
 AUTH_USER_MODEL = 'core.User'
 
 MIDDLEWARE = [
@@ -69,13 +57,16 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'civicfix.wsgi.application'
 
-# Database (Render Postgres, fallback to SQLite locally)
+# Database (PostgreSQL for Local)
 DATABASES = {
-    "default": dj_database_url.config(
-        default=os.environ.get("DATABASE_URL"),
-        conn_max_age=600,
-        ssl_require=True,  
-    )
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': os.getenv("DB_NAME"),
+        'USER': os.getenv("DB_USER"),
+        'PASSWORD': os.getenv("DB_PASSWORD"),
+        'HOST': os.getenv("DB_HOST"),
+        'PORT': os.getenv("DB_PORT"),
+    }
 }
 
 # Password validators
@@ -86,6 +77,7 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
+
 # Internationalization
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'UTC'
@@ -96,18 +88,8 @@ USE_TZ = True
 STATIC_URL = "/static/"
 STATIC_ROOT = BASE_DIR / "staticfiles"
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-
-
-cloudinary.config( 
-    cloud_name=os.getenv("CLOUD_NAME"),
-    api_key=os.getenv("API_KEY"),
-    api_secret=os.getenv("API_SECRET"),
-    secure=True
-)
-
-# Default storage (Cloudinary)
-DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage'
-
+MEDIA_URL = "/media/"
+MEDIA_ROOT = BASE_DIR / "media"
 
 # Auth redirects
 LOGIN_REDIRECT_URL = 'citizen_dashboard'

core/migrations/0003_alter_vote_unique_together_alter_issue_photo_and_more.py

@@ -0,0 +1,47 @@
+# Generated by Django 5.2.5 on 2026-02-02 06:27
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_user_banned_until_user_is_banned'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='vote',
+            unique_together=set(),
+        ),
+        migrations.AlterField(
+            model_name='issue',
+            name='photo',
+            field=models.ImageField(blank=True, null=True, upload_to='issues/', validators=[django.core.validators.FileExtensionValidator(['jpg', 'jpeg', 'png', 'webp'])]),
+        ),
+        migrations.AddIndex(
+            model_name='issue',
+            index=models.Index(fields=['status'], name='core_issue_status_2609e6_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='issue',
+            index=models.Index(fields=['created_at'], name='core_issue_created_50e100_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='issue',
+            index=models.Index(fields=['department'], name='core_issue_departm_5c654b_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='issue',
+            index=models.Index(fields=['reporter'], name='core_issue_reporte_3f70e1_idx'),
+        ),
+        migrations.AddConstraint(
+            model_name='department',
+            constraint=models.UniqueConstraint(fields=('admin',), name='unique_department_admin'),
+        ),
+        migrations.AddConstraint(
+            model_name='vote',
+            constraint=models.UniqueConstraint(fields=('user', 'issue'), name='unique_vote_per_user_issue'),
+        ),
+    ]

core/models.py

@@ -1,4 +1,3 @@
-from cloudinary.models import CloudinaryField
 from datetime import timedelta
 from django.contrib.auth.models import AbstractUser
 from django.core.validators import FileExtensionValidator
@@ -6,6 +5,7 @@ from django.conf import settings
 from django.db import models
 from django.utils import timezone
 
+#User Model
 class User(AbstractUser):
     is_citizen = models.BooleanField(default=False)
     is_moderator = models.BooleanField(default=False)
@@ -33,6 +33,9 @@ class User(AbstractUser):
     is_banned = models.BooleanField(default=False)
     banned_until = models.DateTimeField(null=True, blank=True)
 
+    def __str__(self):
+        return self.username
+
     def ban(self, days=7):
         """Ban user for given number of days (default = 7)."""
         self.is_banned = True
@@ -45,16 +48,16 @@ class User(AbstractUser):
         self.banned_until = None
         self.save()
 
-    def is_currently_banned(self):
-        """Check if user is still banned (auto-unban if expired)."""
+    @property
+    def currently_banned(self):
         if self.is_banned and self.banned_until:
             if timezone.now() >= self.banned_until:
-                # Auto unban if ban expired
                 self.unban()
                 return False
             return True
         return False
 
+#Department Model
 class Department(models.Model):
     name = models.CharField(max_length=100, unique=True)
     description = models.TextField(blank=True, null=True)
@@ -78,10 +81,17 @@ class Department(models.Model):
 
     class Meta:
         ordering = ["name"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["admin"],
+                name="unique_department_admin"
+            )
+        ]
 
     def __str__(self):
         return self.name
 
+#Issue Model
 class Issue(models.Model):
     STATUS_REPORTED = 'reported'
     STATUS_ACKNOWLEDGED = 'acknowledged'
@@ -117,10 +127,11 @@ class Issue(models.Model):
     latitude = models.FloatField(null=True, blank=True)
     longitude = models.FloatField(null=True, blank=True)
 
-    photo = CloudinaryField(
-        'images',
+    photo = models.ImageField(
+        upload_to="issues/",
         blank=True,
         null=True,
+        validators=[FileExtensionValidator(["jpg", "jpeg", "png", "webp"])]
     )
 
     status = models.CharField(
@@ -133,43 +144,60 @@ class Issue(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     class Meta:
-        ordering = ["-created_at"]  # 🔹 latest issues first by default
+        ordering = ["-created_at"]
+        indexes = [
+            models.Index(fields=["status"]),
+            models.Index(fields=["created_at"]),
+            models.Index(fields=["department"]),
+            models.Index(fields=["reporter"]),
+        ]
+
+
+  # 🔹 latest issues first by default
 
     def __str__(self):
         return f"{self.title} ({self.get_status_display()})"
 
     # 🔹 Helpers
     def vote_count(self):
-        return self.votes.count() if hasattr(self, "votes") else 0
+        return self.votes.count()
+
 
     def has_user_voted(self, user):
-        if user.is_authenticated and hasattr(self, "votes"):
+        if user.is_authenticated:
             return self.votes.filter(user=user).exists()
-        return 
+        return False
+
     
     def assign_to_department(self, department):
-        """Assign issue to a department and auto-update status to acknowledged"""
+        if self.department_id == department.id:
+            return
         self.department = department
         self.status = self.STATUS_ACKNOWLEDGED
         self.save()
 
-
-    
+#Vote Model
 class Vote(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name='votes')
     created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
-        unique_together = ('user', 'issue')  # Prevent duplicate votes per user
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "issue"],
+            name="unique_vote_per_user_issue"
+            )
+        ]
 
     def __str__(self):
         return f"{self.user.username} voted on {self.issue.title}"
 
+#Comment Model
 class Comment(models.Model):
     issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="comments")
     user = models.ForeignKey(User, on_delete=models.CASCADE)
-    content = models.TextField()   # <--- field name is "content", not "text"
+    content = models.TextField() 
     parent = models.ForeignKey("self", null=True, blank=True, related_name="replies", on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
 

core/templates/core/login.html

@@ -44,7 +44,7 @@
                     <hr class="my-4">
                     
                     <p class="text-center text-muted">
-                        Don't have an account? <a href="{% url 'register' %}" class="text-decoration-none">Register here</a>
+                        Don't have an account? <a href="{% url 'register' %}" class="text-decoration-none">Register</a>
                     </p>
                 </div>
             </div>

core/templates/core/register.html

@@ -79,7 +79,7 @@
                     <hr class="my-4">
 
                     <p class="text-center text-muted">
-                        Already have an account? <a href="{% url 'login' %}" class="text-decoration-none">Login here</a>
+                        Already have an account? <a href="{% url 'login' %}" class="text-decoration-none">Login</a>
                     </p>
                 </div>
             </div>

core/templates/core/superadmin_reports.html

@@ -5,6 +5,7 @@
     <div class="card shadow-lg">
         <div class="card-header bg-warning text-dark">
             <h3>Analytics & Reports</h3>
+            <a href="{% url 'superadmin_dashboard' %}" class="btn btn-light btn-sm">Back to Dashboard</a>
         </div>
         <div class="card-body">
 

core/templates/issues/manage_issues.html

@@ -3,7 +3,7 @@
 {% block content %}
 <div class="container my-5">
     <div class="card shadow-lg">
-        <div class="card-header bg-warning text-black d-flex justify-content-between align-items-center">
+        <div class="card-header bg-danger text-black d-flex justify-content-between align-items-center">
             <h3>Manage Issues</h3>
             <a href="{% url 'superadmin_dashboard' %}" class="btn btn-light btn-sm">Back to Dashboard</a>
         </div>