From e571b878bd181f13869a9ceb53b463ff12f6265d Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Tue, 8 Aug 2023 00:24:56 +0300
Subject: [PATCH] Improved poems getting endpoint

---
 back/main.py    | 15 +++++++++------
 back/service.py |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/back/main.py b/back/main.py
index e211fe3..cbd059c 100644
--- a/back/main.py
+++ b/back/main.py
@@ -196,12 +196,15 @@ def add_points(user_id: int):
 # Отправляем стихи
 @app.get("/api/user/poem") # пока не работает
 def poems_to_front(): # db: Annotated[Session, Depends(utils.get_db)] 
-    kolvo_stixov = 109  # пока количество стихотворений = 101
-    rand_id = random.randint(1, kolvo_stixov)  # номер стихотворения
-    poem_json = dict()
-    poem = database.query(models.Poems).filter(models.Poems.id == rand_id).first()
-    poem_json = {"title": poem.title, "text": poem.text, "author":poem.author}
-    return poem_json
+    kolvo_stixov = database.query(models.Poems).count()  # пока количество стихотворений = 101
+    if kolvo_stixov > 1:
+        rand_id = random.randint(1, kolvo_stixov)  # номер стихотворения
+        poem_json = dict()
+        poem = database.query(models.Poems).filter(models.Poems.id == rand_id).first()
+        poem_json = {"title": poem.title, "text": poem.text, "author": poem.author}
+        return poem_json
+    else:
+        raise HTTPException(status_code=404, detail="Poems not found")
 
 @app.get("/api/trashbox", response_model=List[schemas.TrashboxResponse])
 def get_trashboxes(lat:float, lng:float):#крутая функция для работы с api
diff --git a/back/service.py b/back/service.py
index d2bb03a..dbd0972 100644
--- a/back/service.py
+++ b/back/service.py
@@ -31,7 +31,7 @@ def add_poems_to_db(db: Session):
                       author += str1
               if(str1 != f"стих {a+1}\n"):
                   stixi+=str1#удаление /n и заключение в список
-        poem = Poems(title=name, text=stixi, author=author)
+        poem = models.Poems(title=name, text=stixi, author=author)
         # В конце каждой итерации добавляем в базу данных
         db.add(poem)
         db.commit()