messenger finalizat

messenger_app/api/v1/endpoints/auth/login.py

@@ -8,6 +8,14 @@ async def login(login_info: Login):
     if not result:
         raise HTTPException(status_code=404, detail='User not in system.')
 
-    password, email = result[2], result[3]
+    id, username, password, email = result[0], result[1], result[2], result[3]
     if login_info.email != email or login_info.password != password:
         raise HTTPException(status_code=401, detail="Invalid credentials.")
+
+    return {
+        'info': {
+            'id': id,
+            'username': username,
+            'email': email,
+        }
+    }

messenger_app/api/v1/endpoints/auth/signup.py

@@ -8,6 +8,12 @@ async def signup(user: User):
     if result:
         raise HTTPException(status_code=409, detail='User already exists.')
 
-    print(user.username, user.email, user.password)
-
     create_user_db(username=user.username, password=user.password, email=user.email)
+    user_info = get_user_by_email(user.email)
+    return {
+        'info': {
+            'id': user_info[0],
+            'username': user.username,
+            'email': user.email,
+        }
+    }

messenger_app/api/v1/endpoints/messages/__init__.py

@@ -1,11 +1,17 @@
 from fastapi import APIRouter
 from .send import send
 from .get_conversation import get_conversation
+from .get_conversation_url import get_conversation_url
 from app.models import Message
 
 router = APIRouter()
 
 
+@router.get("/get_conversation_url/{id_user1}/{id_user2}")
+async def get_conversation_url_router(id_user1: str, id_user2: str):
+    return await get_conversation_url(id_user1, id_user2)
+
+
 @router.post("/send")
 async def send_router(message: Message):
     return await send(message)

messenger_app/api/v1/endpoints/messages/get_conversation.py

@@ -1,9 +1,9 @@
 from fastapi import HTTPException, status
-from database.queries.messages import find_conversation
+from database.queries.messages import find_conversation_db
 
 
 async def get_conversation(conversation_url: str):
-    conversation = find_conversation(conversation_url)
+    conversation = find_conversation_db(conversation_url)
     if conversation is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Conversation not found")
     return conversation

messenger_app/api/v1/endpoints/messages/get_conversation_url.py

@@ -0,0 +1,11 @@
+from database.queries.messages import get_conversation_url_db
+from database.queries.user import get_user_by_id
+from fastapi import HTTPException
+
+
+async def get_conversation_url(id_user1: str, id_user2: str):
+    if get_user_by_id(id_user1) is None or get_user_by_id(id_user2) is None:
+        raise HTTPException(status_code=404, detail="Users not in the system.")
+
+    conversation_url = get_conversation_url_db(id_user1, id_user2)
+    return {'conversation_url': conversation_url}

messenger_app/api/v1/endpoints/messages/send.py

@@ -1,17 +1,12 @@
 from fastapi import HTTPException
 from app.models import Message
-from database.queries.messages import create_conversation, send_message_to_mongodb
+from database.queries.messages import send_message_db
 
 
 async def send(message: Message):
-    conversation_url = create_conversation(message.sender, message.receiver)
+    success = send_message_db(message)
 
-    if conversation_url is not None:
-        success = send_message_to_mongodb(conversation_url, message.sender, message.conversation)
-
-        if success:
-            return {"success": True, "message": "Message sent successfully"}
-        raise HTTPException(status_code=500, detail="Internal Server Error")
-
-    raise HTTPException(status_code=500, detail="Error creating conversation")
+    if success:
+        return {"success": True, "message": "Message sent successfully"}
+    raise HTTPException(status_code=500, detail="Internal Server Error")
 

messenger_app/api/v1/endpoints/users/__init__.py

@@ -3,10 +3,16 @@ from app.models import User
 from .create import create_user
 from .update import update_user
 from .delete import delete_user
+from .get_all import get_all_users
 
 router = APIRouter()
 
 
+@router.get("/get_all")
+async def get_all_router():
+    return await get_all_users()
+
+
 @router.post("/create")
 async def create_user_router(user: User):
     return await create_user(user)

messenger_app/api/v1/endpoints/users/get_all.py

@@ -0,0 +1,6 @@
+from database.queries.user import get_all_users_db
+
+
+async def get_all_users():
+    users = get_all_users_db()
+    return users

