From c5f1d4bf9c061aed6deaa5784efa4aacb06e6529 Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Thu, 10 Feb 2022 17:16:37 +0100
Subject: [PATCH 01/11] implemented rating router

---
 app/main.py                             | 2 ++
 app/templates/rating/rating.html        | 0
 app/templates/rating/rating_navbar.html | 0
 app/views/rating.py                     | 8 ++++++++
 4 files changed, 10 insertions(+)
 create mode 100644 app/templates/rating/rating.html
 create mode 100644 app/templates/rating/rating_navbar.html
 create mode 100644 app/views/rating.py

diff --git a/app/main.py b/app/main.py
index e196acf..ba49463 100644
--- a/app/main.py
+++ b/app/main.py
@@ -20,6 +20,7 @@
 from views import index
 from views import restaurant
 from views import signin
+from views import rating
 
 app = fastapi.FastAPI()
 
@@ -67,6 +68,7 @@ def configure_routing():
     app.include_router(restaurant.router)
     app.include_router(signin.router)
     app.include_router(error.router)
+    app.include_router(rating.router)
 
 
 def configure_database():
diff --git a/app/templates/rating/rating.html b/app/templates/rating/rating.html
new file mode 100644
index 0000000..e69de29
diff --git a/app/templates/rating/rating_navbar.html b/app/templates/rating/rating_navbar.html
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/rating.py b/app/views/rating.py
new file mode 100644
index 0000000..ebe4465
--- /dev/null
+++ b/app/views/rating.py
@@ -0,0 +1,8 @@
+import fastapi
+from fastapi.responses import HTMLResponse
+from starlette.requests import Request
+from starlette.templating import Jinja2Templates
+
+templates = Jinja2Templates("templates")
+router = fastapi.APIRouter()
+

From c3f0984839f64d6489ebdb5d6191f23cb791c356 Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Thu, 10 Feb 2022 17:26:08 +0100
Subject: [PATCH 02/11] defined route

---
 app/views/rating.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/views/rating.py b/app/views/rating.py
index ebe4465..ff4387e 100644
--- a/app/views/rating.py
+++ b/app/views/rating.py
@@ -1,8 +1,15 @@
 import fastapi
+from fastapi import Depends
 from fastapi.responses import HTMLResponse
 from starlette.requests import Request
 from starlette.templating import Jinja2Templates
+from db.database import get_db
+from sqlalchemy.orm import Session
 
 templates = Jinja2Templates("templates")
 router = fastapi.APIRouter()
 
+@router.get("/rating", response_class=HTMLResponse)
+async def rating(
+    db_session: Session = Depends(get_db)
+):

From 9990ed0ad113a9391ceece0d34aac2b7c4034682 Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Fri, 11 Feb 2022 08:44:42 +0100
Subject: [PATCH 03/11] added link to ratings to main_navbar

---
 app/templates/main_navbar.html |  2 +-
 app/views/rating.py            | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/templates/main_navbar.html b/app/templates/main_navbar.html
index 17d63b7..b3064b7 100644
--- a/app/templates/main_navbar.html
+++ b/app/templates/main_navbar.html
@@ -1,7 +1,7 @@
 <div class="row justify-content-center">
     <div class="col-10" style="max-width: 480px;">
         <nav class="navbar navbar-light bg-white justify-content-between my-2">
-            <a class="navbar-brand" href="#" style="margin-right:0rem;">
+            <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
                 <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
             </a>
             <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
diff --git a/app/views/rating.py b/app/views/rating.py
index ff4387e..e612f6c 100644
--- a/app/views/rating.py
+++ b/app/views/rating.py
@@ -5,11 +5,21 @@
 from starlette.templating import Jinja2Templates
 from db.database import get_db
 from sqlalchemy.orm import Session
+from tools.security import get_current_user
+from schemes.scheme_user import User
+from services import service_res
 
 templates = Jinja2Templates("templates")
 router = fastapi.APIRouter()
 
+
 @router.get("/rating", response_class=HTMLResponse)
 async def rating(
-    db_session: Session = Depends(get_db)
+    request: Request,
+    db_session: Session = Depends(get_db),
+    current_user: User = Depends(get_current_user)
 ):
+    rest_ratings = service_res.get_assessments_from_user(db_session=db_session, user=current_user)
+    return templates.TemplateResponse(
+        "rating/rating.html", {"request": request, "rest_ratings":rest_ratings}
+    )

From 41a8843f9f341098eb8ad9d4523a281ff3709786 Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Fri, 11 Feb 2022 10:50:27 +0100
Subject: [PATCH 04/11] implemented rating navbar, implemented loop over rating
 list

---
 app/templates/rating/rating.html        | 37 +++++++++++++++++++++++++
 app/templates/rating/rating_navbar.html | 13 +++++++++
 app/views/rating.py                     |  1 +
 3 files changed, 51 insertions(+)

diff --git a/app/templates/rating/rating.html b/app/templates/rating/rating.html
index e69de29..6ea909d 100644
--- a/app/templates/rating/rating.html
+++ b/app/templates/rating/rating.html
@@ -0,0 +1,37 @@
+{% extends "shared/layout.html" %} {% block content %} {% include "rating/rating_navbar.html" %}
+<div class="row justify-content-center">
+    <div class="col-10" style="max-width: 480px;">
+        <h1>Bewertungen</h1>
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-10  mb-2" style="max-width: 480px;">
+        {% for rating in rest_ratings %}
+        <button type="button" class="btn btn-dark btn-sm w-100 mb-2 d-flex justify-content-between">
+            <span>Restaurant xy</span>
+            <span class="d-flex justify-content-end">
+                <span>{{rating.rating}}/5 &nbsp;</span>
+                <span class="border-left border-white">| &gt;</span>
+            </span>
+        </button>
+        <!-- Modal -->
+        <div class="modal fade modal-sm modal-lg center" id="{{rating.}}" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="staticBackdropLabel">Bewertung ändern</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Speichern</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/rating/rating_navbar.html b/app/templates/rating/rating_navbar.html
index e69de29..d95ece6 100644
--- a/app/templates/rating/rating_navbar.html
+++ b/app/templates/rating/rating_navbar.html
@@ -0,0 +1,13 @@
+<div class="row justify-content-center">
+    <div class="col-10" style="max-width: 480px;">
+        <nav class="navbar navbar-light bg-white justify-content-between my-2">
+            <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
+                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
+            </a>
+            <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
+            <a class="navbar-brand" href="/main" style="margin-right:0rem;">
+                <img src="/static/img/icons8-home-192.png" width="30" height="30" alt="Home">
+            </a>
+        </nav>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/views/rating.py b/app/views/rating.py
index e612f6c..89d2434 100644
--- a/app/views/rating.py
+++ b/app/views/rating.py
@@ -20,6 +20,7 @@ async def rating(
     current_user: User = Depends(get_current_user)
 ):
     rest_ratings = service_res.get_assessments_from_user(db_session=db_session, user=current_user)
+
     return templates.TemplateResponse(
         "rating/rating.html", {"request": request, "rest_ratings":rest_ratings}
     )

