unb-mds · Potatoyz908 · Jan 7, 2025 · Dec 25, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .env
 *.log
 *.tmp
+__pycache__
 __pycache__/
 secrets.env
-
+API/media/
diff --git a/API/AcheiUnB/__pycache__/__init__.cpython-312.pyc b/API/AcheiUnB/__pycache__/__init__.cpython-312.pyc
diff --git a/API/AcheiUnB/__pycache__/urls.cpython-312.pyc b/API/AcheiUnB/__pycache__/urls.cpython-312.pyc
diff --git a/API/AcheiUnB/__pycache__/wsgi.cpython-312.pyc b/API/AcheiUnB/__pycache__/wsgi.cpython-312.pyc
diff --git a/API/AcheiUnB/asgi.py b/API/AcheiUnB/asgi.py
@@ -1,7 +1,9 @@
 import os
-from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter, URLRouter
+
 from channels.auth import AuthMiddlewareStack
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
+
 from chat.routing import websocket_urlpatterns
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "AcheiUnB.settings")

diff --git a/API/AcheiUnB/settings.py b/API/AcheiUnB/settings.py
@@ -1,18 +1,10 @@
-"""
-Django settings for AcheiUnB project.
-
-Generated by 'django-admin startproject' using Django 5.1.2.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.1/ref/settings/
-"""
-
 import os
-from pathlib import Path
 from datetime import timedelta
+from pathlib import Path
+
+import cloudinary
+import cloudinary.uploader
+from decouple import config
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -27,8 +19,12 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ["0.0.0.0", "localhost"]
-
+ALLOWED_HOSTS = ["*"]
+AUTH_USER_MODEL = "auth.User"
+MEDIA_URL = "/media/"  # Prefixo da URL para os arquivos
+MEDIA_ROOT = os.path.join(
+    BASE_DIR, "/home/pedroubu/Imagens/AcheiUnBFt"
+)  # Diretório onde os arquivos serão salvos
 
 # Application definition
 
@@ -40,6 +36,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.sites",
+    "django_filters",
     "users",
     "rest_framework",
     "AcheiUnB",
@@ -73,6 +70,8 @@
     "DEFAULT_RENDERER_CLASSES": [
         "rest_framework.renderers.JSONRenderer",  # Apenas JSON será usado
     ],
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
+    "PAGE_SIZE": 10,
 }
 
 SIMPLE_JWT = {
@@ -87,7 +86,7 @@
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.channels_redis",  # Para desenvolvimento local
-        "BACKEND": "channels.layers.InMemoryChannelLayer",
+        # "BACKEND": "channels.layers.InMemoryChannelLayer",
     },
 }
 
@@ -143,14 +142,22 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": "db",
-        "USER": "postgres",
-        "PASSWORD": "senha",
-        "HOST": "db",
-        "PORT": "5432",
+        "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"),
     }
 }
 
+# Cloudinary
+
+
+cloudinary.config(
+    cloud_name=config("CLOUDINARY_CLOUD_NAME"),
+    api_key=config("CLOUDINARY_API_KEY"),
+    api_secret=config("CLOUDINARY_API_SECRET"),
+)
 
 # Password validation
 # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators

diff --git a/API/AcheiUnB/static/dist/assets/Favicon-DZaE_dAz.png b/API/AcheiUnB/static/dist/assets/Favicon-DZaE_dAz.png
diff --git a/API/AcheiUnB/static/dist/index.html b/API/AcheiUnB/static/dist/index.html
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 <html lang="">
-  <head>
-    <meta charset="UTF-8">
-    <!-- <link rel="icon" href="/favicon.ico"> -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>AcheiUnB</title>
-    <script type="module" crossorigin src="/static/dist/js/index-DnGNr4YP.js"></script>
-    <link rel="stylesheet" crossorigin href="/static/dist/assets/index-B8Uo463z.css">
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" type="image/png" href="/static/dist/assets/Favicon-DZaE_dAz.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>AcheiUnB</title>
+  <script type="module" crossorigin src="/static/dist/js/index-DnGNr4YP.js"></script>
+  <link rel="stylesheet" crossorigin href="/static/dist/assets/index-B8Uo463z.css">
+</head>
+
+<body>
+  <div id="app"></div>
+</body>
+
+</html>
diff --git a/API/AcheiUnB/urls.py b/API/AcheiUnB/urls.py
@@ -1,20 +1,20 @@
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import path, include
-from django.contrib.auth import views as auth_views
+from django.shortcuts import render
+from django.urls import include, path
 from rest_framework_simplejwt.views import (
     TokenObtainPairView,
     TokenRefreshView,
 )
