All the changes that have been made in the last meeting

.gitignore

@@ -45,4 +45,34 @@ gfpgan
 
 # Firebase credentials (NEVER commit these!)
 firebase-service-account.json
-**/firebase-service-account.json
+**/firebase-service-account.json
+
+
+# Markdown docs except README
+*.md
+!README.md
+
+# Local test/debug files
+test_sync_endpoint.py
+
+# Local schema/docs
+New_schema
+data-1778222711514.csv
+API_ENDPOINTS.md
+ARCHITECTURE_RULES.md
+DATABASE_SCHEMA.md
+db-chat.txt
+DBMSUIS_V7_utf8.sql
+DBMSUIS_V7.sql
+RABBITMQ_MIGRATION.md
+setup_backend.bat
+
+# Python virtual env
+.venv/
+
+# Python cache
+__pycache__/
+*.pyc
+
+# Environment files
+.env

ClassLens_DB/ClassLens_DB/celery.py

@@ -2,20 +2,29 @@
 from celery import Celery
 import environ #type:ignore
 from pathlib import Path #type:ignore
+from urllib.parse import quote_plus
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 env = environ.Env()
 environ.Env.read_env(os.path.join(BASE_DIR, '.env'))
-redis_url = env('REDIS_URL')
+rabbitmq_url = env('RABBITMQ_URL')
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ClassLens_DB.settings')
 
+# Build database result backend URL with proper password encoding
+db_user = env("DB_USER")
+db_password = quote_plus(env("DB_PASSWORD"))
+db_host = env("DB_HOST")
+db_port = env("DB_PORT")
+db_name = env("DB_NAME")
+db_result_backend = f'db+postgresql://{db_user}:{db_password}@{db_host}:{db_port}/{db_name}'
+
 app = Celery('ClassLens_DB')
 app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks()
 app.conf.update(
-    broker_url=redis_url,
-    result_backend=redis_url,
+    broker_url=rabbitmq_url,
+    result_backend=db_result_backend,
     broker_connection_retry_on_startup=True,
 )

ClassLens_DB/ClassLens_DB/settings.py

@@ -13,6 +13,7 @@
 from pathlib import Path
 import environ
 import os
+from urllib.parse import quote_plus
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -26,16 +27,20 @@
 # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "django-insecure-x3zih9=91am0f(gkv&16y+n%7i1b91e-^mh&v*_r=_kz@y7t04"
+SECRET_KEY = env("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
 ALLOWED_HOSTS = [
+    '172.25.13.31',
+    '172.16.141.247',
+    '172.26.12.236',
+    '10.0.2.2',
     '14.139.121.110',
     'localhost',
     '127.0.0.1',
-    '172.25.13.31'
+    '10.0.3.2',
 ]
 
 
@@ -52,7 +57,6 @@
     "DatabaseAdminApp",
     "rest_framework",
     'corsheaders',
-    'django_redis'
 ]
 
 MIDDLEWARE = [
@@ -105,11 +109,8 @@
 
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": env('REDIS_URL'),
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        "LOCATION": "classlens-local-cache",
     }
 }
 
@@ -164,8 +165,14 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
-CELERY_BROKER_URL = env('REDIS_URL')
-CELERY_RESULT_BACKEND = env('REDIS_URL')
+CELERY_BROKER_URL = env('RABBITMQ_URL')
+CELERY_RESULT_BACKEND = env('CELERY_RESULT_BACKEND', default='db+postgresql://{0}:{1}@{2}:{3}/{4}'.format(
+    env("DB_USER"),
+    quote_plus(env("DB_PASSWORD")),
+    env("DB_HOST"),
+    env("DB_PORT"),
+    env("DB_NAME")
+))
 
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
@@ -182,4 +189,29 @@
 EMAIL_USE_TLS = True  # Use False if using SSL (port 465)
 EMAIL_HOST_USER = env('EMAIL_HOST_USER')  # Your email address
 EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')  # Your email password/app password
-DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER')
+DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER')
+
+# Django REST Framework Configuration
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'Home.authentication.CustomAdminAuthentication',
+        'rest_framework_simplejwt.authentication.JWTAuthentication',
+    ),
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.AllowAny',
+    ),
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+    'PAGE_SIZE': 100,
+}
+
+# JWT Configuration
+from datetime import timedelta
+
+SIMPLE_JWT = {
+    'ACCESS_TOKEN_LIFETIME': timedelta(hours=24),
+    'REFRESH_TOKEN_LIFETIME': timedelta(days=7),
+    'ROTATE_REFRESH_TOKENS': True,
+    'BLACKLIST_AFTER_ROTATION': True,
+    'ALGORITHM': 'HS256',
+    'SIGNING_KEY': SECRET_KEY,
+}

ClassLens_DB/ClassLens_DB/urls.py

@@ -21,9 +21,29 @@
 from django.conf.urls.static import static
 from DatabaseAdminApp import urls as db_admin_urls
 from django.urls import include
+from Home.views import health
+from django.views.generic import RedirectView
+from django.http import JsonResponse
+
+
+def api_root(request):
+    return JsonResponse(
+        {
+            "message": "ClassLens API",
+            "routes": {
+                "health": "/api/health/",
+                "departments": "/api/getDepartments/",
+                "admin": "/api/admin/",
+            },
+        }
+    )
 
 urlpatterns = [
     path("admin/", admin.site.urls),
+    path("health/",health,name="health_check"),
+    path("api", RedirectView.as_view(url="/api/", permanent=False)),
+    path("api/", api_root, name="api_root"),
+    path("api/health/", health, name="api_health"),
     path("api/", include(urls)),
     path("api/", include(db_admin_urls)),
 ]