From e06ace6663262501b0cb01e1160731996684ff48 Mon Sep 17 00:00:00 2001
From: Florian Glaser <58706771+Floskinner@users.noreply.github.com>
Date: Fri, 11 Feb 2022 10:56:49 +0100
Subject: [PATCH 05/11] More assessments (#53)

* added more values for RestBewertungReturn

* also save the name of the restaurant
---
 app/db/crud/restaurant.py   |  4 ++--
 app/db/models/restaurant.py |  1 +
 app/schemes/scheme_rest.py  | 10 ++++++++++
 app/services/service_res.py | 22 ++++++++++++++++++----
 app/tests/test_db.py        | 26 ++++++++++++++++----------
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/app/db/crud/restaurant.py b/app/db/crud/restaurant.py
index 3508735..c506411 100644
--- a/app/db/crud/restaurant.py
+++ b/app/db/crud/restaurant.py
@@ -37,7 +37,7 @@ def get_all_restaurants(db: Session, skip: int = 0, limit: int = 100) -> List[Re
     return db.query(Restaurant).offset(skip).limit(limit).all()
 
 
-def create_restaurant(db: Session, rest: scheme_rest.RestaurantBase) -> Restaurant:
+def create_restaurant(db: Session, rest: scheme_rest.RestaurantCreate) -> Restaurant:
     """Create / Add a Restaurant to the DB
 
     Args:
@@ -51,7 +51,7 @@ def create_restaurant(db: Session, rest: scheme_rest.RestaurantBase) -> Restaura
         Restaurant: Return if success
     """
     try:
-        db_rest = Restaurant(place_id=rest.place_id)
+        db_rest = Restaurant(place_id=rest.place_id, name=rest.name)
         db.add(db_rest)
         db.commit()
         db.refresh(db_rest)
diff --git a/app/db/models/restaurant.py b/app/db/models/restaurant.py
index 27f92e7..f379500 100644
--- a/app/db/models/restaurant.py
+++ b/app/db/models/restaurant.py
@@ -12,5 +12,6 @@ class Restaurant(Base):
     __tablename__ = "restaurant"
 
     place_id = Column(String, primary_key=True)
+    name = Column(String, nullable=False, autoincrement=False)
 
     bewertungen = relationship("Bewertung", back_populates="restaurant", passive_deletes=True)
diff --git a/app/schemes/scheme_rest.py b/app/schemes/scheme_rest.py
index dd795d3..ba6e5fe 100644
--- a/app/schemes/scheme_rest.py
+++ b/app/schemes/scheme_rest.py
@@ -30,6 +30,13 @@ class RestaurantBase(BaseModel):
     """Scheme that is only needed for the DB"""
 
     place_id: str
+    name: str
+
+
+class RestaurantCreate(RestaurantBase):
+    """Scheme that is only needed for the DB"""
+
+    name: str
 
     class Config:
         orm_mode = True
@@ -50,6 +57,7 @@ class Restaurant(RestaurantBase):
 class RestBewertungBase(BaseModel):
     """BaseClass for the Bewertung"""
 
+    name: str
     comment: Optional[str] = ""
     rating: Optional[float] = 0
 
@@ -64,6 +72,8 @@ class RestBewertungCreate(RestBewertungBase):
 class RestBewertungReturn(RestBewertungBase):
     """Class to return to the frontend"""
 
+    email: str
+    place_id: str
     timestamp: datetime.datetime
 
     class Config:
diff --git a/app/services/service_res.py b/app/services/service_res.py
index 0641ec2..bd8c971 100644
--- a/app/services/service_res.py
+++ b/app/services/service_res.py
@@ -4,7 +4,6 @@
 from typing import Union
 
 import httpx
-import sqlalchemy
 from sqlalchemy.orm import Session
 
 from db.crud import bewertung as crud_bewertung
@@ -37,7 +36,14 @@ def get_assessments_from_user(db_session: Session, user: UserBase) -> Union[List
     """
     db_rests = crud_bewertung.get_all_user_bewertungen(db_session, user)
     scheme_rests = [
-        RestBewertungReturn(comment=db_rest.kommentar, rating=db_rest.rating, timestamp=db_rest.zeitstempel)
+        RestBewertungReturn(
+            name=db_rest.name,
+            email=db_rest.person_email,
+            place_id=db_rest.place_id,
+            comment=db_rest.kommentar,
+            rating=db_rest.rating,
+            timestamp=db_rest.zeitstempel,
+        )
         for db_rest in db_rests
     ]
     return scheme_rests
@@ -59,6 +65,9 @@ def add_assessment(db_session: Session, assessment: RestBewertungCreate) -> Rest
     try:
         created_assessment = crud_bewertung.create_bewertung(db_session, assessment)
         return RestBewertungReturn(
+            name=created_assessment.restaurant.name,
+            email=created_assessment.person_email,
+            place_id=created_assessment.place_id,
             comment=created_assessment.kommentar,
             rating=created_assessment.rating,
             timestamp=created_assessment.zeitstempel,
@@ -88,7 +97,12 @@ def update_assessment(
     except DatabaseException as error:
         raise error
     return RestBewertungReturn(
-        comment=updated_assessment.kommentar, rating=updated_assessment.rating, timestamp=updated_assessment.zeitstempel
+        name=updated_assessment.restaurant.name,
+        email=updated_assessment.person_email,
+        place_id=updated_assessment.place_id,
+        comment=updated_assessment.kommentar,
+        rating=updated_assessment.rating,
+        timestamp=updated_assessment.zeitstempel,
     )
 
 
@@ -205,7 +219,7 @@ def search_for_restaurant(db_session: Session, user: UserBase, user_f: FilterRes
     if not crud_restaurant.get_restaurant_by_id(db_session, restaurant.place_id):
         crud_restaurant.create_restaurant(db_session, restaurant)
     if not crud_bewertung.get_bewertung_from_user_to_rest(db_session, user, restaurant):
-        add_assessment(db_session, RestBewertungCreate(person=user, restaurant=restaurant))
+        add_assessment(db_session, RestBewertungCreate(name=restaurant.name, person=user, restaurant=restaurant))
     return restaurant
 
 
diff --git a/app/tests/test_db.py b/app/tests/test_db.py
index c102e4e..ebc9980 100644
--- a/app/tests/test_db.py
+++ b/app/tests/test_db.py
@@ -70,12 +70,12 @@ def test_restaurant(db_session: SessionTesting):
 
     # Add two Restaurants
     # add the first restaurant
-    rest_add = scheme_rest.RestaurantBase(place_id="1234")
+    rest_add = scheme_rest.RestaurantBase(place_id="1234", name="Rest 1 nice")
     rest_return = create_restaurant(db_session, rest_add)
     assert rest_add == scheme_rest.RestaurantBase(**rest_return.__dict__)
 
     # add the second restaurant
-    rest_add_2 = scheme_rest.RestaurantBase(place_id="567")
+    rest_add_2 = scheme_rest.RestaurantBase(place_id="567", name="Rest 2 nice")
     rest_return = create_restaurant(db_session, rest_add_2)
     assert rest_add_2 == scheme_rest.RestaurantBase(**rest_return.__dict__)
 
@@ -140,11 +140,11 @@ def test_user(db_session: SessionTesting):
 
 def test_bewertung(db_session: SessionTesting):
     fake_user = scheme_user.UserBase(email="fake@nope.ok")
-    fake_rest = scheme_rest.RestaurantBase(place_id="000000")
+    fake_rest = scheme_rest.RestaurantBase(place_id="000000", name="Fake Rest")
     user_add_1 = scheme_user.UserCreate(email="test1@demo.lol", password="password1")
     user_add_2 = scheme_user.UserCreate(email="test2@demo.lol", password="password2")
-    rest_add_1 = scheme_rest.RestaurantBase(place_id="1234")
-    rest_add_2 = scheme_rest.RestaurantBase(place_id="5678")
+    rest_add_1 = scheme_rest.RestaurantBase(place_id="1234", name="Rest 1")
+    rest_add_2 = scheme_rest.RestaurantBase(place_id="5678", name="Rest 2")
 
     # Add user
     create_user(db_session, user_add_1)
@@ -156,7 +156,7 @@ def test_bewertung(db_session: SessionTesting):
 
     # Add assessment to user1 and rest1
     assessment_add_1_1 = scheme_rest.RestBewertungCreate(
-        comment="This is a comment", rating=1.5, person=user_add_1, restaurant=rest_add_1
+        name="Rest 1 1", comment="This is a comment", rating=1.5, person=user_add_1, restaurant=rest_add_1
     )
     assessment_ret = create_bewertung(db_session, assessment_add_1_1)
     assert assessment_ret.kommentar == assessment_add_1_1.comment
@@ -165,7 +165,7 @@ def test_bewertung(db_session: SessionTesting):
 
     # Add assessment to user1 and rest2
     assessment_add_1_2 = scheme_rest.RestBewertungCreate(
-        comment="This is a comment for rest 2", rating=2.5, person=user_add_1, restaurant=rest_add_2
+        name="Rest 1 2", comment="This is a comment for rest 2", rating=2.5, person=user_add_1, restaurant=rest_add_2
     )
     assessment_ret = create_bewertung(db_session, assessment_add_1_2)
     assert assessment_ret.kommentar == assessment_add_1_2.comment
@@ -174,7 +174,7 @@ def test_bewertung(db_session: SessionTesting):
 
     # Add assessment to user2 and rest2
     assessment_add_2_2 = scheme_rest.RestBewertungCreate(
-        comment="This is a comment 2", rating=3.5, person=user_add_2, restaurant=rest_add_2
+        name="Rest 2 2", comment="This is a comment 2", rating=3.5, person=user_add_2, restaurant=rest_add_2
     )
     assessment_ret = create_bewertung(db_session, assessment_add_2_2)
     assert assessment_ret.kommentar == assessment_add_2_2.comment
@@ -218,14 +218,20 @@ def test_bewertung(db_session: SessionTesting):
     with pytest.raises(UserNotFound):
         assessment_ret = create_bewertung(
             db_session,
-            scheme_rest.RestBewertungCreate(comment="none", rating=0, person=fake_user, restaurant=rest_add_1),
+            scheme_rest.RestBewertungCreate(
+                name="Troll", comment="none", rating=0, person=fake_user, restaurant=rest_add_1
+            ),
         )
 
     with pytest.raises(RestaurantNotFound):
         assessment_ret = create_bewertung(
             db_session,
             scheme_rest.RestBewertungCreate(
-                comment="none", rating=0, person=scheme_user.UserBase(email=user_add_1.email), restaurant=fake_rest
+                name="Nice",
+                comment="none",
+                rating=0,
+                person=scheme_user.UserBase(email=user_add_1.email),
+                restaurant=fake_rest,
             ),
         )
 

From 3658f4c60ce1eeb5fbee3a9df074430c1c6502fa Mon Sep 17 00:00:00 2001
From: baldur <baldur@siegels.us>
Date: Fri, 11 Feb 2022 13:55:32 +0100
Subject: [PATCH 06/11] Redesigned main.html

---
 app/static/css/style.css                      |  57 ++++++++++++++++++
 app/static/img/icons8-filter-large.png        | Bin 0 -> 4642 bytes
 .../img/icons8-plate-and-utensils-large.png   | Bin 0 -> 14289 bytes
 app/static/img/icons8-recipe-book-large.png   | Bin 0 -> 8154 bytes
 app/templates/main.html                       |  36 ++++++++---
 app/templates/main_navbar.html                |   4 +-
 6 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 app/static/img/icons8-filter-large.png
 create mode 100644 app/static/img/icons8-plate-and-utensils-large.png
 create mode 100644 app/static/img/icons8-recipe-book-large.png

diff --git a/app/static/css/style.css b/app/static/css/style.css
index eed3bce..a3bd9be 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -18,4 +18,61 @@
     left: 50%;
     top: 50%;
     transform: translate(-50%, -50%);
+}
+
+.drop-shadow {
+    filter: drop-shadow(0 4px 4px rgba(0,0,0,0.25));
+}
+.box-shadow {
+    transition: box-shadow 0.2s;
+    box-shadow: 4px 4px 8px rgba(0,0,0,0.35);
+}
+.box-shadow:hover {
+    box-shadow: 0 0 0 #fff;
+}
+.box-shadow:active {
+    box-shadow: 0 0 0 #fff;
+}
+
+.drop-shadow-reveal {
+    transition: filter 0.4s;
+    filter: none;
+}
+.drop-shadow-reveal:hover {
+    filter: drop-shadow(0 4px 4px rgba(0,0,0,0.25));
+}
+
+.prevent-dark-fill:hover {
+    background-color: #fff !important;
+    color: #212529;
+}
+.prevent-dark-fill:active {
+    /*background-color: #6EB1DF !important;*/
+    background-color: #a8cfe9 !important;
+    border-color: #6eb1df !important;
+    color: #212529;
+}
+
+.limit-width {
+    max-width: 480px;
+}
+
+
+.img-display {
+    height: calc(1.625rem + 4.5vh);
+    width: auto;
+}
+.img-display svg {
+    height: calc(1.625rem + 4.5vh);
+    width: auto;
+}
+@media screen and (min-width: 768px) {
+    .img-display {
+        height: 5rem;
+        width: auto;
+    }
+    .img-display svg {
+        height: 5rem;
+        width: auto;
+    }
 }
\ No newline at end of file
diff --git a/app/static/img/icons8-filter-large.png b/app/static/img/icons8-filter-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..b39c88fb57ca55489092da9a5632a9968424c936
GIT binary patch
literal 4642
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
JrO}y?{U7RDE?58n

literal 0
HcmV?d00001

diff --git a/app/static/img/icons8-plate-and-utensils-large.png b/app/static/img/icons8-plate-and-utensils-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..bba52da9eec505eadd9ab01ffbad4a34e13a71b0
GIT binary patch
literal 14289
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

literal 0
HcmV?d00001

diff --git a/app/static/img/icons8-recipe-book-large.png b/app/static/img/icons8-recipe-book-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb1b307d7100b9ca2a4a7a3bc3e6cb26a7a543b2
GIT binary patch
literal 8154
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
G>OTO_8+jA}

literal 0
HcmV?d00001

diff --git a/app/templates/main.html b/app/templates/main.html
index 04e6631..34108dc 100644
--- a/app/templates/main.html
+++ b/app/templates/main.html
@@ -1,20 +1,38 @@
 {% extends "shared/layout.html" %} {% block content %} {% include "main_navbar.html" %}
+
 <div class="row justify-content-center">
-    <!-- <div class="col-10" style="max-width: 480px;"> -->
-        <div class="btn-group btn-group-lg w-100 justify-content-evenly" style="max-width: 480px;">
-            <div class="btn-group-vertical d-flex m-1 w-100" role="group" aria-label="Suche">
-                <a class="btn btn-lg btn-dark mb-1 w-100 p-5">Rezept<br>finden!</a>
-                <a class="btn btn-lg btn-dark mb-1 w-100 p-5" href="" id="search_restaurant" onclick="change_url()">Restaurant<br>finden!</a>
+    <div class="col-10 limit-width">
+        <div class="d-flex">
+            <div class="btn btn-outline-dark w-100 flex-grow-1 m-2 py-4 box-shadow prevent-dark-fill d-flex align-items-center justify-content-center flex-column">
+                <img src="/static/img/icons8-recipe-book-large.png" alt="" class="img-display">
+                <h1 class="fs-5">Rezept Finden</h1>
             </div>
-            <div class="btn-group-vertical d-flex m-1 w-50" role="group" aria-label="Filter">
-                <a class="btn btn-lg btn-dark mb-1 w-100 p-5">🝖<br>Filter</a>
-                <a class="btn btn-lg btn-dark mb-1 w-100 p-5" data-bs-toggle="modal" data-bs-target="#restaurantFilter" onclick="update_modal_on_show()">🝖<br>Filter</a>
+            <div class="btn btn-outline-dark w-50 m-2 py-4 box-shadow prevent-dark-fill grid align-items-center justify-content-center flex-column">
+                <img src="/static/img/icons8-filter-large.png" alt="" class="img-display p-2">
+                <h1 class="fs-5">Filter</h1>
             </div>
         </div>
-    <!-- </div> -->
+    </div>
 </div>
+<div class="row justify-content-center">
+    <div class="col-10 limit-width">
+        <div class="d-flex">
+            <a id="search_restaurant" onclick="change_url()" class="btn btn-outline-dark w-100 flex-grow-1 m-2 py-4 box-shadow prevent-dark-fill d-flex align-items-center justify-content-center flex-column">
+                <img src="/static/img/icons8-plate-and-utensils-large.png" alt="" class="img-display">
+                <h1 class="fs-5">Restaurant Finden</h1>
+            </a>
+            <a data-bs-toggle="modal" data-bs-target="#restaurantFilter" onclick="update_modal_on_show()" class="btn btn-outline-dark w-50 m-2 py-4 box-shadow prevent-dark-fill grid align-items-center justify-content-center flex-column">
+                <img src="/static/img/icons8-filter-large.png" alt="" class="img-display p-2">
+                <h1 class="fs-5">Filter</h1>
+            </a>
+        </div>
+    </div>
+</div>
+
 {% include "signin/account_modal.html" %}
 {% include "restaurant/restaurant_filter_modal.html" %}
+
 <script src="/static/js/index.js"></script>
 <script src="/static/js/restaurant.js"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/main_navbar.html b/app/templates/main_navbar.html
index 17d63b7..b8b6537 100644
--- a/app/templates/main_navbar.html
+++ b/app/templates/main_navbar.html
@@ -2,11 +2,11 @@
     <div class="col-10" style="max-width: 480px;">
         <nav class="navbar navbar-light bg-white justify-content-between my-2">
             <a class="navbar-brand" href="#" style="margin-right:0rem;">
-                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
+                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen" class="drop-shadow">
             </a>
             <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
             <a class="navbar-brand" href="" data-bs-toggle="modal" data-bs-target="#accountSettings" style="margin-right:0rem;">
-                <img src="/static/img/icons8-account-96.png" width="30" height="30" alt="Home">
+                <img src="/static/img/icons8-account-96.png" width="30" height="30" alt="Home" class="drop-shadow">
             </a>
         </nav>
     </div>

From 4902d60ee84f40d93dc46361b4366e3cf2ef01d8 Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Fri, 11 Feb 2022 14:14:55 +0100
Subject: [PATCH 07/11] fixed RestBewertungReturn, Implemented
 Ratingfunctionlaity

---
 app/services/service_res.py                   |  2 +-
 app/static/js/rating.js                       | 11 +++++
 app/templates/rating/rating.html              | 31 ++++---------
 app/templates/rating/rating_edit.html         | 32 ++++++++++++++
 .../restaurant/restaurant_navbar.html         |  2 +-
 app/views/rating.py                           | 44 ++++++++++++++++++-
 6 files changed, 95 insertions(+), 27 deletions(-)
 create mode 100644 app/static/js/rating.js
 create mode 100644 app/templates/rating/rating_edit.html

diff --git a/app/services/service_res.py b/app/services/service_res.py
index bd8c971..1b463ef 100644
--- a/app/services/service_res.py
+++ b/app/services/service_res.py
@@ -37,7 +37,7 @@ def get_assessments_from_user(db_session: Session, user: UserBase) -> Union[List
     db_rests = crud_bewertung.get_all_user_bewertungen(db_session, user)
     scheme_rests = [
         RestBewertungReturn(
-            name=db_rest.name,
+            name=db_rest.restaurant.name,
             email=db_rest.person_email,
             place_id=db_rest.place_id,
             comment=db_rest.kommentar,
diff --git a/app/static/js/rating.js b/app/static/js/rating.js
new file mode 100644
index 0000000..4aa4537
--- /dev/null
+++ b/app/static/js/rating.js
@@ -0,0 +1,11 @@
+/******** inititialize star-rating-svg *****************/
+$("#rating_edit_rating").raty({
+    starOff: 'https://cdn.jsdelivr.net/npm/raty-js@3.1.1/lib/images/star-off.png',
+    starOn: 'https://cdn.jsdelivr.net/npm/raty-js@3.1.1/lib/images/star-on.png',
+    click: function(score, evt) {
+        document.getElementById('rating_edit_rating_target').value = score;
+    },
+    score: function() {
+        return document.getElementById('rating_edit_rating_target').value;
+    }
+});
\ No newline at end of file
diff --git a/app/templates/rating/rating.html b/app/templates/rating/rating.html
index 6ea909d..60afddf 100644
--- a/app/templates/rating/rating.html
+++ b/app/templates/rating/rating.html
@@ -6,31 +6,16 @@ <h1>Bewertungen</h1>
 </div>
 <div class="row justify-content-center">
     <div class="col-10  mb-2" style="max-width: 480px;">
-        {% for rating in rest_ratings %}
-        <button type="button" class="btn btn-dark btn-sm w-100 mb-2 d-flex justify-content-between">
-            <span>Restaurant xy</span>
+        {% for rest_rating in rest_ratings %}
+        <a type="button" class="btn btn-dark btn-sm w-100 mb-2 d-flex justify-content-between" href="/rating/edit?place_id={{rest_rating.place_id}}">
+            <span>{{rest_rating.name}}</span>
             <span class="d-flex justify-content-end">
-                <span>{{rating.rating}}/5 &nbsp;</span>
-                <span class="border-left border-white">| &gt;</span>
+                {% if rest_rating.rating != 0 %}
+                <span>{{rest_rating.rating|round|int}}/5 &nbsp;</span> {% else %}
+            <span>Keine Bewertung&nbsp;</span> {% endif %}
+            <span class="border-left border-white">| &gt;</span>
             </span>
-        </button>
-        <!-- Modal -->
-        <div class="modal fade modal-sm modal-lg center" id="{{rating.}}" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="staticBackdropLabel">Bewertung ändern</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Speichern</button>
-                    </div>
-                </div>
-            </div>
-        </div>
+        </a>
         {% endfor %}
     </div>
 </div>
diff --git a/app/templates/rating/rating_edit.html b/app/templates/rating/rating_edit.html
new file mode 100644
index 0000000..6c13db1
--- /dev/null
+++ b/app/templates/rating/rating_edit.html
@@ -0,0 +1,32 @@
+{% extends "shared/layout.html" %} {% block content %} {% include "rating/rating_navbar.html" %}
+<div class="row justify-content-center">
+    <div class="col-10" style="max-width: 480px;">
+        <h3>Bewertung ändern</h3>
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-10" style="max-width: 480px;">
+        <h1>{{rest_rating.name}}</h1>
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-10" style="max-width: 480px;">
+        <form method="post">
+            <input id="identifier" name="identifier" type="text" style="display: none;" value="{{ rest_rating.place_id }}">
+            <input id="rest_name" name="rest_name" type="text" style="display: none;" value="{{rest_rating.name}}">
+            <label for="restaurant_filter_rating" class="form-label">Bewertung</label>
+            <div id="rating_edit_rating"></div>
+            <input id="rating_edit_rating_target" name="rating_edit_rating_target" style="display:none" value="{{ rest_rating.rating }}">
+            <div class="mb-3">
+                <label for="rating_notes" class="form-label">Notizen</label>
+                <textarea class="form-control" id="rating_notes" name="rating_notes" rows="3">{{rest_rating.comment}}</textarea>
+            </div>
+            <div class="form-actions text-center">
+                <a href="/rating/delete?place_id={{rest_rating.place_id}}&rest_name={{rest_rating.name}}" class="btn btn-dark mt-3">Löschen</a>
+                <button type="submit" class="btn btn-dark mt-3">Speichern</button>
+            </div>
+        </form>
+    </div>
+</div>
+<script src="/static/js/rating.js"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/restaurant/restaurant_navbar.html b/app/templates/restaurant/restaurant_navbar.html
index e1ff1ea..d95ece6 100644
--- a/app/templates/restaurant/restaurant_navbar.html
+++ b/app/templates/restaurant/restaurant_navbar.html
@@ -1,7 +1,7 @@
 <div class="row justify-content-center">
     <div class="col-10" style="max-width: 480px;">
         <nav class="navbar navbar-light bg-white justify-content-between my-2">
-            <a class="navbar-brand" href="#" style="margin-right:0rem;">
+            <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
                 <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
             </a>
             <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
diff --git a/app/views/rating.py b/app/views/rating.py
index 89d2434..67e8b1d 100644
--- a/app/views/rating.py
+++ b/app/views/rating.py
@@ -1,20 +1,27 @@
 import fastapi
 from fastapi import Depends
+from fastapi import status
 from fastapi.responses import HTMLResponse
 from starlette.requests import Request
+from fastapi.responses import RedirectResponse
 from starlette.templating import Jinja2Templates
+from schemes.scheme_rest import RestBewertungCreate
+from schemes.scheme_rest import RestaurantBase
 from db.database import get_db
 from sqlalchemy.orm import Session
 from tools.security import get_current_user
 from schemes.scheme_user import User
+from db.models.bewertung import Bewertung
+from db.crud.bewertung import get_bewertung_from_user_to_rest, update_bewertung
 from services import service_res
+from copy import copy
 
 templates = Jinja2Templates("templates")
 router = fastapi.APIRouter()
 
 
 @router.get("/rating", response_class=HTMLResponse)
-async def rating(
+def rating(
     request: Request,
     db_session: Session = Depends(get_db),
     current_user: User = Depends(get_current_user)
@@ -22,5 +29,38 @@ async def rating(
     rest_ratings = service_res.get_assessments_from_user(db_session=db_session, user=current_user)
 
     return templates.TemplateResponse(
-        "rating/rating.html", {"request": request, "rest_ratings":rest_ratings}
+        "rating/rating.html", {"request": request, "rest_ratings": rest_ratings}
     )
+
+
+@router.get("/rating/edit", response_class=HTMLResponse)
+def edit_rating(request: Request, place_id: str, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+    rest_ratings = service_res.get_assessments_from_user(db_session=db_session, user=current_user)
+    rest_rating = [r for r in rest_ratings if r.place_id == place_id]
+    return templates.TemplateResponse(
+        "rating/rating_edit.html", {"request": request, "rest_rating": rest_rating[0]}
+    )
+
+
+@router.post("/rating/edit", response_class=RedirectResponse)
+async def edit_rating(request: Request, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+    form = await request.form()
+    rating = form.get("rating_edit_rating_target")
+    notes = form.get("rating_notes")
+    name = form.get("rest_name")
+    identifier = form.get("identifier")
+
+    old_rating = get_bewertung_from_user_to_rest(db=db_session, user=current_user, rest=RestaurantBase(place_id=identifier, name=name))
+    old_rating_scheme = RestBewertungCreate(name=name, comment=old_rating.kommentar, rating=old_rating.rating,
+                                            person=current_user, restaurant=RestaurantBase(place_id=identifier, name=name))
+    new_rating = copy(old_rating_scheme)
+    new_rating.comment = notes
+    new_rating.rating = rating
+
+    service_res.update_assessment(db_session=db_session, old_assessment=old_rating_scheme, new_assessment=new_rating)
+    return RedirectResponse("/rating/", status_code=status.HTTP_302_FOUND)
+
+@router.get("/rating/delete", response_class=RedirectResponse)
+def delete_rating(request: Request, place_id:str, rest_name:str, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+    service_res.delete_assessment(db_session=db_session, user=current_user, rest=RestaurantBase(place_id=place_id, name=rest_name))
+    return RedirectResponse("/rating/", status_code=status.HTTP_302_FOUND)

From 8693a15c41da87bdd18c4a3fb491e576e2f6c8d1 Mon Sep 17 00:00:00 2001
From: baldur <baldur@siegels.us>
Date: Fri, 11 Feb 2022 14:20:18 +0100
Subject: [PATCH 08/11] Added drop shadow

---
 app/templates/main_navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main_navbar.html b/app/templates/main_navbar.html
index 273ea78..772d6f4 100644
--- a/app/templates/main_navbar.html
+++ b/app/templates/main_navbar.html
@@ -2,7 +2,7 @@
     <div class="col-10" style="max-width: 480px;">
         <nav class="navbar navbar-light bg-white justify-content-between my-2">
             <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
-                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
+                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen" class="drop-shadow">
             </a>
             <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
             <a class="navbar-brand" href="" data-bs-toggle="modal" data-bs-target="#accountSettings" style="margin-right:0rem;">

From a3eca1513cdca015bb5d2e4ef2be832532f14efa Mon Sep 17 00:00:00 2001
From: Florian Herkommer <florian.herkommer@gmx.de>
Date: Fri, 11 Feb 2022 18:43:27 +0100
Subject: [PATCH 09/11] Added easter egg

---
 app/static/css/style.css                      | 27 ++++++++++++++++---
 app/templates/main_navbar.html                |  2 +-
 .../restaurant/restaurant_navbar.html         |  2 +-
 app/templates/shared/layout.html              | 10 +++++++
 app/views/rating.py                           | 19 ++++++++++---
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index a3bd9be..6b49d21 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -21,15 +21,18 @@
 }
 
 .drop-shadow {
-    filter: drop-shadow(0 4px 4px rgba(0,0,0,0.25));
+    filter: drop-shadow(0 4px 4px rgba(0, 0, 0, 0.25));
 }
+
 .box-shadow {
     transition: box-shadow 0.2s;
-    box-shadow: 4px 4px 8px rgba(0,0,0,0.35);
+    box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.35);
 }
+
 .box-shadow:hover {
     box-shadow: 0 0 0 #fff;
 }
+
 .box-shadow:active {
     box-shadow: 0 0 0 #fff;
 }
@@ -38,14 +41,16 @@
     transition: filter 0.4s;
     filter: none;
 }
+
 .drop-shadow-reveal:hover {
-    filter: drop-shadow(0 4px 4px rgba(0,0,0,0.25));
+    filter: drop-shadow(0 4px 4px rgba(0, 0, 0, 0.25));
 }
 
 .prevent-dark-fill:hover {
     background-color: #fff !important;
     color: #212529;
 }
+
 .prevent-dark-fill:active {
     /*background-color: #6EB1DF !important;*/
     background-color: #a8cfe9 !important;
@@ -57,15 +62,16 @@
     max-width: 480px;
 }
 
-
 .img-display {
     height: calc(1.625rem + 4.5vh);
     width: auto;
 }
+
 .img-display svg {
     height: calc(1.625rem + 4.5vh);
     width: auto;
 }
+
 @media screen and (min-width: 768px) {
     .img-display {
         height: 5rem;
@@ -75,4 +81,17 @@
         height: 5rem;
         width: auto;
     }
+}
+
+.rotate {
+    animation: rotation 2s infinite linear;
+}
+
+@keyframes rotation {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(359deg);
+    }
 }
\ No newline at end of file
diff --git a/app/templates/main_navbar.html b/app/templates/main_navbar.html
index 772d6f4..54dc802 100644
--- a/app/templates/main_navbar.html
+++ b/app/templates/main_navbar.html
@@ -4,7 +4,7 @@
             <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
                 <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen" class="drop-shadow">
             </a>
-            <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
+            <img src="/static/img/essensfinder-draft.png" id="logo" width="30" height="30" alt="logo">
             <a class="navbar-brand" href="" data-bs-toggle="modal" data-bs-target="#accountSettings" style="margin-right:0rem;">
                 <img src="/static/img/icons8-account-96.png" width="30" height="30" alt="Home" class="drop-shadow">
             </a>
diff --git a/app/templates/restaurant/restaurant_navbar.html b/app/templates/restaurant/restaurant_navbar.html
index d95ece6..747c2a1 100644
--- a/app/templates/restaurant/restaurant_navbar.html
+++ b/app/templates/restaurant/restaurant_navbar.html
@@ -4,7 +4,7 @@
             <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
                 <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
             </a>
-            <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
+            <img src="/static/img/essensfinder-draft.png" id="logo" width="30" height="30" alt="logo">
             <a class="navbar-brand" href="/main" style="margin-right:0rem;">
                 <img src="/static/img/icons8-home-192.png" width="30" height="30" alt="Home">
             </a>
diff --git a/app/templates/shared/layout.html b/app/templates/shared/layout.html
index cca772a..3d76f13 100644
--- a/app/templates/shared/layout.html
+++ b/app/templates/shared/layout.html
@@ -29,5 +29,15 @@
         {% block content %} {% endblock %}
     </div>
 </body>
+<script type="text/javascript">
+    let clickcount = 0;
+    $('#logo').click(function() {
+        clickcount += 1;
+        if (clickcount == 3) {
+            $("#logo").addClass("rotate");
+            clickcount = 0;
+        }
+    });
+</script>
 
 </html>
\ No newline at end of file
diff --git a/app/views/rating.py b/app/views/rating.py
index 67e8b1d..9d27160 100644
--- a/app/views/rating.py
+++ b/app/views/rating.py
@@ -11,8 +11,7 @@
 from sqlalchemy.orm import Session
 from tools.security import get_current_user
 from schemes.scheme_user import User
-from db.models.bewertung import Bewertung
-from db.crud.bewertung import get_bewertung_from_user_to_rest, update_bewertung
+from db.crud.bewertung import get_bewertung_from_user_to_rest
 from services import service_res
 from copy import copy
 
@@ -35,6 +34,17 @@ def rating(
 
 @router.get("/rating/edit", response_class=HTMLResponse)
 def edit_rating(request: Request, place_id: str, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+    """Return the rendered template for displaying rating that matches place_id for editing
+
+    Args:
+        request (Request): Request for template
+        place_id (str): identifier for restaurant
+        db_session (Session, optional): current db_session. Defaults to Depends(get_db).
+        current_user (User, optional): current logged in user. Defaults to Depends(get_current_user).
+
+    Returns:
+        HTMLResponse: rendered template
+    """
     rest_ratings = service_res.get_assessments_from_user(db_session=db_session, user=current_user)
     rest_rating = [r for r in rest_ratings if r.place_id == place_id]
     return templates.TemplateResponse(
@@ -43,7 +53,7 @@ def edit_rating(request: Request, place_id: str, db_session: Session = Depends(g
 
 
 @router.post("/rating/edit", response_class=RedirectResponse)
-async def edit_rating(request: Request, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+async def edit_rating_post(request: Request, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
     form = await request.form()
     rating = form.get("rating_edit_rating_target")
     notes = form.get("rating_notes")
@@ -60,7 +70,8 @@ async def edit_rating(request: Request, db_session: Session = Depends(get_db), c
     service_res.update_assessment(db_session=db_session, old_assessment=old_rating_scheme, new_assessment=new_rating)
     return RedirectResponse("/rating/", status_code=status.HTTP_302_FOUND)
 
+
 @router.get("/rating/delete", response_class=RedirectResponse)
-def delete_rating(request: Request, place_id:str, rest_name:str, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
+def delete_rating(request: Request, place_id: str, rest_name: str, db_session: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
     service_res.delete_assessment(db_session=db_session, user=current_user, rest=RestaurantBase(place_id=place_id, name=rest_name))
     return RedirectResponse("/rating/", status_code=status.HTTP_302_FOUND)

From d4912e3ee30f3a851dc0a99378c12b4ce5f39fb1 Mon Sep 17 00:00:00 2001
From: baldur <baldur@siegels.us>
Date: Mon, 14 Feb 2022 17:20:56 +0100
Subject: [PATCH 10/11] Redesigned general rating page

---
 app/main.py                                   |   2 +-
 app/static/css/style.css                      |  26 +++-
 app/templates/rating/rating.html              | 124 ++++++++++++++++--
 app/templates/rating/rating_edit.html         |   2 +-
 app/templates/rating/rating_navbar.html       |  13 --
 .../restaurant/restaurant_navbar.html         |   4 +-
 app/templates/shared/layout.html              |   2 +
 7 files changed, 143 insertions(+), 30 deletions(-)
 delete mode 100644 app/templates/rating/rating_navbar.html

diff --git a/app/main.py b/app/main.py
index fd4284f..556335f 100644
--- a/app/main.py
+++ b/app/main.py
@@ -176,6 +176,6 @@ async def general_exception_handler(request: fastapi.Request, exc: Exception):
 
 if __name__ == "__main__":
     configure()
-    uvicorn.run(app, port=8000, host="127.0.0.1")
+    uvicorn.run(app, port=8000, host="192.168.0.112")
 else:
     configure()
diff --git a/app/static/css/style.css b/app/static/css/style.css
index a3bd9be..5729441 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -23,9 +23,15 @@
 .drop-shadow {
     filter: drop-shadow(0 4px 4px rgba(0,0,0,0.25));
 }
+.drop-shadow:hover {
+    box-shadow: 0 0 0 #fff;
+}
+.drop-shadow:active {
+    box-shadow: 0 0 0 #fff;
+}
 .box-shadow {
     transition: box-shadow 0.2s;
-    box-shadow: 4px 4px 8px rgba(0,0,0,0.35);
+    box-shadow: 3px 3px 6px rgba(0,0,0,0.30);
 }
 .box-shadow:hover {
     box-shadow: 0 0 0 #fff;
@@ -52,11 +58,29 @@
     border-color: #6eb1df !important;
     color: #212529;
 }
+.prevent-dark-hover:hover {
+    background-color: #fff;
+    color: #212529;
+}
 
 .limit-width {
     max-width: 480px;
 }
 
+.filter-character-up {
+    display: inline-block;
+    transform: rotate(90deg);
+    font-size: 0.8rem;
+}
+.filter-character-down {
+    display: inline-block;
+    transform: rotate(180deg);
+    font-size: 0.8rem;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
 
 .img-display {
     height: calc(1.625rem + 4.5vh);
diff --git a/app/templates/rating/rating.html b/app/templates/rating/rating.html
index 60afddf..4707a6d 100644
--- a/app/templates/rating/rating.html
+++ b/app/templates/rating/rating.html
@@ -1,22 +1,122 @@
-{% extends "shared/layout.html" %} {% block content %} {% include "rating/rating_navbar.html" %}
+{% extends "shared/layout.html" %} {% block content %} {% include "restaurant/restaurant_navbar.html" %}
 <div class="row justify-content-center">
     <div class="col-10" style="max-width: 480px;">
-        <h1>Bewertungen</h1>
+        <h2>Bewertungen</h2>
     </div>
 </div>
 <div class="row justify-content-center">
-    <div class="col-10  mb-2" style="max-width: 480px;">
+    <div class="col-10 mt-2 limit-width text-center">
+        <h5 id="filterButton" class="filter-up cursor-pointer user-select-none">Filter&nbsp;<span id="filterSymbol" class="filter-character-up">▲</span></h5>
+        <div id="filterButtonsContainer" class="d-none justify-content-evenly my-3"><!-- d-flex -->
+            <div class="d-flex flex-column">
+                <input type="checkbox" name="filterRestaurant" id="filterRestaurant" class="btn-check" checked>
+                <label for="filterRestaurant" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Restaurants</label>
+                <input type="checkbox" name="filterRezepte" id="filterRezepte" class="btn-check">
+                <label for="filterRezepte" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Rezepte</label>
+            </div>
+            <div class="d-flex flex-column">
+                <input type="checkbox" name="filterWithBewertung" id="filterWithBewertung" class="btn-check" checked>
+                <label for="filterWithBewertung" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">mit Bewertung</label>
+                <input type="checkbox" name="filterWithoutBewertung" id="filterWithoutBewertung" class="btn-check" checked>
+                <label for="filterWithoutBewertung" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">ohne Bewertung</label>
+            </div>
+        </div>
+        <hr class="mt-1">
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-10 mt-2 limit-width text-center">
+        <h5 id="sortButton" class="sort-up cursor-pointer user-select-none">Sortieren&nbsp;<span id="sortSymbol" class="filter-character-up">▲</span></h5>
+        <div id="sortButtonsContainer" class="d-none justify-content-evenly my-3"><!-- d-flex -->
+            <div class="d-flex flex-column">
+                <input type="radio" name="sortOptions" id="sortDateAsc" class="btn-check" checked>
+                <label for="sortDateAsc" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Datum &uarr;</label>
+                <input type="radio" name="sortOptions" id="sortDateDesc" class="btn-check">
+                <label for="sortDateDesc" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Datum &darr;</label>
+            </div>
+            <div class="d-flex flex-column">
+                <input type="radio" name="sortOptions" id="sortRatingAsc" class="btn-check">
+                <label for="sortRatingAsc" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Bewertung &uarr;</label>
+                <input type="radio" name="sortOptions" id="sortRatingDesc" class="btn-check">
+                <label for="sortRatingDesc" class="btn btn-outline-dark m-1 box-shadow prevent-dark-hover">Bewertung &darr;</label>
+            </div>
+        </div>
+        <hr class="mt-1">
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-10 mb-2 limit-width">
         {% for rest_rating in rest_ratings %}
-        <a type="button" class="btn btn-dark btn-sm w-100 mb-2 d-flex justify-content-between" href="/rating/edit?place_id={{rest_rating.place_id}}">
-            <span>{{rest_rating.name}}</span>
-            <span class="d-flex justify-content-end">
-                {% if rest_rating.rating != 0 %}
-                <span>{{rest_rating.rating|round|int}}/5 &nbsp;</span> {% else %}
-            <span>Keine Bewertung&nbsp;</span> {% endif %}
-            <span class="border-left border-white">| &gt;</span>
-            </span>
-        </a>
+        <div class="d-flex flex-column">
+            <div class="btn-group m-2 box-shadow" role="group">
+                <a type="button" class="btn btn-outline-dark prevent-dark-fill d-flex justify-content-between pe-2" href="/rating/edit?place_id={{rest_rating.place_id}}">
+                    <span class="text-start">{{rest_rating.name}}</span>
+                    <span class="text-end ps-3">
+
+                    {% if rest_rating.rating != 0 %}
+                        {{rest_rating.rating|round|int}}/5
+                    {% else %}
+                        Keine&#32;Bewertung
+                    {% endif %}
+
+                    </span>
+                </a>
+                <a type="button" class="btn btn-outline-dark prevent-dark-fill flex-grow-0" href="/rating/edit?place_id={{rest_rating.place_id}}">
+                    <span class="border-left border-white">&gt;</span>
+                </a>
+            </div>
+        </div>
         {% endfor %}
     </div>
 </div>
+
+<script>
+    filterSymbol = document.getElementById("filterSymbol");
+    filterButton = document.getElementById("filterButton")
+    sortSymbol = document.getElementById("sortSymbol");
+    sortButton = document.getElementById("sortButton");
+
+    filterButtons = document.getElementById("filterButtonsContainer");
+    sortButtons = document.getElementById("sortButtonsContainer");
+    
+    filterButton.addEventListener("click", e => {
+        if (filterButton.classList.contains("filter-up")) {
+            filterButton.classList.remove("filter-up");
+            filterButton.classList.add("filter-down");
+            filterSymbol.classList.remove("filter-character-up");
+            filterSymbol.classList.add("filter-character-down");
+
+            filterButtons.classList.remove("d-none");
+            filterButtons.classList.add("d-flex");
+        } else if (filterButton.classList.contains("filter-down")) {
+            filterButton.classList.add("filter-up");
+            filterButton.classList.remove("filter-down");
+            filterSymbol.classList.add("filter-character-up");
+            filterSymbol.classList.remove("filter-character-down");
+
+            filterButtons.classList.add("d-none");
+            filterButtons.classList.remove("d-flex");
+        }
+    });
+
+    sortButton.addEventListener("click", e => {
+        if (sortButton.classList.contains("sort-up")) {
+            sortButton.classList.remove("sort-up");
+            sortButton.classList.add("sort-down");
+            sortSymbol.classList.remove("filter-character-up");
+            sortSymbol.classList.add("filter-character-down");
+
+            sortButtons.classList.remove("d-none");
+            sortButtons.classList.add("d-flex");
+        } else if (sortButton.classList.contains("sort-down")) {
+            sortButton.classList.add("sort-up");
+            sortButton.classList.remove("sort-down");
+            sortSymbol.classList.add("filter-character-up");
+            sortSymbol.classList.remove("filter-character-down");
+
+            sortButtons.classList.add("d-none");
+            sortButtons.classList.remove("d-flex");
+        }
+    })
+</script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/rating/rating_edit.html b/app/templates/rating/rating_edit.html
index 6c13db1..004ed76 100644
--- a/app/templates/rating/rating_edit.html
+++ b/app/templates/rating/rating_edit.html
@@ -1,4 +1,4 @@
-{% extends "shared/layout.html" %} {% block content %} {% include "rating/rating_navbar.html" %}
+{% extends "shared/layout.html" %} {% block content %} {% include "restaurant/restaurant_navbar.html" %}
 <div class="row justify-content-center">
     <div class="col-10" style="max-width: 480px;">
         <h3>Bewertung ändern</h3>
diff --git a/app/templates/rating/rating_navbar.html b/app/templates/rating/rating_navbar.html
deleted file mode 100644
index d95ece6..0000000
--- a/app/templates/rating/rating_navbar.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="row justify-content-center">
-    <div class="col-10" style="max-width: 480px;">
-        <nav class="navbar navbar-light bg-white justify-content-between my-2">
-            <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
-                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
-            </a>
-            <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
-            <a class="navbar-brand" href="/main" style="margin-right:0rem;">
-                <img src="/static/img/icons8-home-192.png" width="30" height="30" alt="Home">
-            </a>
-        </nav>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/templates/restaurant/restaurant_navbar.html b/app/templates/restaurant/restaurant_navbar.html
index d95ece6..c868a18 100644
--- a/app/templates/restaurant/restaurant_navbar.html
+++ b/app/templates/restaurant/restaurant_navbar.html
@@ -2,11 +2,11 @@
     <div class="col-10" style="max-width: 480px;">
         <nav class="navbar navbar-light bg-white justify-content-between my-2">
             <a class="navbar-brand" href="/rating" style="margin-right:0rem;">
-                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen">
+                <img src="/static/img/icons8-star-96.png" width="30" height="30" alt="Bewertungen" class="drop-shadow">
             </a>
             <img src="/static/img/essensfinder-draft.png" width="30" height="30" alt="logo">
             <a class="navbar-brand" href="/main" style="margin-right:0rem;">
-                <img src="/static/img/icons8-home-192.png" width="30" height="30" alt="Home">
+                <img src="/static/img/icons8-home-192.png" width="30" height="30" alt="Home" class="drop-shadow">
             </a>
         </nav>
     </div>
diff --git a/app/templates/shared/layout.html b/app/templates/shared/layout.html
index cca772a..1478d03 100644
--- a/app/templates/shared/layout.html
+++ b/app/templates/shared/layout.html
@@ -8,6 +8,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="Florian Herkommer, Baldur Siegel, David Felder, Florian Glaser, Jonas Straub">
     <title>Essensfindung</title>
+    <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon">
+
     <link rel="stylesheet" href="/static/css/bootstrap.min.css">
     <!-- own js and css-->
     <link rel="stylesheet" href="/static/css/style.css">

From ed39354b649f9d5cf9e8d8100465e8df137ddab5 Mon Sep 17 00:00:00 2001
From: Florian Glaser <58706771+Floskinner@users.noreply.github.com>
Date: Wed, 16 Feb 2022 17:15:49 +0100
Subject: [PATCH 11/11] Add recipes in the backend (#58)

* track recipeitems.json using Git LFS

* added recipe database and dependenvies

* updated references

* init commits for recipe search

* add recipe search

* better output for pytest

* ignore test_recipe
---
 .github/workflows/python-validation.yml |   2 +-
 .gitignore                              |   4 +-
 app/.gitattributes                      |   1 +
 app/data/recipeitems.json               |   3 +
 app/schemes/scheme_filter.py            |  21 +----
 app/schemes/scheme_recipe.py            |  14 ++++
 app/services/service_rec.py             |  36 +++++++++
 app/tests/test_recipe.py                |  76 ++++++++++++++++++
 app/tools/recipe_db.py                  |  66 +++++++++++++++
 poetry.lock                             | 102 +++++++++++++++++++++++-
 pyproject.toml                          |   1 +
 requirements-dev.txt                    |  50 +++++++++++-
 requirements.txt                        |  50 +++++++++++-
 13 files changed, 403 insertions(+), 23 deletions(-)
 create mode 100644 app/.gitattributes
 create mode 100644 app/data/recipeitems.json
 create mode 100644 app/schemes/scheme_recipe.py
 create mode 100644 app/services/service_rec.py
 create mode 100644 app/tests/test_recipe.py
 create mode 100644 app/tools/recipe_db.py

diff --git a/.github/workflows/python-validation.yml b/.github/workflows/python-validation.yml
index 1f9b60d..004ad01 100644
--- a/.github/workflows/python-validation.yml
+++ b/.github/workflows/python-validation.yml
@@ -44,4 +44,4 @@ jobs:
     - name: Test with pytest
       working-directory: ./app
       run: |
-        pytest ./tests
+        pytest -vv --ignore=./tests/test_recipe.py ./tests
diff --git a/.gitignore b/.gitignore
index 9767637..d559c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,5 +139,5 @@ app/tests/test_db.db
 # Ignore Logs
 *log*
 
-# Ignore local data
-app/data
\ No newline at end of file
+# Ignore local Database
+app/data/essensfindung.db
\ No newline at end of file
diff --git a/app/.gitattributes b/app/.gitattributes
new file mode 100644
index 0000000..f85cade
--- /dev/null
+++ b/app/.gitattributes
@@ -0,0 +1 @@
+data/recipeitems.json filter=lfs diff=lfs merge=lfs -text
diff --git a/app/data/recipeitems.json b/app/data/recipeitems.json
new file mode 100644
index 0000000..797de3c
--- /dev/null
+++ b/app/data/recipeitems.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9a018ba9e40899fccf97d5e20eeee1524920214ad083a353cf31134bdc10a21
+size 141697960
diff --git a/app/schemes/scheme_filter.py b/app/schemes/scheme_filter.py
index 8875f2f..dee3211 100644
--- a/app/schemes/scheme_filter.py
+++ b/app/schemes/scheme_filter.py
@@ -1,4 +1,5 @@
 """Contains all Filter for the searches"""
+from datetime import timedelta
 from typing import List
 from typing import Optional
 
@@ -14,8 +15,8 @@ class FilterBase(BaseModel):
     """Base Filter for recepes and restaurant"""
 
     cuisines: List[scheme_cuisine.PydanticCuisine]
-    allergies: Optional[List[scheme_allergie.PydanticAllergies]] = None
     rating: int
+    allergies: Optional[List[scheme_allergie.PydanticAllergies]]
 
     @validator("rating")
     @classmethod
@@ -100,19 +101,5 @@ def plz_length(cls, value: str):
 class FilterRecipe(FilterBase):
     """Extended Model for Recipe-Filter"""
 
-    difficulty: int
-
-    @validator("difficulty")
-    @classmethod
-    def difficulty_range(cls, value: int):
-        """Check if difficulty >= 1 and <= 5
-
-        Args:
-            value (int): Value of difficulty
-
-        Raises:
-            ValueError: If wrong values
-        """
-        if 1 <= value <= 5:
-            return value
-        raise ValueError("difficulty is not between 1 (included) and 5 (included)")
+    keyword: str
+    total_time: timedelta
diff --git a/app/schemes/scheme_recipe.py b/app/schemes/scheme_recipe.py
new file mode 100644
index 0000000..0876d87
--- /dev/null
+++ b/app/schemes/scheme_recipe.py
@@ -0,0 +1,14 @@
+from datetime import timedelta
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class Recipe(BaseModel):
+    id: str
+    name: str
+    ingredients: str
+    url: str
+    image: Optional[str]
+    cookTime: Optional[timedelta]
+    prepTime: Optional[timedelta]
diff --git a/app/services/service_rec.py b/app/services/service_rec.py
new file mode 100644
index 0000000..651ccc7
--- /dev/null
+++ b/app/services/service_rec.py
@@ -0,0 +1,36 @@
+import pandas
+
+from schemes.scheme_filter import FilterRecipe
+from schemes.scheme_recipe import Recipe
+from tools.recipe_db import recipe_db
+from tools.recipe_db import RecipeDB
+
+
+def search_recipe(recipe_filter: FilterRecipe) -> Recipe:
+    """Search for a recipe with the given filter
+
+    Args:
+        recipe_filter (FilterRecipe): Filter the Recipes
+
+    Returns:
+        Recipe: The one choosen Recipe
+    """
+    random_recipe: pandas.DataFrame = __apply_filter(recipe_db.pd_frame, recipe_filter).sample()
+
+    return Recipe(
+        id=random_recipe["_id.$oid"][0],
+        name=random_recipe["name"][0],
+        ingredients=random_recipe["ingredients"][0],
+        url=random_recipe["url"][0],
+        image=random_recipe["image"][0],
+        cookTime=random_recipe["cookTime"][0],
+        prepTime=random_recipe["prepTime"][0],
+    )
+
+
+def __apply_filter(recipes: pandas.DataFrame, recipe_filter: FilterRecipe) -> pandas.DataFrame:
+    cooktime_bool = RecipeDB.filter_cooktime(user_pd_frame=recipes, total_time=recipe_filter.total_time)
+    keyword_bool = RecipeDB.filter_keyword(user_pd_frame=recipes, keyword=recipe_filter.keyword)
+
+    filter_bool = cooktime_bool & keyword_bool
+    return recipes[filter_bool]
diff --git a/app/tests/test_recipe.py b/app/tests/test_recipe.py
new file mode 100644
index 0000000..1dee19b
--- /dev/null
+++ b/app/tests/test_recipe.py
@@ -0,0 +1,76 @@
+from datetime import timedelta
+
+import numpy as np
+import pandas
+import pytest
+from pytest_mock import MockerFixture
+
+from schemes import Cuisine
+from schemes.scheme_cuisine import PydanticCuisine
+from schemes.scheme_filter import FilterRecipe
+from schemes.scheme_recipe import Recipe
+from services import service_rec
+from tools.recipe_db import RecipeDB
+
+
+@pytest.fixture
+def recipe_filter() -> FilterRecipe:
+    return FilterRecipe(
+        keyword="Rice",
+        cuisines=[PydanticCuisine(name=Cuisine.GERMAN.value)],
+        rating=3,
+        total_time=timedelta(minutes=10),
+    )
+
+
+@pytest.fixture
+def recipe_db() -> RecipeDB:
+    return RecipeDB()
+
+
+def test_create_dataframe():
+    try:
+        RecipeDB()
+    except Exception:
+        assert False, "Can not create Panda_Dataframe"
+    else:
+        assert True, "Dataframe created"
+
+
+def test_filter_cooktime(recipe_db: RecipeDB, recipe_filter: FilterRecipe):
+    recipe_df = recipe_db.filter_cooktime(recipe_db.pd_frame, recipe_filter.total_time)
+    assert recipe_df is not None
+
+
+def test_filter_keyword(recipe_db: RecipeDB, recipe_filter: FilterRecipe):
+    recipe_df = recipe_db.filter_keyword(recipe_db.pd_frame, recipe_filter.keyword)
+    assert recipe_df is not None
+
+
+def test_search_recipe(mocker: MockerFixture, recipe_filter: FilterRecipe):
+    random_recipe_df = pandas.DataFrame(
+        {
+            "_id.$oid": "11123123123",
+            "name": "Lecker Fleisch",
+            "ingredients": "Alles kochen",
+            "url": "https://random.url/",
+            "image": np.nan,
+            "cookTime": pandas.Timedelta(timedelta(minutes=20)),
+            "prepTime": pandas.Timedelta(timedelta(minutes=10)),
+        },
+        index=[0],
+    )
+
+    random_recipe = Recipe(
+        id=random_recipe_df["_id.$oid"][0],
+        name=random_recipe_df["name"][0],
+        ingredients=random_recipe_df["ingredients"][0],
+        url=random_recipe_df["url"][0],
+        image=random_recipe_df["image"][0],
+        cookTime=random_recipe_df["cookTime"][0],
+        prepTime=random_recipe_df["prepTime"][0],
+    )
+
+    mocker.patch("pandas.DataFrame.sample", return_value=random_recipe_df)
+    recipe_return = service_rec.search_recipe(recipe_filter=recipe_filter)
+    assert recipe_return == random_recipe
diff --git a/app/tools/recipe_db.py b/app/tools/recipe_db.py
new file mode 100644
index 0000000..92d9206
--- /dev/null
+++ b/app/tools/recipe_db.py
@@ -0,0 +1,66 @@
+import json
+from datetime import timedelta
+from pathlib import Path
+from typing import Dict
+
+import pandas
+
+
+class RecipeDB:
+    def __init__(self, json_path=Path("./data/recipeitems.json")):
+        data = self.__read_data__(json_path)
+        self.pd_frame = self.__convert_rows__(data)
+
+    @staticmethod
+    def __read_data__(path: Path) -> Dict:
+        data = []
+
+        with open(path, mode="r", encoding="utf-8") as file:
+            for line in file:
+                data.append(json.loads(line))
+
+        return data
+
+    @staticmethod
+    def __convert_rows__(data: Dict) -> pandas.DataFrame:
+        pd_frame = pandas.json_normalize(data)
+        pd_frame.cookTime = pandas.to_timedelta(pd_frame.cookTime, errors="coerce")
+        pd_frame.prepTime = pandas.to_timedelta(pd_frame.prepTime, errors="coerce")
+        return pd_frame
+
+    @staticmethod
+    def filter_cooktime(user_pd_frame: pandas.DataFrame, total_time: timedelta) -> pandas.DataFrame:
+        """Filter the given DataFrame for the whole cooktime (cookTime+prepTime).
+        Only return the recipes with less-equal time
+
+        Args:
+            user_pd_frame (pandas.DataFrame): DataFrame to filter
+            total_time (timedelta): Max cooktime
+
+        Returns:
+            pandas.DataFrame: DataFrame of booleans
+        """
+        return (user_pd_frame.cookTime + user_pd_frame.prepTime) <= total_time
+
+    @staticmethod
+    def filter_keyword(user_pd_frame: pandas.DataFrame, keyword: str) -> pandas.DataFrame:
+        """Filter the given DataFrame if the keyword is one of the columns `name`, `description` or `recipeInstrucions`
+
+        Args:
+            user_pd_frame (pandas.DataFrame): DataFrame to filter
+            keyword (str): The keyword to find
+
+        Returns:
+            pandas.DataFrame: DataFrame of booleans
+        """
+        tmp_data = [False for _ in range(user_pd_frame.shape[0])]
+        bool_tmp = pandas.core.series.Series(data=tmp_data)
+
+        for label in ["name", "description", "recipeInstructions"]:
+            colum: pandas.core.series.Series = user_pd_frame[label]
+            bool_tmp |= colum.str.contains(pat=keyword, case=False, na=False, regex=True)
+
+        return bool_tmp
+
+
+recipe_db = RecipeDB()
diff --git a/poetry.lock b/poetry.lock
index 59a8fec..d185fb5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -400,6 +400,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "numpy"
+version = "1.22.2"
+description = "NumPy is the fundamental package for array computing with Python."
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -411,6 +419,27 @@ python-versions = ">=3.6"
 [package.dependencies]
 pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
+[[package]]
+name = "pandas"
+version = "1.4.0"
+description = "Powerful data structures for data analysis, time series, and statistics"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+numpy = [
+    {version = ">=1.18.5", markers = "platform_machine != \"aarch64\" and platform_machine != \"arm64\" and python_version < \"3.10\""},
+    {version = ">=1.19.2", markers = "platform_machine == \"aarch64\" and python_version < \"3.10\""},
+    {version = ">=1.20.0", markers = "platform_machine == \"arm64\" and python_version < \"3.10\""},
+    {version = ">=1.21.0", markers = "python_version >= \"3.10\""},
+]
+python-dateutil = ">=2.8.1"
+pytz = ">=2020.1"
+
+[package.extras]
+test = ["hypothesis (>=5.5.3)", "pytest (>=6.0)", "pytest-xdist (>=1.31)"]
+
 [[package]]
 name = "passlib"
 version = "1.7.4"
@@ -614,6 +643,17 @@ pytest = ">=5.0"
 [package.extras]
 dev = ["pre-commit", "tox", "pytest-asyncio"]
 
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+description = "Extensions to the standard Python datetime module"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+
+[package.dependencies]
+six = ">=1.5"
+
 [[package]]
 name = "python-dotenv"
 version = "0.19.2"
@@ -654,6 +694,14 @@ python-versions = "*"
 [package.dependencies]
 six = ">=1.4.0"
 
+[[package]]
+name = "pytz"
+version = "2021.3"
+description = "World timezone definitions, modern and historical"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pyyaml"
 version = "6.0"
@@ -826,7 +874,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.9"
-content-hash = "b82df44b92f17fe29be59f89ecc2e9b757e0da06c08d38601bae185462651b23"
+content-hash = "328d81c532fde044e40bee9d8e8b1585597d28ef7de30df1fbbefe029592c0f9"
 
 [metadata.files]
 aiofiles = [
@@ -1161,10 +1209,54 @@ nodeenv = [
     {file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
     {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
 ]
+numpy = [
+    {file = "numpy-1.22.2-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:515a8b6edbb904594685da6e176ac9fbea8f73a5ebae947281de6613e27f1956"},
+    {file = "numpy-1.22.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:76a4f9bce0278becc2da7da3b8ef854bed41a991f4226911a24a9711baad672c"},
+    {file = "numpy-1.22.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:168259b1b184aa83a514f307352c25c56af111c269ffc109d9704e81f72e764b"},
+    {file = "numpy-1.22.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3556c5550de40027d3121ebbb170f61bbe19eb639c7ad0c7b482cd9b560cd23b"},
+    {file = "numpy-1.22.2-cp310-cp310-win_amd64.whl", hash = "sha256:aafa46b5a39a27aca566198d3312fb3bde95ce9677085efd02c86f7ef6be4ec7"},
+    {file = "numpy-1.22.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:55535c7c2f61e2b2fc817c5cbe1af7cb907c7f011e46ae0a52caa4be1f19afe2"},
+    {file = "numpy-1.22.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:60cb8e5933193a3cc2912ee29ca331e9c15b2da034f76159b7abc520b3d1233a"},
+    {file = "numpy-1.22.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b536b6840e84c1c6a410f3a5aa727821e6108f3454d81a5cd5900999ef04f89"},
+    {file = "numpy-1.22.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2638389562bda1635b564490d76713695ff497242a83d9b684d27bb4a6cc9d7a"},
+    {file = "numpy-1.22.2-cp38-cp38-win32.whl", hash = "sha256:6767ad399e9327bfdbaa40871be4254d1995f4a3ca3806127f10cec778bd9896"},
+    {file = "numpy-1.22.2-cp38-cp38-win_amd64.whl", hash = "sha256:03ae5850619abb34a879d5f2d4bb4dcd025d6d8fb72f5e461dae84edccfe129f"},
+    {file = "numpy-1.22.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:d76a26c5118c4d96e264acc9e3242d72e1a2b92e739807b3b69d8d47684b6677"},
+    {file = "numpy-1.22.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:15efb7b93806d438e3bc590ca8ef2f953b0ce4f86f337ef4559d31ec6cf9d7dd"},
+    {file = "numpy-1.22.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:badca914580eb46385e7f7e4e426fea6de0a37b9e06bec252e481ae7ec287082"},
+    {file = "numpy-1.22.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94dd11d9f13ea1be17bac39c1942f527cbf7065f94953cf62dfe805653da2f8f"},
+    {file = "numpy-1.22.2-cp39-cp39-win32.whl", hash = "sha256:8cf33634b60c9cef346663a222d9841d3bbbc0a2f00221d6bcfd0d993d5543f6"},
+    {file = "numpy-1.22.2-cp39-cp39-win_amd64.whl", hash = "sha256:59153979d60f5bfe9e4c00e401e24dfe0469ef8da6d68247439d3278f30a180f"},
+    {file = "numpy-1.22.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a176959b6e7e00b5a0d6f549a479f869829bfd8150282c590deee6d099bbb6e"},
+    {file = "numpy-1.22.2.zip", hash = "sha256:076aee5a3763d41da6bef9565fdf3cb987606f567cd8b104aded2b38b7b47abf"},
+]
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
+pandas = [
+    {file = "pandas-1.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:de62cf699122dcef175988f0714678e59c453dc234c5b47b7136bfd7641e3c8c"},
+    {file = "pandas-1.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:46a18572f3e1cb75db59d9461940e9ba7ee38967fa48dd58f4139197f6e32280"},
+    {file = "pandas-1.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:73f7da2ccc38cc988b74e5400b430b7905db5f2c413ff215506bea034eaf832d"},
+    {file = "pandas-1.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5229c95db3a907451dacebc551492db6f7d01743e49bbc862f4a6010c227d187"},
+    {file = "pandas-1.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe454180ad31bbbe1e5d111b44443258730467f035e26b4e354655ab59405871"},
+    {file = "pandas-1.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:784cca3f69cfd7f6bd7c7fdb44f2bbab17e6de55725e9ff36d6f382510dfefb5"},
+    {file = "pandas-1.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:de8f8999864399529e8514a2e6bfe00fd161f0a667903655552ed12e583ae3cb"},
+    {file = "pandas-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0f19504f2783526fb5b4de675ea69d68974e21c1624f4b92295d057a31d5ec5f"},
+    {file = "pandas-1.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f045bb5c6bfaba536089573bf97d6b8ccc7159d951fe63904c395a5e486fbe14"},
+    {file = "pandas-1.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5280d057ddae06fe4a3cd6aa79040b8c205cd6dd21743004cf8635f39ed01712"},
+    {file = "pandas-1.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f3b74335390dda49f5d5089fab71958812bf56f42aa27663ee4c16d19f4f1c5"},
+    {file = "pandas-1.4.0-cp38-cp38-win32.whl", hash = "sha256:51e5da3802aaee1aa4254108ffaf1129a15fb3810b7ce8da1ec217c655b418f5"},
+    {file = "pandas-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:f103a5cdcd66cb18882ccdc18a130c31c3cfe3529732e7f10a8ab3559164819c"},
+    {file = "pandas-1.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:4a8d5a200f8685e7ea562b2f022c77ab7cb82c1ca5b240e6965faa6f84e5c1e9"},
+    {file = "pandas-1.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b5af258c7b090cca7b742cf2bd67ad1919aa9e4e681007366c9edad2d6a3d42b"},
+    {file = "pandas-1.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:156aac90dd7b303bf0b91bae96c0503212777f86c731e41929c571125d26c8e9"},
+    {file = "pandas-1.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2dad075089e17a72391de33021ad93720aff258c3c4b68c78e1cafce7e447045"},
+    {file = "pandas-1.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d59c958d6b8f96fdf850c7821571782168d5acfe75ccf78cd8d1ac15fb921df"},
+    {file = "pandas-1.4.0-cp39-cp39-win32.whl", hash = "sha256:55ec0e192eefa26d823fc25a1f213d6c304a3592915f368e360652994cdb8d9a"},
+    {file = "pandas-1.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:23c04dab11f3c6359cfa7afa83d3d054a8f8c283d773451184d98119ef54da97"},
+    {file = "pandas-1.4.0.tar.gz", hash = "sha256:cdd76254c7f0a1583bd4e4781fb450d0ebf392e10d3f12e92c95575942e37df5"},
+]
 passlib = [
     {file = "passlib-1.7.4-py2.py3-none-any.whl", hash = "sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1"},
     {file = "passlib-1.7.4.tar.gz", hash = "sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"},
@@ -1286,6 +1378,10 @@ pytest-mock = [
     {file = "pytest-mock-3.6.1.tar.gz", hash = "sha256:40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"},
     {file = "pytest_mock-3.6.1-py3-none-any.whl", hash = "sha256:30c2f2cc9759e76eee674b81ea28c9f0b94f8f0445a1b87762cadf774f0df7e3"},
 ]
+python-dateutil = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
 python-dotenv = [
     {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"},
     {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"},
@@ -1297,6 +1393,10 @@ python-jose = [
 python-multipart = [
     {file = "python-multipart-0.0.5.tar.gz", hash = "sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"},
 ]
+pytz = [
+    {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"},
+    {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"},
+]
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
diff --git a/pyproject.toml b/pyproject.toml
index bda3a81..b5fcf7f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,6 +21,7 @@ gunicorn = "^20.1.0"
 python-dotenv = "^0.19.2"
 python-multipart = "^0.0.5"
 python-jose = "^3.3.0"
+pandas = "^1.4.0"
 
 [tool.poetry.dev-dependencies]
 black = "^21.10b0"
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 8e05fe7..19ab689 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -296,9 +296,51 @@ mypy-extensions==0.4.3; python_full_version >= "3.6.2" \
 nodeenv==1.6.0; python_full_version >= "3.6.1" \
     --hash=sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7 \
     --hash=sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b
+numpy==1.22.2 \
+    --hash=sha256:515a8b6edbb904594685da6e176ac9fbea8f73a5ebae947281de6613e27f1956 \
+    --hash=sha256:76a4f9bce0278becc2da7da3b8ef854bed41a991f4226911a24a9711baad672c \
+    --hash=sha256:168259b1b184aa83a514f307352c25c56af111c269ffc109d9704e81f72e764b \
+    --hash=sha256:3556c5550de40027d3121ebbb170f61bbe19eb639c7ad0c7b482cd9b560cd23b \
+    --hash=sha256:aafa46b5a39a27aca566198d3312fb3bde95ce9677085efd02c86f7ef6be4ec7 \
+    --hash=sha256:55535c7c2f61e2b2fc817c5cbe1af7cb907c7f011e46ae0a52caa4be1f19afe2 \
+    --hash=sha256:60cb8e5933193a3cc2912ee29ca331e9c15b2da034f76159b7abc520b3d1233a \
+    --hash=sha256:0b536b6840e84c1c6a410f3a5aa727821e6108f3454d81a5cd5900999ef04f89 \
+    --hash=sha256:2638389562bda1635b564490d76713695ff497242a83d9b684d27bb4a6cc9d7a \
+    --hash=sha256:6767ad399e9327bfdbaa40871be4254d1995f4a3ca3806127f10cec778bd9896 \
+    --hash=sha256:03ae5850619abb34a879d5f2d4bb4dcd025d6d8fb72f5e461dae84edccfe129f \
+    --hash=sha256:d76a26c5118c4d96e264acc9e3242d72e1a2b92e739807b3b69d8d47684b6677 \
+    --hash=sha256:15efb7b93806d438e3bc590ca8ef2f953b0ce4f86f337ef4559d31ec6cf9d7dd \
+    --hash=sha256:badca914580eb46385e7f7e4e426fea6de0a37b9e06bec252e481ae7ec287082 \
+    --hash=sha256:94dd11d9f13ea1be17bac39c1942f527cbf7065f94953cf62dfe805653da2f8f \
+    --hash=sha256:8cf33634b60c9cef346663a222d9841d3bbbc0a2f00221d6bcfd0d993d5543f6 \
+    --hash=sha256:59153979d60f5bfe9e4c00e401e24dfe0469ef8da6d68247439d3278f30a180f \
+    --hash=sha256:4a176959b6e7e00b5a0d6f549a479f869829bfd8150282c590deee6d099bbb6e \
+    --hash=sha256:076aee5a3763d41da6bef9565fdf3cb987606f567cd8b104aded2b38b7b47abf
 packaging==21.3; python_version >= "3.6" \
     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 \
     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb
+pandas==1.4.0; python_version >= "3.8" \
+    --hash=sha256:de62cf699122dcef175988f0714678e59c453dc234c5b47b7136bfd7641e3c8c \
+    --hash=sha256:46a18572f3e1cb75db59d9461940e9ba7ee38967fa48dd58f4139197f6e32280 \
+    --hash=sha256:73f7da2ccc38cc988b74e5400b430b7905db5f2c413ff215506bea034eaf832d \
+    --hash=sha256:5229c95db3a907451dacebc551492db6f7d01743e49bbc862f4a6010c227d187 \
+    --hash=sha256:fe454180ad31bbbe1e5d111b44443258730467f035e26b4e354655ab59405871 \
+    --hash=sha256:784cca3f69cfd7f6bd7c7fdb44f2bbab17e6de55725e9ff36d6f382510dfefb5 \
+    --hash=sha256:de8f8999864399529e8514a2e6bfe00fd161f0a667903655552ed12e583ae3cb \
+    --hash=sha256:0f19504f2783526fb5b4de675ea69d68974e21c1624f4b92295d057a31d5ec5f \
+    --hash=sha256:f045bb5c6bfaba536089573bf97d6b8ccc7159d951fe63904c395a5e486fbe14 \
+    --hash=sha256:5280d057ddae06fe4a3cd6aa79040b8c205cd6dd21743004cf8635f39ed01712 \
+    --hash=sha256:1f3b74335390dda49f5d5089fab71958812bf56f42aa27663ee4c16d19f4f1c5 \
+    --hash=sha256:51e5da3802aaee1aa4254108ffaf1129a15fb3810b7ce8da1ec217c655b418f5 \
+    --hash=sha256:f103a5cdcd66cb18882ccdc18a130c31c3cfe3529732e7f10a8ab3559164819c \
+    --hash=sha256:4a8d5a200f8685e7ea562b2f022c77ab7cb82c1ca5b240e6965faa6f84e5c1e9 \
+    --hash=sha256:b5af258c7b090cca7b742cf2bd67ad1919aa9e4e681007366c9edad2d6a3d42b \
+    --hash=sha256:156aac90dd7b303bf0b91bae96c0503212777f86c731e41929c571125d26c8e9 \
+    --hash=sha256:2dad075089e17a72391de33021ad93720aff258c3c4b68c78e1cafce7e447045 \
+    --hash=sha256:1d59c958d6b8f96fdf850c7821571782168d5acfe75ccf78cd8d1ac15fb921df \
+    --hash=sha256:55ec0e192eefa26d823fc25a1f213d6c304a3592915f368e360652994cdb8d9a \
+    --hash=sha256:23c04dab11f3c6359cfa7afa83d3d054a8f8c283d773451184d98119ef54da97 \
+    --hash=sha256:cdd76254c7f0a1583bd4e4781fb450d0ebf392e10d3f12e92c95575942e37df5
 passlib==1.7.4 \
     --hash=sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1 \
     --hash=sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04
@@ -403,6 +445,9 @@ pytest-mock==3.6.1; python_version >= "3.6" \
 pytest==6.2.5; python_version >= "3.6" \
     --hash=sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134 \
     --hash=sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89
+python-dateutil==2.8.2; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8" \
+    --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
+    --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
 python-dotenv==0.19.2; python_version >= "3.5" \
     --hash=sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f \
     --hash=sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3
@@ -411,6 +456,9 @@ python-jose==3.3.0 \
     --hash=sha256:9b1376b023f8b298536eedd47ae1089bcdb848f1535ab30555cd92002d78923a
 python-multipart==0.0.5 \
     --hash=sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43
+pytz==2021.3; python_version >= "3.8" \
+    --hash=sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c \
+    --hash=sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326
 pyyaml==6.0; python_version >= "3.6" and python_full_version >= "3.6.1" \
     --hash=sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53 \
     --hash=sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c \
@@ -501,7 +549,7 @@ rfc3986==1.5.0; python_version >= "3.6" \
 rsa==4.8; python_version >= "3.6" and python_version < "4" \
     --hash=sha256:95c5d300c4e879ee69708c428ba566c59478fd653cc3a22243eeb8ed846950bb \
     --hash=sha256:5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17
-six==1.16.0; python_full_version >= "3.6.1" and python_version >= "3.6" \
+six==1.16.0; python_full_version >= "3.6.1" and python_version >= "3.8" \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
 sniffio==1.2.0; python_version >= "3.6" and python_full_version >= "3.6.2" \
diff --git a/requirements.txt b/requirements.txt
index 6001695..4eddfdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -231,6 +231,48 @@ markupsafe==2.0.1; python_version >= "3.6" \
     --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \
     --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \
     --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a
+numpy==1.22.2 \
+    --hash=sha256:515a8b6edbb904594685da6e176ac9fbea8f73a5ebae947281de6613e27f1956 \
+    --hash=sha256:76a4f9bce0278becc2da7da3b8ef854bed41a991f4226911a24a9711baad672c \
+    --hash=sha256:168259b1b184aa83a514f307352c25c56af111c269ffc109d9704e81f72e764b \
+    --hash=sha256:3556c5550de40027d3121ebbb170f61bbe19eb639c7ad0c7b482cd9b560cd23b \
+    --hash=sha256:aafa46b5a39a27aca566198d3312fb3bde95ce9677085efd02c86f7ef6be4ec7 \
+    --hash=sha256:55535c7c2f61e2b2fc817c5cbe1af7cb907c7f011e46ae0a52caa4be1f19afe2 \
+    --hash=sha256:60cb8e5933193a3cc2912ee29ca331e9c15b2da034f76159b7abc520b3d1233a \
+    --hash=sha256:0b536b6840e84c1c6a410f3a5aa727821e6108f3454d81a5cd5900999ef04f89 \
+    --hash=sha256:2638389562bda1635b564490d76713695ff497242a83d9b684d27bb4a6cc9d7a \
+    --hash=sha256:6767ad399e9327bfdbaa40871be4254d1995f4a3ca3806127f10cec778bd9896 \
+    --hash=sha256:03ae5850619abb34a879d5f2d4bb4dcd025d6d8fb72f5e461dae84edccfe129f \
+    --hash=sha256:d76a26c5118c4d96e264acc9e3242d72e1a2b92e739807b3b69d8d47684b6677 \
+    --hash=sha256:15efb7b93806d438e3bc590ca8ef2f953b0ce4f86f337ef4559d31ec6cf9d7dd \
+    --hash=sha256:badca914580eb46385e7f7e4e426fea6de0a37b9e06bec252e481ae7ec287082 \
+    --hash=sha256:94dd11d9f13ea1be17bac39c1942f527cbf7065f94953cf62dfe805653da2f8f \
+    --hash=sha256:8cf33634b60c9cef346663a222d9841d3bbbc0a2f00221d6bcfd0d993d5543f6 \
+    --hash=sha256:59153979d60f5bfe9e4c00e401e24dfe0469ef8da6d68247439d3278f30a180f \
+    --hash=sha256:4a176959b6e7e00b5a0d6f549a479f869829bfd8150282c590deee6d099bbb6e \
+    --hash=sha256:076aee5a3763d41da6bef9565fdf3cb987606f567cd8b104aded2b38b7b47abf
+pandas==1.4.0; python_version >= "3.8" \
+    --hash=sha256:de62cf699122dcef175988f0714678e59c453dc234c5b47b7136bfd7641e3c8c \
+    --hash=sha256:46a18572f3e1cb75db59d9461940e9ba7ee38967fa48dd58f4139197f6e32280 \
+    --hash=sha256:73f7da2ccc38cc988b74e5400b430b7905db5f2c413ff215506bea034eaf832d \
+    --hash=sha256:5229c95db3a907451dacebc551492db6f7d01743e49bbc862f4a6010c227d187 \
+    --hash=sha256:fe454180ad31bbbe1e5d111b44443258730467f035e26b4e354655ab59405871 \
+    --hash=sha256:784cca3f69cfd7f6bd7c7fdb44f2bbab17e6de55725e9ff36d6f382510dfefb5 \
+    --hash=sha256:de8f8999864399529e8514a2e6bfe00fd161f0a667903655552ed12e583ae3cb \
+    --hash=sha256:0f19504f2783526fb5b4de675ea69d68974e21c1624f4b92295d057a31d5ec5f \
+    --hash=sha256:f045bb5c6bfaba536089573bf97d6b8ccc7159d951fe63904c395a5e486fbe14 \
+    --hash=sha256:5280d057ddae06fe4a3cd6aa79040b8c205cd6dd21743004cf8635f39ed01712 \
+    --hash=sha256:1f3b74335390dda49f5d5089fab71958812bf56f42aa27663ee4c16d19f4f1c5 \
+    --hash=sha256:51e5da3802aaee1aa4254108ffaf1129a15fb3810b7ce8da1ec217c655b418f5 \
+    --hash=sha256:f103a5cdcd66cb18882ccdc18a130c31c3cfe3529732e7f10a8ab3559164819c \
+    --hash=sha256:4a8d5a200f8685e7ea562b2f022c77ab7cb82c1ca5b240e6965faa6f84e5c1e9 \
+    --hash=sha256:b5af258c7b090cca7b742cf2bd67ad1919aa9e4e681007366c9edad2d6a3d42b \
+    --hash=sha256:156aac90dd7b303bf0b91bae96c0503212777f86c731e41929c571125d26c8e9 \
+    --hash=sha256:2dad075089e17a72391de33021ad93720aff258c3c4b68c78e1cafce7e447045 \
+    --hash=sha256:1d59c958d6b8f96fdf850c7821571782168d5acfe75ccf78cd8d1ac15fb921df \
+    --hash=sha256:55ec0e192eefa26d823fc25a1f213d6c304a3592915f368e360652994cdb8d9a \
+    --hash=sha256:23c04dab11f3c6359cfa7afa83d3d054a8f8c283d773451184d98119ef54da97 \
+    --hash=sha256:cdd76254c7f0a1583bd4e4781fb450d0ebf392e10d3f12e92c95575942e37df5
 passlib==1.7.4 \
     --hash=sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1 \
     --hash=sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04
@@ -299,6 +341,9 @@ pydantic==1.9.0; python_full_version >= "3.6.1" \
     --hash=sha256:2cc6a4cb8a118ffec2ca5fcb47afbacb4f16d0ab8b7350ddea5e8ef7bcc53a16 \
     --hash=sha256:085ca1de245782e9b46cefcf99deecc67d418737a1fd3f6a4f511344b613a5b3 \
     --hash=sha256:742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a
+python-dateutil==2.8.2; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8" \
+    --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
+    --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
 python-dotenv==0.19.2; python_version >= "3.5" \
     --hash=sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f \
     --hash=sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3
@@ -307,13 +352,16 @@ python-jose==3.3.0 \
     --hash=sha256:9b1376b023f8b298536eedd47ae1089bcdb848f1535ab30555cd92002d78923a
 python-multipart==0.0.5 \
     --hash=sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43
+pytz==2021.3; python_version >= "3.8" \
+    --hash=sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c \
+    --hash=sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326
 rfc3986==1.5.0; python_version >= "3.6" \
     --hash=sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97 \
     --hash=sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835
 rsa==4.8; python_version >= "3.6" and python_version < "4" \
     --hash=sha256:95c5d300c4e879ee69708c428ba566c59478fd653cc3a22243eeb8ed846950bb \
     --hash=sha256:5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17
-six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" \
+six==1.16.0; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8" \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
 sniffio==1.2.0; python_version >= "3.6" and python_full_version >= "3.6.2" \