-from django.shortcuts import render
+
 from users import views
-from users.views import microsoft_callback
+from users.views import DeleteUserView, microsoft_callback
 
 
 # View para servir o arquivo Vue.js
 def vue_app(request):
-    return render(
-        request, "index.html"
-    )  # Caminho para o index.html dentro da pasta templates
+    return render(request, "index.html")  # Caminho para o index.html dentro da pasta templates
 
 
 urlpatterns = [
@@ -35,4 +35,9 @@ def vue_app(request):
     ),  # Atualizar token de acesso
     path("api/chat/", include("chat.urls")),
     path("api/", include("users.urls")),
+    path("delete-user/<int:user_id>/", DeleteUserView.as_view(), name="delete_user"),
 ]
+
+# Adiciona a configuração para servir arquivos estáticos no desenvolvimento
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/API/AcheiUnB/wsgi.py b/API/AcheiUnB/wsgi.py
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AcheiUnB.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "AcheiUnB.settings")
 
 application = get_wsgi_application()
diff --git a/API/chat/consumers.py b/API/chat/consumers.py
@@ -1,39 +1,57 @@
 import json
+
+from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncWebsocketConsumer
 
+from .models import ChatRoom, Message
+
 
 class ChatConsumer(AsyncWebsocketConsumer):
     async def connect(self):
-        self.chat_id = self.scope["url_route"]["kwargs"]["chat_id"]
-        self.chat_group_name = f"chat_{self.chat_id}"
+        self.room_id = self.scope["url_route"]["kwargs"]["room_id"]
+        self.room_group_name = f"chat_{self.room_id}"
 
-        # Join the chat group
-        await self.channel_layer.group_add(self.chat_group_name, self.channel_name)
-        await self.accept()
+        # Verifica se o usuário tem acesso à sala
+        room = await sync_to_async(ChatRoom.objects.get)(id=self.room_id)
+        user = self.scope["user"]
+        if user not in {room.participant_1, room.participant_2}:
+            await self.close()
+        else:
+            await self.channel_layer.group_add(self.room_group_name, self.channel_name)
+            await self.accept()
 
     async def disconnect(self, close_code):
-        # Leave the chat group
-        await self.channel_layer.group_discard(self.chat_group_name, self.channel_name)
+        await self.channel_layer.group_discard(self.room_group_name, self.channel_name)
 
     async def receive(self, text_data):
         data = json.loads(text_data)
-        message = data["message"]
+        message_content = data["message"]
+        sender = self.scope["user"]
+
+        # Salva a mensagem no banco
+        room = await sync_to_async(ChatRoom.objects.get)(id=self.room_id)
+        message = await sync_to_async(Message.objects.create)(
+            room=room, sender=sender, content=message_content
+        )
 
-        # Send message to the group
+        # Envia a mensagem para o grupo
         await self.channel_layer.group_send(
-            self.chat_group_name,
+            self.room_group_name,
             {
                 "type": "chat_message",
-                "message": message,
+                "message": message_content,
+                "sender": sender.username,
+                "timestamp": message.timestamp.isoformat(),
             },
         )
 
     async def chat_message(self, event):
-        # Send message to WebSocket
         await self.send(
             text_data=json.dumps(
                 {
                     "message": event["message"],
+                    "sender": event["sender"],
+                    "timestamp": event["timestamp"],
                 }
             )
         )
diff --git a/API/chat/migrations/0001_initial.py b/API/chat/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -15,21 +14,53 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Chat',
+            name="Chat",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('participants', models.ManyToManyField(related_name='chats', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "participants",
+                    models.ManyToManyField(related_name="chats", to=settings.AUTH_USER_MODEL),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='Message',
+            name="Message",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField()),
-                ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('chat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='chat.chat')),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField()),
+                ("timestamp", models.DateTimeField(auto_now_add=True)),
+                (
+                    "chat",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="messages",
+                        to="chat.chat",
+                    ),
+                ),
+                (
+                    "sender",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
     ]