Merge branch 'main' into community

backend/authentication/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

backend/authentication/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AuthenticationConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'authentication'

backend/authentication/authentication.py

@@ -0,0 +1,47 @@
+from django.contrib.auth.models import User
+from django.conf import settings
+from rest_framework import authentication, exceptions
+import jwt
+
+class JWTAuthentication(authentication.BaseAuthentication):
+    def authenticate(self, request):
+        auth_header = authentication.get_authorization_header(request).decode('utf-8')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            print("No JWT token found in request headers")
+            return None
+
+        token = auth_header.split(' ')[1]
+        try:
+            payload = jwt.decode(token, settings.SUPABASE_SECRET_KEY, algorithms=['HS256'], audience='authenticated')
+            user_id = payload['sub']
+            email = payload.get('email', '')
+            first_name = payload.get('user_metadata', {}).get('first_name', '')
+            last_name = payload.get('user_metadata', {}).get('last_name', '')
+
+            # Check if the user exists and update/create accordingly
+            user, created = User.objects.get_or_create(username=user_id, defaults={
+                'first_name': first_name,
+                'last_name': last_name,
+                'email': email
+            })
+
+            # If the user was not created (i.e., it already exists), update its details
+            if not created:
+                user.first_name = first_name
+                user.last_name = last_name
+                user.email = email
+                user.save()
+
+            if created:
+                print("\nNew user authenticated and created")
+            else:
+                print("User authenticated")
+
+            return (user, token)
+
+        except jwt.ExpiredSignatureError:
+            raise exceptions.AuthenticationFailed('Token expired, login again')
+        except jwt.InvalidTokenError:
+            raise exceptions.AuthenticationFailed('Invalid token')
+        except Exception as e:
+            raise exceptions.AuthenticationFailed(f'Unexpected error during authentication: {e}')

backend/authentication/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

backend/authentication/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

backend/authentication/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

backend/backend/settings.py

@@ -159,7 +159,7 @@
 
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'to_do_list.authentication.JWTAuthentication',
+        'authentication.authentication.JWTAuthentication',
     ),
 }
 

backend/backend/urls.py

@@ -20,5 +20,6 @@
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('to_do_list/', include('to_do_list.urls')),
+    path('chat/', include('chat.urls')),
     path('community/', include('community.urls'))
 ]

backend/chat/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

backend/chat/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ChatConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'chat'

backend/chat/authentication.py

@@ -0,0 +1,48 @@
+#this file is a copy from the file in authentication app. this file is not needed but im too scared to remove it.
+from django.contrib.auth.models import User
+from django.conf import settings
+from rest_framework import authentication, exceptions
+import jwt
+
+class JWTAuthentication(authentication.BaseAuthentication):
+    def authenticate(self, request):
+        auth_header = authentication.get_authorization_header(request).decode('utf-8')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            print("No JWT token found in request headers")
+            return None
+
+        token = auth_header.split(' ')[1]
+        try:
+            payload = jwt.decode(token, settings.SUPABASE_SECRET_KEY, algorithms=['HS256'], audience='authenticated')
+            user_id = payload['sub']
+            email = payload.get('email', '')
+            first_name = payload.get('user_metadata', {}).get('first_name', '')
+            last_name = payload.get('user_metadata', {}).get('last_name', '')
+
+            # Check if the user exists and update/create accordingly
+            user, created = User.objects.get_or_create(username=user_id, defaults={
+                'first_name': first_name,
+                'last_name': last_name,
+                'email': email
+            })
+
+            # If the user was not created (i.e., it already exists), update its details
+            if not created:
+                user.first_name = first_name
+                user.last_name = last_name
+                user.email = email
+                user.save()
+
+            if created:
+                print("\nNew user authenticated and created")
+            else:
+                print("User authenticated")
+
+            return (user, token)
+
+        except jwt.ExpiredSignatureError:
+            raise exceptions.AuthenticationFailed('Token expired, login again')
+        except jwt.InvalidTokenError:
+            raise exceptions.AuthenticationFailed('Invalid token')
+        except Exception as e:
+            raise exceptions.AuthenticationFailed(f'Unexpected error during authentication: {e}')

backend/chat/db_service.py

@@ -0,0 +1,42 @@
+from supabase import create_client, Client
+from django.conf import settings
+
+def get_supabase_client() -> Client:
+    url: str = settings.SUPABASE_URL
+    key: str = settings.SUPABASE_KEY
+    return create_client(url, key)
+
+def check_user_type(user_id):
+    client = get_supabase_client()
+    # Attempt to fetch the user from the 'mhp' table
+    response = client.table('mhp').select('*').eq('mhp_id', user_id).execute()
+    print(response)
+
+    if response.data:
+        print("User found as a MHP.")
+        return "mhp"
+    else:
+        print("User not found as MHP, marked as employee.")
+        return "employee"
+
+def fetch_chats(user_id):
+    client = get_supabase_client()
+    user_type = check_user_type(user_id)
+
+    if user_type == "employee":
+        response = client.table('chats').select('*').eq('user_id', user_id).execute()
+        return response
+    elif user_type == "mhp":
+        response = client.table('chats').select('*').eq('mhp_id', user_id).execute()
+        return response
+    else:
+        response = client.table('chats').select('*').eq('user_id', user_id).execute()
+        print("user type unknown")
+        return response
+    return None
+
+def fetch_messages(chat_id):
+    client = get_supabase_client()
+
+    response = client.table('messages').select('*').eq('chat_id', chat_id).execute()
+    return response

