app/.env

@@ -1,5 +0,0 @@
-MONGO_HOST = 127.0.0.1
-MONGO_PORT = 27017
-
-MONGO_USER = user
-MONGO_PASS = pass

app/main.py

@@ -1,26 +1,30 @@
 import uvicorn
 import asyncio
 
+from fastapi import FastAPI, Depends, Response, status
+
 from schemas.api_schemas import *
 from schemas.base_schemas import *
 from mongo_worker import MongoWorker
 from tools.base_moderation import moderate_text
 
-from fastapi import FastAPI, Depends, Response, status
 
-
-app: FastAPI = FastAPI()
+app: FastAPI = FastAPI(title="This OR That",
+                    summary="OpenAPI schema for \"This OR That\" project!",
+                    version="0.1",
+                    contact={"GitHub": "https://github.com/IgorVolochay/thisORthat"})
+mongo_worker = MongoWorker()
 
 @app.get("/check_user", status_code=200)
 async def check_user(user_id: NonNegativeInt,
-                     mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                     mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     result = mongo.check_user(user_id)
     return BaseResponse(result=result)
 
 @app.get("/get_user", status_code=200)
 async def get_user(user_id: NonNegativeInt,
                    response: Response,
-                   mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                   mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     if mongo.check_user(user_id):
         result = mongo.get_user(user_id)
         return BaseResponse(result=result)
@@ -31,7 +35,7 @@ async def get_user(user_id: NonNegativeInt,
 @app.post("/add_user", status_code=201)
 async def add_user(new_user: AddUserBody,
                    response: Response,
-                   mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                   mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     if not mongo.check_user(new_user.user_id):
         result = mongo.add_user(new_user.user_id,
                                 new_user.username,
@@ -47,7 +51,7 @@ async def add_user(new_user: AddUserBody,
 @app.get("/get_card", status_code=200)
 async def get_card(card_id: NonNegativeInt,
                    response: Response,
-                   mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                   mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     card = mongo.get_card(card_id)
     if card:
         return BaseResponse(result=card)
@@ -58,12 +62,12 @@ async def get_card(card_id: NonNegativeInt,
 @app.get("/get_random_cards", status_code=200)
 async def get_random_cards(user_id: NonNegativeInt,
                            response: Response,
-                           mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                           mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     cards_visited = mongo.get_visited_cards(user_id)
 
-    if cards_visited.result == "User doesn't exist":
+    if cards_visited.error:
         response.status_code = status.HTTP_401_UNAUTHORIZED
-        return BaseResponse(result="User doesn't exist", error=True)
+        return cards_visited
     elif not cards_visited.result.cards_visited:
         random_cards = mongo.get_random_cards(10, True)
         if random_cards:
@@ -71,31 +75,32 @@ async def get_random_cards(user_id: NonNegativeInt,
         else:
             response.status_code = status.HTTP_404_NOT_FOUND
             return BaseResponse(result="No active cards", error=True)
-    else:
-        result: list[Card] = list()
-        trys = 3
-        while len(result) < 10 and trys != 0:
-            random_cards = mongo.get_random_cards(10, True)
-            if not random_cards:
-                response.status_code = status.HTTP_404_NOT_FOUND
-                return BaseResponse(result="No active cards", error=True)
-            filtered_cards, filtered_cards_id = mongo.filter_cards(random_cards, cards_visited.result.cards_visited)
-            trys -= 1
-            if not filtered_cards:
-                continue
-            else:
-                result.extend(filtered_cards)
-                cards_visited.result.cards_visited.update(filtered_cards_id)
-        if not result:
+    
+    result: list[Card] = list()
+    trys = 3
+    while len(result) < 10 and trys != 0:
+        random_cards = mongo.get_random_cards(10, True)
+        if not random_cards:
             response.status_code = status.HTTP_404_NOT_FOUND
-            return BaseResponse(result="No active cards fo this user", error=True)
+            return BaseResponse(result="No active cards", error=True)
+        filtered_cards, filtered_cards_id = mongo.filter_cards(random_cards, cards_visited.result.cards_visited)
+        trys -= 1
+        if not filtered_cards:
+            continue
         else:
-            return BaseResponse(result=result)
+            result.extend(filtered_cards)
+            cards_visited.result.cards_visited.update(filtered_cards_id)
+
+    if not result:
+        response.status_code = status.HTTP_404_NOT_FOUND
+        return BaseResponse(result="No active cards fo this user", error=True)
+    else:
+        return BaseResponse(result=result)
     
 @app.post("/add_card", status_code=201)
 async def add_card(new_card: AddCardBody,
                    response: Response,
-                   mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                   mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     if moderate_text(new_card.choice_A) and moderate_text(new_card.choice_B):
         card = mongo.add_card_by_api(new_card.choice_A,
                                      new_card.choice_B,
@@ -109,7 +114,7 @@ async def add_card(new_card: AddCardBody,
 @app.patch("/select_choice", status_code=200)
 async def select_choice(choice_data: SelectChoice,
                         response: Response,
-                        mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                        mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     check_visited = mongo.get_visited_cards(choice_data.user_id)
     if check_visited.error:
         response.status_code = status.HTTP_404_NOT_FOUND
@@ -129,7 +134,7 @@ async def select_choice(choice_data: SelectChoice,
 @app.patch("/like_card", status_code=200)
 async def like_card(like_data: ReactionCard,
                     response: Response,
-                    mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                    mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     result = mongo.like_card(like_data.card_id, like_data.user_id)
     if not result.error and result.result:
         return BaseResponse(result="Added like to card")
@@ -140,7 +145,7 @@ async def like_card(like_data: ReactionCard,
 @app.patch("/dislike_card", status_code=200)
 async def dislike_card(dislike_data: ReactionCard,
                     response: Response,
-                    mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                    mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     result = mongo.dislike_card(dislike_data.card_id, dislike_data.user_id)
     if not result.error and result.result:
         return BaseResponse(result="Added dislike to card")
@@ -151,7 +156,7 @@ async def dislike_card(dislike_data: ReactionCard,
 @app.post("/comment", status_code=201)
 async def comment(comment_info: AddCommentBody,
                   response: Response,
-                  mongo: MongoWorker = Depends(MongoWorker)) -> BaseResponse:
+                  mongo: MongoWorker = Depends(lambda: mongo_worker)) -> BaseResponse:
     if not moderate_text(comment_info.comment_text):
         response.status_code = status.HTTP_400_BAD_REQUEST
         return BaseResponse(result="Comment has not passed base moderation", error=True)

app/mongo_worker.py

@@ -2,12 +2,12 @@ import os
 
 import pymongo
 
-from schemas.base_schemas import *
-from schemas.api_schemas import *
-from typing import Optional
-
 from datetime import datetime
 from dotenv import load_dotenv
+from typing import Optional
+
+from schemas.base_schemas import *
+from schemas.api_schemas import *
 
 
 class MongoWorker:
@@ -96,7 +96,7 @@ class MongoWorker:
             print(exception)
             return new_card
         
-    def add_card_by_base_model(self, new_card: Card) -> Card:
+    def add_card_by_base_model(self, new_card: Card) -> Optional[Card]:
         new_card.card_id = self.get_and_update_counter(counter_name="card")
         try:
             self.game_data.insert_one(new_card.model_dump())
@@ -211,19 +211,4 @@ class MongoWorker:
             else:
                 return BaseResponse(result="Card doesn't exist", error=True)
         else:
-            return BaseResponse(result="User doesn't exist", error=True)
-
-
-if __name__ == "__main__":
-    mongo = MongoWorker()
-    #print(mongo.check_user(123))
-    #print(mongo.add_user(123, "VolochayIgor", "Igor", "Volochay", "photo_0.jpg"))
-    #print(mongo.get_user(123))
-    #print(mongo.add_card("A", "B", 123))
-    #print(mongo.get_random_cards(10, active_status=False))
-    #print(mongo.update_counter("cards_counter"))
-    #print(mongo.select_choice(1, "A"))
-    #print(mongo.like_card(1, 455412573))
-    #print(mongo.dislike_card(1, 455412573))
-    print(mongo.update_visited_cards(123, 2))
-    print(mongo.get_visited_cards(123).result.cards_visited)
+            return BaseResponse(result="User doesn't exist", error=True)