Merge branch 'dev'

main.py

@@ -1,13 +1,13 @@
 """Script implementing the MVC pattern using SQLAlchemy ORM and WTForms
 
 To activate Sentry :
-1. Create a new Sentry project at https://sentry.io/ and get your dsn_key
-2. in the .env file, replace 'DEBUG=True' by 'SENTRY=dsn_key'
+1. Create a new Sentry project at https://sentry.io/ and get your 'dsn_key'
+2. in the .env file, set SENTRY_DSN='dsn_key' without any quotes
 
 """
-
 from src.controllers.login import Controller
+from src.utils.shell import clear_shell
 
 if __name__ == "__main__":
-    Controller.clear_shell()
+    clear_shell()
     Controller.run()

setup.cfg

@@ -8,5 +8,5 @@ htmldir = flake8_html_report
 python_files = test*
 
 [coverage:run]
-omit = tests/*, main.py, src/settings/*
+omit = tests/*, main.py, src/settings/*, shell.py, fernet.py
 

src/controllers/collaborator.py

@@ -3,6 +3,7 @@
 from ..models.collaborator import Collaborator
 from ..models.department import Department
 from ..utils.fernet import Fernet
+from ..utils.session import session_is_expired
 from ..views.collaborator import View
 
 model1 = Collaborator
@@ -14,8 +15,17 @@ class Controller:
     def run(self, session, user):
         self._menu(session, user)
 
+    @classmethod
+    def return_to_menu(self, session, user):
+        self._menu(session, user)
+
     @classmethod
     def _menu(self, session, user) -> bool:
+        if session_is_expired(user):
+            View.logout()
+
+            return None
+
         View.print_menu()
 
         choice = View.get_user_choice()
@@ -43,7 +53,7 @@ def _menu(self, session, user) -> bool:
         if choice == 6:
             self._delete(session)
 
-        self._menu(session, user)
+        self.return_to_menu(session, user)
 
     @classmethod
     def _list(self, session):

src/controllers/contract.py

@@ -2,6 +2,7 @@
 
 from ..models.contract_event import Contract
 from ..models.customer import Customer
+from ..utils.session import session_is_expired
 from ..utils.slugify import slugify
 from ..views.contract import View
 
@@ -14,8 +15,17 @@ class Controller:
     def run(self, session, user):
         self._menu(session, user)
 
+    @classmethod
+    def return_to_menu(self, session, user):
+        self._menu(session, user)
+
     @classmethod
     def _menu(self, session, user) -> bool:
+        if session_is_expired(user):
+            View.logout()
+
+            return None
+
         if user.role == "Gestion":
             View.print_gestion_menu()
 
@@ -56,7 +66,7 @@ def _menu(self, session, user) -> bool:
         if choice == 8 and user.role == "Gestion":
             self._delete(session)
 
-        self._menu(session, user)
+        self.return_to_menu(session, user)
 
     @classmethod
     def _list(self, session):

src/controllers/customer.py

@@ -1,6 +1,7 @@
 # pylint: disable=no-member
 from ..models.company import Company
 from ..models.customer import Customer
+from ..utils.session import session_is_expired
 from ..utils.slugify import slugify
 from ..views.customer import View
 
@@ -10,8 +11,17 @@ class Controller:
     def run(self, session, user):
         self._menu(session, user)
 
+    @classmethod
+    def return_to_menu(self, session, user):
+        self._menu(session, user)
+
     @classmethod
     def _menu(self, session, user) -> bool:
+        if session_is_expired(user):
+            View.logout()
+
+            return None
+
         if user.role == "Commercial":
             View.print_commercial_menu()
         else:
@@ -42,7 +52,7 @@ def _menu(self, session, user) -> bool:
         if choice == 6 and user.role == "Commercial":
             self._delete(session, user)
 
-        self._menu(session, user)
+        self.return_to_menu(session, user)
 
     @classmethod
     def _list(self, session):

src/controllers/event.py

@@ -2,6 +2,7 @@
 from ..models.collaborator import Collaborator
 from ..models.contract_event import Contract, Event
 from ..models.location import Location
+from ..utils.session import session_is_expired
 from ..utils.slugify import slugify
 from ..views.event import View
 
@@ -14,8 +15,17 @@ class Controller:
     def run(self, session, user):
         self._menu(session, user)
 
+    @classmethod
+    def return_to_menu(self, session, user):
+        self._menu(session, user)
+
     @classmethod
     def _menu(self, session, user) -> bool:
+        if session_is_expired(user):
+            View.logout()
+
+            return None
+
         if user.role == "Gestion":
             View.print_gestion_menu()
 
@@ -59,7 +69,7 @@ def _menu(self, session, user) -> bool:
         if choice == 6 and user.role == "Commercial":
             self._delete(session, user)
 
-        self._menu(session, user)
+        self.return_to_menu(session, user)
 
     @classmethod
     def _list(self, session):

src/controllers/home.py

@@ -1,3 +1,4 @@
+from ..utils.session import session_is_expired
 from ..views.home import View
 from . import collaborator, contract, customer, event
 
@@ -7,8 +8,17 @@ class Controller:
     def run(self, session, user):
         self._menu(session, user)
 
+    @classmethod
+    def return_to_menu(self, session, user):
+        self._menu(session, user)
+
     @classmethod
     def _menu(self, session, user):
+        if session_is_expired(user):
+            View.logout()
+
+            return None
+
         if user.role == "Gestion":
             View.print_gestion_menu()
         else:
@@ -19,6 +29,8 @@ def _menu(self, session, user):
         if choice == 0:
             View.logout()
 
+            return None
+
         if choice == 1:
             customer.Controller.run(session, user)
 
@@ -31,4 +43,4 @@ def _menu(self, session, user):
         if choice == 4 and user.role == "Gestion":
             collaborator.Controller.run(session, user)
 
-        self._menu(session, user)
+        self.return_to_menu(session, user)

src/controllers/login.py

@@ -1,5 +1,3 @@
-import os
-
 from ..forms.collaborator import FirstConnexionForm
 from ..models.collaborator import Collaborator
 from ..models.department import Department
@@ -10,18 +8,31 @@
 
 
 class Controller:
+    session = init_db()
+
     @classmethod
     def run(self):
-        session = init_db()
+        # session = init_db()
+
+        # collaborators = session.query(Collaborator).all()
 
-        collaborators = session.query(Collaborator).all()
+        # if collaborators:
+        #     self._menu(session)
+        # else:
+        #     self._create_gestion_account(session)
+        #     self._menu(session)
+
+        collaborators = self.session.query(Collaborator).all()
 
         if collaborators:
-            self._menu(session)
+            self._menu(self.session)
         else:
-            self._create_gestion_account(session)
+            self._create_gestion_account(self.session)
+            self._menu(self.session)
 
-        self.run()
+    @classmethod
+    def return_to_menu(self, session):
+        self._menu(session)
 
     @classmethod
     def _menu(self, session):
@@ -33,6 +44,8 @@ def _menu(self, session):
             # 1. quit
             View.logout()
 
+            return None
+
         if choice == 1:
             # 1. login
             user = self._login(session)
@@ -48,7 +61,7 @@ def _menu(self, session):
             user = self._first_login(session)
             self._create_password(session, user)
 
-        self._menu(session)
+        self.return_to_menu(session)
 
     @classmethod
     def _create_gestion_account(self, session):
@@ -172,10 +185,3 @@ def _create_password(self, session, user):
             View.print_password_update_success()
         else:
             View.print_forms_errors(form)
-
-    @classmethod
-    def clear_shell(self):
-        if os.name == "posix":  # Unix/Linux
-            os.system("clear")
-        if os.name == "nt":  # Windows
-            os.system("cls")

src/models/collaborator.py

@@ -1,5 +1,7 @@
+from datetime import datetime
+
 import bcrypt
-from sqlalchemy import Column, Date, DateTime, ForeignKey, Integer, String, func
+from sqlalchemy import Column, Date, DateTime, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
 
 from src.utils.fernet import Fernet
@@ -87,7 +89,7 @@ def check_password(self, password: str, hashed_password: bytes) -> bool:
     def authenticate(self, session, email: str, password: str):
         collaborator = self.get_with_clear_email(session, email)
         if collaborator and self.check_password(password, collaborator.password):
-            collaborator.last_login = func.now()
+            collaborator.last_login = datetime.utcnow()
             session.commit()
 
             return collaborator

src/settings/settings.py

@@ -31,8 +31,6 @@ def create_fernet() -> Fernet:
 
 fernet = create_fernet()
 
-PUBLIC_KEY = "public_key"
-
 
 def init_db(Base=Base):
     engine = create_engine("sqlite:///" + str(BASE_DIR / "db.sqlite3"))

src/utils/session.py

@@ -0,0 +1,8 @@
+from datetime import datetime, timedelta
+
+
+def session_is_expired(user) -> bool:
+    """used to disconnect the user after 12 hours"""
+
+    if datetime.utcnow() > user.last_login + timedelta(hours=12):
+        return True

src/utils/shell.py

@@ -0,0 +1,8 @@
+import os
+
+
+def clear_shell():
+    if os.name == "posix":  # Unix/Linux
+        os.system("clear")
+    if os.name == "nt":  # Windows
+        os.system("cls")

src/views/collaborator.py

@@ -22,13 +22,8 @@ def print_menu(self):
         console.print(f"\nMenu {self.name.title()}", style="bold", justify="center")
         console.print("__________________", justify="center")
 
-        console.print("\n0. Retour", style="bold", justify="center")
-        console.print("\n1. Lister", style="bold", justify="center")
-        console.print("\n2. Rechercher", style="bold", justify="center")
-        console.print("\n3. Détail", style="bold", justify="center")
-        console.print("\n4. Créer", style="bold", justify="center")
-        console.print("\n5. Modifier", style="bold", justify="center")
-        console.print("\n6. Supprimer", style="bold", justify="center")
+        self.print_read_only_menu()
+        self.print_edit_menu()
 
     @classmethod
     def print_list(self, qs: list, list_name: str, page_size=5):

src/views/contract.py

@@ -37,10 +37,7 @@ def print_menu(self):
         console.print(f"\nMenu {self.name.title()}", style="bold", justify="center")
         console.print("____________", justify="center")
 
-        console.print("\n0. Retour", style="bold", justify="center")
-        console.print("\n1. Lister", style="bold", justify="center")
-        console.print("\n2. Rechercher", style="bold", justify="center")
-        console.print("\n3. Détail", style="bold", justify="center")
+        self.print_read_only_menu()
 
     @classmethod
     def print_list(self, qs: list[model], list_name: str, page_size=5):