Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar into feature/delete-event

Author: efratush

app/database/models.py

@@ -108,3 +108,11 @@ def __repr__(self):
             f'({self.event.owner}'
             f'to {self.recipient})>'
         )
+
+
+class Quote(Base):
+    __tablename__ = "quotes"
+
+    id = Column(Integer, primary_key=True, index=True)
+    text = Column(String, nullable=False)
+    author = Column(String)

app/internal/quotes/daily_quotes.py

@@ -0,0 +1,21 @@
+from datetime import date
+from typing import Optional
+
+from app.database.models import Quote
+
+from sqlalchemy.orm import Session
+from sqlalchemy.sql.expression import func
+
+TOTAL_DAYS = 366
+
+
+def quote_per_day(
+        session: Session, date: date = date.today()
+        ) -> Optional[Quote]:
+    """This function provides a daily quote, relevant to the current
+    day of the year. The quote is randomally selected from a set
+    of quotes matching to the given day"""
+    day_num = date.timetuple().tm_yday
+    quote = session.query(Quote).filter(
+        Quote.id % TOTAL_DAYS == day_num).order_by(func.random()).first()
+    return quote

app/internal/quotes/load_quotes.py

@@ -0,0 +1,41 @@
+import json
+from typing import Dict, List, Optional
+
+from app.database.models import Quote
+
+from sqlalchemy.orm import Session
+
+
+def get_quotes_from_json() -> List[Dict[str, Optional[str]]]:
+    """This function reads all of the daily quotes from a specific JSON file.
+    The JSON file content is copied from the free API:
+    'https://type.fit/api/quotes'. I saved the content so the API won't be
+    called every time the app is initialized."""
+    try:
+        with open('app/resources/quotes.json', 'r') as f:
+            quotes_list = json.load(f)
+    except (IOError, ValueError):
+        return []
+    return quotes_list
+
+
+def add_quotes_to_db(session: Session) -> None:
+    """This function reads the quotes and inserts them into the db"""
+    all_quotes = get_quotes_from_json()
+    quotes_objects = [
+        Quote(text=quote['text'], author=quote['author'])
+        for quote in all_quotes
+        ]
+    session.add_all(quotes_objects)
+    session.commit()
+
+
+def is_quotes_table_empty(session: Session) -> bool:
+    return session.query(Quote).count() == 0
+
+
+def load_daily_quotes(session: Session) -> None:
+    """This function loads the daily quotes to the db,
+    if they weren't already loaden"""
+    if is_quotes_table_empty(session):
+        add_quotes_to_db(session)

app/main.py

@@ -1,11 +1,13 @@
-from fastapi import FastAPI, Request
+from fastapi import Depends, FastAPI, Request
 from fastapi.staticfiles import StaticFiles
+from sqlalchemy.orm import Session
 
 from app.config import PSQL_ENVIRONMENT
 from app.database import models
-from app.database.database import engine
+from app.database.database import engine, get_db
 from app.dependencies import (
     MEDIA_PATH, STATIC_PATH, templates)
+from app.internal.quotes import load_quotes, daily_quotes
 from app.routers import (
     agenda, dayview, email, event, invitation, profile, search, telegram,
     whatsapp
@@ -31,6 +33,8 @@ def create_tables(engine, psql_environment):
 app.mount("/static", StaticFiles(directory=STATIC_PATH), name="static")
 app.mount("/media", StaticFiles(directory=MEDIA_PATH), name="media")
 
+load_quotes.load_daily_quotes(next(get_db()))
+
 # Configure logger
 logger = LoggerCustomizer.make_logger(config.LOG_PATH,
                                       config.LOG_FILENAME,
@@ -40,7 +44,6 @@ def create_tables(engine, psql_environment):
                                       config.LOG_FORMAT)
 app.logger = logger
 
-
 app.include_router(profile.router)
 app.include_router(event.router)
 app.include_router(agenda.router)
@@ -54,10 +57,14 @@ def create_tables(engine, psql_environment):
 telegram_bot.set_webhook()
 
 
+# TODO: I add the quote day to the home page
+# until the relavent calendar view will be developed.
 @app.get("/")
 @app.logger.catch()
-async def home(request: Request):
+async def home(request: Request, db: Session = Depends(get_db)):
+    quote = daily_quotes.quote_per_day(db)
     return templates.TemplateResponse("home.html", {
         "request": request,
         "message": "Hello, World!",
+        "quote": quote
     })