api done

messenger_app/api/v1/database/postgres_database.py

@@ -1,38 +0,0 @@
-import psycopg2
-
-DATABASE_CONFIG = {
-    'dbname': 'messenger',
-    'user': 'andrei_cerbu',
-    'password': 'andrei',
-    'host': 'localhost',
-    'port': '5432'
-}
-
-
-def create_connection():
-    try:
-        connection = psycopg2.connect(**DATABASE_CONFIG)
-        return connection
-    except psycopg2.Error as e:
-        print(f"Error: Unable to connect to the database\n{e}")
-        return None
-
-
-def execute_query(connection, query, params=None, fetchall=False):
-    try:
-        with connection.cursor() as cursor:
-            cursor.execute(query, params)
-            if fetchall:
-                result = cursor.fetchall()
-                return result
-            else:
-                connection.commit()  # Commit the transaction for INSERT, UPDATE, DELETE queries
-    except psycopg2.Error as e:
-        print(f"Error: Unable to execute the query\n{e}")
-        return None
-
-
-def close_connection(connection):
-    if connection:
-        connection.close()
-        print("Connection closed.")

messenger_app/api/v1/database/user_queries.py

@@ -1,81 +0,0 @@
-from api.v1.database.postgres_database import create_connection, execute_query, close_connection
-
-
-def get_user_by_id(user_id):
-    connection = create_connection()
-    if connection:
-        try:
-            query = """
-            SELECT * FROM users WHERE id = %s;
-            """
-            params = (user_id,)
-            result = execute_query(connection, query, params, fetchall=True)
-            if result:
-                user_data = result[0]
-                return user_data
-            else:
-                return None
-        finally:
-            close_connection(connection)
-
-
-def get_user_by_email(email):
-    connection = create_connection()
-    if connection:
-        try:
-            query = """
-            SELECT * FROM users WHERE email = %s;
-            """
-            params = (email,)
-            result = execute_query(connection, query, params, fetchall=True)
-            if result:
-                user_data = result[0]
-                return user_data
-            else:
-                return None
-        finally:
-            close_connection(connection)
-
-
-def create_user_db(username, password, email):
-    connection = create_connection()
-    if connection:
-        try:
-            query = """
-            INSERT INTO users (username, password, email)
-            VALUES (%s, %s, %s);
-            """
-            params = (username, password, email)
-            execute_query(connection, query, params)
-        finally:
-            close_connection(connection)
-
-
-def update_user_db(user_id, new_username, new_password, new_email):
-    connection = create_connection()
-    if connection:
-        try:
-            query = """
-            UPDATE users
-            SET username = %s, password = %s, email = %s
-            WHERE id = %s;
-            """
-            params = (new_username, new_password, new_email, user_id)
-            execute_query(connection, query, params)
-            print(f"User with ID {user_id} updated successfully.")
-        finally:
-            close_connection(connection)
-
-
-def delete_user_db(user_id):
-    connection = create_connection()
-    if connection:
-        try:
-            query = """
-            DELETE FROM users WHERE id = %s;
-            """
-            params = (user_id,)
-            execute_query(connection, query, params)
-            print(f"User with ID {user_id} deleted successfully.")
-        finally:
-            close_connection(connection)

messenger_app/api/v1/dependencies/security.py

@@ -1,11 +0,0 @@
-import bcrypt
-
-
-def hash_password(password):
-    salt = bcrypt.gensalt()
-    hashed_password = bcrypt.hashpw(password.encode('utf-8'), salt)
-    return hashed_password
-
-
-def verify_password(password, hashed_password):
-    return bcrypt.checkpw(password.encode('utf-8'), hashed_password)

messenger_app/api/v1/endpoints/__init__.py

@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()

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

@@ -0,0 +1 @@
+from app.models.login import Login

messenger_app/api/v1/endpoints/messages.py

@@ -1,9 +0,0 @@
-from fastapi import APIRouter
-from api.v1.models.message import Message
-router = APIRouter()
-
-
-@router.post("/messages/", response_model=Message)
-async def create_message(message: Message):
-    # You would typically save the message to the database here
-    return message

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

@@ -0,0 +1,19 @@
+from fastapi import APIRouter
+from .send import send
+from .get_conversation import get_conversation
+from app.models import Message
+
+router = APIRouter()
+
+
+@router.post("/send")
+async def send_router(message: Message):
+    return await send(message)
+
+
+@router.get("/get_conversation/{conversation_url}")
+async def get_conversation_router(conversation_url: str):
+    return await get_conversation(conversation_url)
+
+
+__all__ = ["router"]

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