backend/chat/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

backend/chat/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

backend/chat/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+from .views import GetChats, GetMessages
+
+urlpatterns = [
+    path('getChats/', GetChats.as_view(), name='get-chats'),
+    path('getMessages/', GetMessages.as_view(), name='get-messages'),
+]

backend/chat/views.py

@@ -0,0 +1,66 @@
+from django.http import JsonResponse
+import json
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+from django.shortcuts import get_object_or_404
+from .db_service import fetch_chats, fetch_messages
+from django.contrib.auth.models import User
+
+class GetChats(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        user_id = request.user.username
+
+        try:
+            response = fetch_chats(user_id)
+            chats = []
+
+            if response.data:
+                for chat in response.data:
+                    chats.append({
+                        'chat_id': chat['chat_id'],
+                        'created_at': chat['created_at'],
+                        'user_id': chat['user_id'],
+                        'mhp_id': chat['mhp_id'],
+                    })
+
+            print(len(chats), "chats found")
+            return JsonResponse({'chats': chats}, safe=False)
+
+        except Exception as e:
+            print("Error fetching chats")
+            print(e)
+            return JsonResponse({'error': 'Failed to fetch chats'}, status=500)
+
+class GetMessages(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request, *args, **kwargs):
+        user_id = request.user.username
+        chat_id = request.GET.get('chat_id', None)
+
+        try:
+            if chat_id is not None:
+                messages = []
+                response = fetch_messages(chat_id)
+                for message in response.data:
+                    messages.append({
+                        'message_id': message['message_id'],
+                        'sent_at': message['sent_at'],
+                        'sender_id': message['sender_id'],
+                        'receiver_id': message['receiver_id'],
+                        'content': message['content'],
+                        'chat_id': message['chat_id'],
+                    })
+
+                print(len(messages), "messages found")
+                return JsonResponse({'messages': messages}, safe=False)
+
+        except Exception as e:
+            print("Error fethcing messages")
+            print(e)
+            return JsonResponse({'error': 'Failed to fetch messages'}, status=500)
+

backend/to_do_list/authentication.py

@@ -1,4 +1,3 @@
-# authentication.py in your Django app
 from django.contrib.auth.models import User
 from django.conf import settings
 from rest_framework import authentication, exceptions
@@ -15,11 +14,28 @@ def authenticate(self, request):
         try:
             payload = jwt.decode(token, settings.SUPABASE_SECRET_KEY, algorithms=['HS256'], audience='authenticated')
             user_id = payload['sub']
-            user, created = User.objects.get_or_create(username=user_id, defaults={'first_name': 'SupabaseUser'})
+            email = payload.get('email', '')
+            first_name = payload.get('user_metadata', {}).get('first_name', '')
+            last_name = payload.get('user_metadata', {}).get('last_name', '')
+
+            # Check if the user exists and update/create accordingly
+            user, created = User.objects.get_or_create(username=user_id, defaults={
+                'first_name': first_name,
+                'last_name': last_name,
+                'email': email
+            })
+
+            # If the user was not created (i.e., it already exists), update its details
+            if not created:
+                user.first_name = first_name
+                user.last_name = last_name
+                user.email = email
+                user.save()
+
             if created:
-                print("\nuser created")
+                print("\nNew user authenticated and created")
             else:
-                print("\nuser authenticated")
+                print("User authenticated")
 
             return (user, token)
 
@@ -28,4 +44,4 @@ def authenticate(self, request):
         except jwt.InvalidTokenError:
             raise exceptions.AuthenticationFailed('Invalid token')
         except Exception as e:
-            raise exceptions.AuthenticationFailed('Unexpected error during authentication', e)
+            raise exceptions.AuthenticationFailed(f'Unexpected error during authentication: {e}')

backend/to_do_list/db_service.py

@@ -7,9 +7,9 @@ def get_supabase_client() -> Client:
     key: str = settings.SUPABASE_KEY
     return create_client(url, key)
 
-def fetch_user_tasks(user_uuid):
+def fetch_user_tasks(user_id):
     client = get_supabase_client()
-    data = client.table('to_do_list_tasks').select('*').eq('user_id', user_uuid).eq('completed', False).execute()
+    data = client.table('to_do_list_tasks').select('*').eq('user_id', user_id).eq('completed', False).execute()
     return data
 
 def mark_as_complete(task_id):
@@ -26,3 +26,19 @@ def mark_as_complete(task_id):
         return error_message
 
     return None  # No errors, return None
+
+def add_task(title, description, user_id):
+    client = get_supabase_client()
+    error_message = None
+    response = client.table('to_do_list_tasks').insert({
+        'title': title,
+        'description': description,
+        'user_id': user_id,
+        'completed': False
+    }).execute()
+
+    if not response.data:
+        error_message = "Failed to create task in supabase."
+        if hasattr(response, 'error') and response.error:
+            error_message = response.error.message
+        return error_message

backend/to_do_list/urls.py

@@ -1,8 +1,8 @@
-
 from django.urls import path
-from .views import TaskListCreate, TaskUpdate
+from .views import TaskListCreate, TaskUpdate, TaskCreate
 
 urlpatterns = [
     path('tasks/', TaskListCreate.as_view(), name='task-list-create'),
     path('tasks/update/<str:task_id>/', TaskUpdate.as_view(), name='task-update'),
+    path('tasks/create/', TaskCreate.as_view(), name='task-create'),
 ]