ClassLens_DB/DatabaseAdminApp/models.py

@@ -1,3 +1,37 @@
 from django.db import models
 
-# Create your models here.
+
+class APIEnrollment(models.Model):
+	"""Staging table for enrollment data - matches New_schema exactly."""
+	prn = models.BigIntegerField()
+	subject_code = models.CharField(max_length=100)
+	division = models.CharField(max_length=20)
+	year = models.IntegerField()
+
+	class Meta:
+		unique_together = ('prn', 'subject_code', 'division', 'year')
+
+	def __str__(self):
+		return f"PRN {self.prn} - {self.subject_code} Div {self.division}"
+
+
+class APIPaper(models.Model):
+	"""Staging table for paper data - mirrors MSUIS API payloads. Matches New_schema exactly."""
+	msuis_id = models.BigIntegerField(primary_key=True)
+	paper_name = models.CharField(max_length=500)
+	paper_code = models.CharField(max_length=100)
+	raw_payload = models.JSONField()
+
+	def __str__(self):
+		return f"{self.paper_code} - {self.paper_name}"
+
+
+class APIStudent(models.Model):
+	"""Staging table for student data - mirrors MSUIS API payloads. Matches New_schema exactly."""
+	prn = models.BigIntegerField(primary_key=True)
+	email_id = models.CharField(max_length=255, null=True, blank=True)
+	raw_payload = models.JSONField()
+	full_name = models.CharField(max_length=255, null=True, blank=True)
+
+	def __str__(self):
+		return str(self.prn)

ClassLens_DB/DatabaseAdminApp/serializers.py

@@ -1,9 +1,16 @@
 # serializers.py
 
+from django.db import transaction
 from rest_framework import serializers
 from Home.models import (
     Department, Teacher, Student, Subject, SubjectFromDept,
-    StudentEnrollment, TeacherSubject, AdminUser
+    StudentEnrollment, TeacherSubject, AdminUser, Division
+)
+from Home.face_utils import extract_face_embedding
+from .models import (
+    APIStudent,
+    APIPaper,
+    APIEnrollment,
 )
 
 class DepartmentSerializer(serializers.ModelSerializer):
@@ -21,13 +28,50 @@ class Meta:
 
 class StudentSerializer(serializers.ModelSerializer):
     department_name = serializers.CharField(source='department.name', read_only=True)
+    division_name = serializers.CharField(source='division.name', read_only=True)
+    photo = serializers.ImageField(write_only=True, required=False, allow_null=True)
 
     class Meta:
         model = Student
         fields = ['id', 'prn', 'name', 'email', 'password_hash', 'year', 'department', 
-                  'department_name', 'face_embedding', 'notification_token']
+                  'department_name', 'division', 'division_name', 'face_embedding', 'notification_token', 'photo']
         extra_kwargs = {'password_hash': {'write_only': True}, 'face_embedding': {'write_only': True}}
 
+    def _apply_face_photo(self, instance, photo):
+        if photo is None:
+            return
+
+        embedding = extract_face_embedding(photo)
+        instance.face_embedding = [float(value) for value in embedding]
+
+    def create(self, validated_data):
+        photo = validated_data.pop('photo', None)
+        try:
+            with transaction.atomic():
+                student = super().create(validated_data)
+
+                if photo is not None:
+                    self._apply_face_photo(student, photo)
+                    student.save(update_fields=['face_embedding'])
+
+                return student
+        except ValueError as exc:
+            raise serializers.ValidationError({'photo': str(exc)}) from exc
+
+    def update(self, instance, validated_data):
+        photo = validated_data.pop('photo', None)
+        try:
+            with transaction.atomic():
+                student = super().update(instance, validated_data)
+
+                if photo is not None:
+                    self._apply_face_photo(student, photo)
+                    student.save(update_fields=['face_embedding'])
+
+                return student
+        except ValueError as exc:
+            raise serializers.ValidationError({'photo': str(exc)}) from exc
+
 class SubjectSerializer(serializers.ModelSerializer):
     class Meta:
         model = Subject
@@ -56,10 +100,11 @@ class Meta:
 class TeacherSubjectSerializer(serializers.ModelSerializer):
     teacher_name = serializers.CharField(source='teacher_id.name', read_only=True)
     subject_name = serializers.CharField(source='subject.name', read_only=True)
+    division_name = serializers.CharField(source='division.name', read_only=True)
 
     class Meta:
         model = TeacherSubject
-        fields = ['id', 'teacher_id', 'teacher_name', 'subject', 'subject_name']
+        fields = ['id', 'teacher_id', 'teacher_name', 'subject', 'subject_name', 'division', 'division_name']
 
 # class AdminUserSerializer(serializers.ModelSerializer):
 #     password = serializers.CharField(write_only=True)
@@ -93,4 +138,29 @@ def create(self, validated_data):
         )
         user.set_password(validated_data['password'])
         user.save()
-        return user
+        return user
+
+
+class APIStudentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = APIStudent
+        fields = "__all__"
+
+
+class APIPaperSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = APIPaper
+        fields = "__all__"
+
+
+class APIEnrollmentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = APIEnrollment
+        fields = "__all__"
+
+
+class DivisionSerializer(serializers.ModelSerializer):
+    class Meta:
+        from Home.models import Division
+        model = Division
+        fields = ['id', 'department', 'year', 'name']

ClassLens_DB/DatabaseAdminApp/settings.py

@@ -24,4 +24,5 @@
 CORS_ALLOWED_ORIGINS = [
     "http://localhost:3000",
     "http://127.0.0.1:3000",
+    "https://classlensfrontend.vercel.app"
 ]