@@ -0,0 +1,9 @@
+from fastapi import HTTPException, status
+from database.queries.messages import find_conversation
+
+
+async def get_conversation(conversation_url: str):
+    conversation = find_conversation(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/send.py

@@ -0,0 +1,17 @@
+from fastapi import HTTPException
+from app.models import Message
+from database.queries.messages import create_conversation, send_message_to_mongodb
+
+
+async def send(message: Message):
+    conversation_url = create_conversation(message.sender, message.receiver)
+
+    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")
+

messenger_app/api/v1/endpoints/users.py

@@ -1,45 +0,0 @@
-from fastapi import APIRouter, HTTPException
-from api.v1.models.user import User
-from api.v1.database.user_queries import get_user_by_email, get_user_by_id
-from api.v1.database.user_queries import create_user_db, update_user_db, delete_user_db
-from api.v1.dependencies.security import hash_password
-
-router = APIRouter()
-
-
-@router.post("/users")
-async def create_user(user: User):
-    result = get_user_by_email(user.email)
-    if result:
-        raise HTTPException(status_code=409, detail='User already exists')
-
-    create_user_db(username=user.username, password=hash_password(user.password), email=user.email)
-    created_user = get_user_by_email(user.email)
-    created_user_dict = {
-        "id": created_user[0],
-        "username": created_user[1],
-        "password": created_user[2],
-        "email": created_user[3],
-    }
-
-    return {'status': 'successful', 'user': created_user_dict}
-
-
-@router.put("/users")
-async def update_user(new_info: User):
-    old_info = get_user_by_id(new_info.id)
-    if old_info is None:
-        raise HTTPException(status_code=404, detail='User not found')
-    update_user_db(user_id=new_info.id, new_email=new_info.email,
-                   new_username=new_info.username, new_password=hash_password(new_info.password))
-
-
-@router.delete("/users")
-async def delete_user(user_id: int):
-    user = get_user_by_id(user_id)
-    if user is None:
-        raise HTTPException(status_code=404, detail='User not found')
-    delete_user_db(user_id)
-
-
-

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

@@ -0,0 +1,26 @@
+from fastapi import APIRouter
+from app.models import User
+from .create import create_user
+from .update import update_user
+from .delete import delete_user
+
+router = APIRouter()
+
+
+@router.post("/create")
+async def create_user_router(user: User):
+    return await create_user(user)
+
+
+@router.put("/update")
+async def update_user_router(user: User):
+    return await update_user(user)
+
+
+@router.delete("/delete")
+async def delete_user_router(user_id: int):
+    return await delete_user(user_id)
+
+
+# Make the router accessible from outside the package
+__all__ = ["router"]

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

@@ -0,0 +1,20 @@
+from fastapi import HTTPException
+from app.models.user import User
+from database.queries.user import get_user_by_email, create_user_db
+
+
+async def create_user(user: User):
+    result = get_user_by_email(user.email)
+    if result:
+        raise HTTPException(status_code=409, detail='User already exists')
+
+    create_user_db(username=user.username, password=user.password, email=user.email)
+    created_user = get_user_by_email(user.email)
+    created_user_dict = {
+        "id": created_user[0],
+        "username": created_user[1],
+        "password": created_user[2],
+        "email": created_user[3],
+    }
+
+    return {'user': created_user_dict}

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

@@ -0,0 +1,10 @@
+from fastapi import HTTPException
+from database.queries.user import get_user_by_id, delete_user_db
+
+
+async def delete_user(user_id: int):
+    user = get_user_by_id(user_id)
+    if user is None:
+        raise HTTPException(status_code=404, detail='User not found')
+    delete_user_db(user_id)
+

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

@@ -0,0 +1,11 @@
+from fastapi import HTTPException
+from app.models.user import User
+from database.queries.user import get_user_by_id, update_user_db
+
+
+async def update_user(new_info: User):
+    old_info = get_user_by_id(new_info.id)
+    if old_info is None:
+        raise HTTPException(status_code=404, detail='User Not Found')
+    update_user_db(user_id=new_info.id, new_email=new_info.email,
+                   new_username=new_info.username, new_password=new_info.password)

messenger_app/api/v1/models/message.py

@@ -1,9 +0,0 @@
-from pydantic import BaseModel
-from datetime import datetime
-
-
-class Message(BaseModel):
-    text: str
-    sender_id: int
-    receiver_id: int
-    timestamp: datetime

messenger_app/api/v1/models/user.py

@@ -1,8 +0,0 @@
-from pydantic import BaseModel
-
-
-class User(BaseModel):
-    id: int
-    username: str
-    password: str
-    email: str