messenger_app/app/models/message.py

@@ -3,7 +3,7 @@ from datetime import datetime
 
 
 class Message(BaseModel):
-    conversation: str
+    conversation_url: str
+    message: str
     sender: int
-    receiver: int
-    timestamp: datetime
+    message_type: str

messenger_app/database/queries/messages.py

@@ -1,34 +1,25 @@
+from app.models import Message
 from database import postgresql_db_handler, mongo_db_handler
 import uuid
 from datetime import datetime
 
 
-def create_conversation(user1_id, user2_id):
+def create_conversation_db(user1_id, user2_id):
+    current_datetime = datetime.now().strftime("%Y%m%d%H%M%S")
+    unique_id = str(uuid.uuid4()).replace('-', '')
+    conversation_url = f"{current_datetime}_{unique_id}"
+
     query = '''
-    SELECT conversation_url FROM conversations
-    WHERE id_user1 = %s AND id_user2 = %s
+    INSERT INTO conversations (id_user1, id_user2, conversation_url)
+    VALUES (%s, %s, %s)
     '''
-    params = (user1_id, user2_id)
-    existing_conversation = postgresql_db_handler.execute_query(query, params, fetchall=True)
-
-    if existing_conversation:
-        conversation_url = existing_conversation[0][0]
-    else:
-        current_datetime = datetime.now().strftime("%Y%m%d%H%M%S")
-        unique_id = str(uuid.uuid4()).replace('-', '')
-        conversation_url = f"{current_datetime}_{unique_id}"
-
-        query = '''
-        INSERT INTO conversations (id_user1, id_user2, conversation_url)
-        VALUES (%s, %s, %s)
-        '''
-        params = (user1_id, user2_id, conversation_url)
-        postgresql_db_handler.execute_query(query, params)
+    params = (user1_id, user2_id, conversation_url)
+    postgresql_db_handler.execute_query(query, params)
 
     return conversation_url
 
 
-def find_conversation(conversation_url):
+def find_conversation_db(conversation_url):
     collection = mongo_db_handler.get_collection()
     query = {'name': conversation_url}
     result_set = collection.find_one(query)
@@ -38,21 +29,40 @@ def find_conversation(conversation_url):
     return None
 
 
-def send_message_to_mongodb(conversation_url, sender, message):
+def get_conversation_url_db(id_user1, id_user2):
+    query = """
+            SELECT * FROM conversations
+            WHERE
+                (id_user1 = %s AND id_user2 = %s)
+                OR
+                (id_user1 = %s AND id_user2 = %s)
+        """
+    params = (id_user1, id_user2, id_user2, id_user1)
+
+    result = postgresql_db_handler.execute_query(query, params, fetchall=True)
+    if not result:
+        return  create_conversation_db(id_user1, id_user2)
+    else:
+        return result[0][2]
+
+
+def send_message_db(message: Message):
     try:
         collection = mongo_db_handler.get_collection()
-        existing_document = collection.find_one({"name": conversation_url})
+        existing_document = collection.find_one({"name": message.conversation_url})
 
         if existing_document is not None:
-            new_message = {"sender": sender, "message": message, "timestamp": datetime.now()}
+            new_message = {"sender": message.sender, "message": message.message,
+                           "message_type": message.message_type, "timestamp": datetime.now()}
             collection.update_one(
-                {"name": conversation_url},
+                {"name": message.conversation_url},
                 {"$push": {"chat": new_message}}
             )
         else:
             collection.insert_one({
-                "name": conversation_url,
-                "chat": [{"sender": sender, "message": message, "timestamp": datetime.now()}]
+                "name": message.conversation_url,
+                "chat": [{"sender": message.sender, "message": message.message,
+                          "message_type": message.message_type, "timestamp": datetime.now()}]
             })
 
         return True

messenger_app/database/queries/user.py

@@ -54,3 +54,9 @@ def delete_user_db(user_id):
     params = (user_id,)
     postgresql_db_handler.execute_query(query, params)
     print(f"User with ID {user_id} deleted successfully.")
+
+
+def get_all_users_db():
+    query = "SELECT * FROM users;"
+    users = postgresql_db_handler.execute_query(query, fetchall=True)
+    return {"users": users}