Feature/weightt (#277)

Author: fandomario

app/database/models.py

@@ -48,6 +48,7 @@ class User(Base):
     privacy = Column(String, default="Private", nullable=False)
     is_manager = Column(Boolean, default=False)
     language_id = Column(Integer, ForeignKey("languages.id"))
+    target_weight = Column(Float, nullable=True)
 
     owned_events = relationship(
         "Event",

app/main.py

@@ -43,7 +43,7 @@ def create_tables(engine, psql_environment):
     about_us, agenda, calendar, categories, celebrity, credits,
     currency, dayview, email, event, export, four_o_four, friendview,
     google_connect, invitation, joke, login, logout, profile,
-    register, search, telegram, user, weekview, whatsapp,
+    register, search, telegram, user, weekview, weight, whatsapp,
 )
 
 json_data_loader.load_to_database(next(get_db()))
@@ -74,12 +74,11 @@ async def swagger_ui_redirect():
     credits.router,
     currency.router,
     dayview.router,
-    friendview.router,
-    weekview.router,
     email.router,
     event.router,
     export.router,
     four_o_four.router,
+    friendview.router,
     google_connect.router,
     invitation.router,
     joke.router,
@@ -91,6 +90,8 @@ async def swagger_ui_redirect():
     search.router,
     telegram.router,
     user.router,
+    weekview.router,
+    weight.router,
     whatsapp.router,
 ]
 

app/routers/weight.py

@@ -0,0 +1,69 @@
+from typing import Union
+
+from fastapi import APIRouter, Depends, Request
+from sqlalchemy.orm import Session
+from starlette.responses import RedirectResponse
+
+from app.database.models import User
+from app.dependencies import get_db
+from app.dependencies import templates
+
+
+router = APIRouter(tags=["weight"],)
+
+
+@router.get("/weight")
+async def get_weight(
+        request: Request,
+        session: Session = Depends(get_db),
+        target: Union[float, None] = None,
+        current_weight: Union[float, None] = None,
+        ):
+
+    # TODO Waiting for user registration
+    user_id = 1
+    user = session.query(User).filter_by(id=user_id).first()
+    target = user.target_weight
+    if current_weight:
+        return RedirectResponse(url='/')
+    return templates.TemplateResponse("weight.html", {
+        "request": request,
+        "target": target,
+        "current_weight": current_weight,
+        }
+    )
+
+
+@router.post("/weight")
+async def weight(
+        request: Request,
+        session: Session = Depends(get_db)):
+    user_id = 1
+    user = session.query(User).filter_by(id=user_id).first()
+    data = await request.form()
+    target = data['target']
+    current_weight = data['current_weight']
+    if target:
+        user.target_weight = target
+        session.commit()
+    else:
+        target = user.target_weight
+        if not target:
+            target = current_weight
+    way_to_go = float(current_weight) - float(target)
+    way_to_go = round(way_to_go, 2)
+    if way_to_go > 0:
+        way_message = f"Weight to lose: {way_to_go} Kg"
+    elif way_to_go < 0:
+        way_to_go = abs(way_to_go)
+        way_message = f"Weight to add: {way_to_go} Kg"
+    else:
+        way_message = f"Great! You have reached your goal: {target} Kg"
+
+    return templates.TemplateResponse("weight.html", {
+        "request": request,
+        "target": target,
+        "current_weight": current_weight,
+        "way_message": way_message
+        }
+    )

app/static/weight.css

@@ -0,0 +1,13 @@
+
+.weight {
+    display: block;
+    margin-top: 1rem;
+    margin-left: 1rem;
+  }
+
+
+.weight-message {
+  display: block;
+  margin-top: 1rem;
+  margin-left: 1rem;
+  }

app/templates/base.html

@@ -61,6 +61,9 @@
                                 <li class="nav-item"></li>
                                     <a class="nav-link" href="{{ url_for('category_color_insert') }}">Create Categories</a>
                                 </li>
+                                <li class="nav-item">
+                                    <a class="nav-link" href="{{ url_for('weight') }}">Weight</a>
+                                </li>
                                 <li class="nav-item">
                                     <a class="nav-link" href="{{ url_for('about') }}">{{ gettext("About Us") }}</a>
                                 </li>

app/templates/weight.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block content %}
+<form method="POST" action="/weight/">
+    <div class="mb-3 weight target_weight"><br>
+        <label for="target">Target</label><br>
+        <input class="target_weight" type="text" id="target" name="target" value={{ target }}><br>
+        <label for="current_weight"> Current Weight</label><br>
+        <input class="target_weight" type="text" id="current_weight" name="current_weight" value={{ current_weight }}>
+        <input class="target_weight" type="submit" value="calculate">
+    </div>
+</form>
+<div>
+    <div class="weight-message">
+    {% if way_message %}
+        <a> {{ way_message }} </a>
+    {% endif %}
+    </div>
+</div>
+<link href="{{ url_for('static', path='/weight.css') }}" rel="stylesheet">
+{% endblock %}

tests/client_fixture.py

@@ -8,7 +8,7 @@
 from app.database.models import Base, User
 from app.routers import (
     agenda, categories, event, friendview, google_connect,
-    invitation, profile
+    invitation, profile, weight,
 )
 from app.routers.salary import routes as salary
 from tests import security_testing_routes
@@ -54,6 +54,11 @@ def friendview_test_client() -> Generator[TestClient, None, None]:
     yield from create_test_client(friendview.get_db)
 
 
+@pytest.fixture(scope="session")
+def weight_test_client() -> Generator[TestClient, None, None]:
+    yield from create_test_client(weight.get_db)
+
+
 @pytest.fixture(scope="session")
 def event_test_client() -> Generator[TestClient, None, None]:
     yield from create_test_client(event.get_db)

tests/test_weight.py

@@ -0,0 +1,42 @@
+class TestWeight:
+    WEIGHT = "/weight"
+    WAY_TO_GO = b'15.5'
+    """Target weight set to 60"""
+
+    @staticmethod
+    def test_weight_ok(weight_test_client, user, session):
+        new_weight = {'target': user.target_weight, 'current_weight': 70}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert resp.ok
+
+    @staticmethod
+    def test_need_to_lose_weight(weight_test_client, user):
+        new_weight = {'target': user.target_weight, 'current_weight': 80}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert b"Weight to lose" in resp.content
+
+    @staticmethod
+    def test_need_to_gain_weight(weight_test_client, user):
+        new_weight = {'target': user.target_weight, 'current_weight': 50}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert b"Weight to add" in resp.content
+
+    @staticmethod
+    def test_reached_the_goal(weight_test_client, user):
+        new_weight = {'target': user.target_weight, 'current_weight': 60}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert b"reached your goal" in resp.content
+
+    @staticmethod
+    def test_way_to_go(weight_test_client, user):
+        new_weight = {'target': user.target_weight, 'current_weight': 75.5}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert TestWeight.WAY_TO_GO in resp.content
+
+    @staticmethod
+    def test_no_target_entered(weight_test_client, user):
+        """In this case, the target set to current weight"""
+
+        new_weight = {'target': '', 'current_weight': 60}
+        resp = weight_test_client.post(TestWeight.WEIGHT, data=new_weight)
+        assert b"reached your goal" in resp.content

tests/user_fixture.py

@@ -16,6 +16,7 @@ def user(session: Session) -> Generator[User, None, None]:
         password="test_password",
         email="test.email@gmail.com",
         language_id=1,
+        target_weight=60,
     )
     yield mock_user
     delete_instance(session, mock_user)