fix/ Fix de la détection de notifications

Author: etave

app/administration/routes.py

@@ -16,7 +16,7 @@
 from app.models.utilisateur import UTILISATEUR
 from app.models.a_acces import A_ACCES
 from app.models.role import ROLE
-from app.utils import Whoosh
+from app.utils import Whoosh, check_notitications
 from fasteners import InterProcessLock
 
 
@@ -37,6 +37,7 @@ def administration():
         roles=all_roles,
         is_admin=True,
         is_authenticated=True,
+        has_notifications=check_notitications(),
     )
 
 

app/decorators.py

@@ -5,7 +5,7 @@
 def admin_required(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
-        if not current_user.id_Role == 1:
+        if not current_user.is_admin():
             abort(403)
         return f(*args, **kwargs)
     return decorated_function

app/desktop/routes.py

@@ -4,8 +4,9 @@
 from app import socketio
 from app.extensions import db
 from app.models.fichier import FICHIER
+from app.utils import check_notitications
 
 @bp.route('/')
 @login_required
 def desktop():
-    return render_template('desktop/index.html', is_authenticated=True, is_admin=current_user.id_Role == 1, has_notifications=current_user.NOTIFICATION != [])
+    return render_template('desktop/index.html', is_authenticated=True, is_admin=current_user.is_admin(), has_notifications=check_notitications())

app/home/routes.py

@@ -7,6 +7,7 @@
 from app.models.a_recherche import A_RECHERCHE
 from app.forms.search_form import SearchForm
 from datetime import datetime
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -30,11 +31,12 @@ def home():
     if form.validate_on_submit():
         add_research(current_user.id_Utilisateur, form.search.data)
         return redirect(url_for("search.search", query=form.search.data))
+    print(current_user.NOTIFICATION)
     return render_template(
         "home/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         favorite_files=favorite_files,
         researches=researches,
         form=form,

app/models/utilisateur.py

@@ -25,6 +25,9 @@ def get_id(self):
 
     def to_dict(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    def is_admin(self):
+        return self.id_Role == 1
 
     FICHIER_: Mapped[List['FICHIER']] = relationship('FICHIER', secondary='FAVORIS', back_populates='UTILISATEUR_')
     ROLE_: Mapped[Optional['ROLE']] = relationship('ROLE', back_populates='UTILISATEUR')

app/notifications/routes.py

@@ -18,6 +18,7 @@
 from app.models.notification import NOTIFICATION
 from app.models.utilisateur import UTILISATEUR
 from app.models.role import ROLE
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET"])
@@ -36,7 +37,7 @@ def notifications():
         roles=roles,
         is_authenticated=True,
         is_admin=True,
-        has_notifications=current_user.NOTIFICATION != [],
+        has_notifications=check_notitications(),
     )
 
 

app/profil/routes.py

@@ -7,6 +7,7 @@
 from app.forms.edit_profil_form import Edit_profil_form
 from flask_bcrypt import check_password_hash, generate_password_hash
 from app.models.utilisateur import UTILISATEUR
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -20,8 +21,8 @@ def profil():
     return render_template(
         "profil/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         user=current_user,
         edit_mode=False,
     )
@@ -59,8 +60,8 @@ def edit():
     return render_template(
         "profil/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         user=current_user,
         form=form,
         edit_mode=True,

app/search/routes.py

@@ -8,6 +8,7 @@
 from app.forms.search_form import SearchForm
 from app import socketio
 from fasteners import InterProcessLock
+from app.utils import check_notitications
 
 
 @bp.route("/", methods=["GET", "POST"])
@@ -27,8 +28,8 @@ def search():
     return render_template(
         "search/index.html",
         is_authenticated=True,
-        is_admin=current_user.id_Role == 1,
-        has_notifications=current_user.NOTIFICATION != [],
+        is_admin=current_user.is_admin(),
+        has_notifications=check_notitications(),
         folders=results,
         query=query,
         form=form,

app/templates/base.html

@@ -37,7 +37,7 @@
                 </li>
                 {% if is_admin %}
                 <li>
-                    <a href="{{ url_for('administration.administration') }}">Admin</a>
+                    <a href="{{ url_for('administration.administration') }}">Administration</a>
                 </li>
                 <li>
                     <a href="{{ url_for('notifications.notifications') }}">

app/utils.py

@@ -25,6 +25,7 @@
 from app.extensions import db
 from flask_login import current_user
 from app.models.favoris import FAVORIS
+from app.models.notification import NOTIFICATION
 import re
 
 class SingletonMeta(type):
@@ -248,4 +249,12 @@ def read_pptx(self, file_path):
             for shape in slide.shapes:
                 if hasattr(shape, "text"):
                     text += shape.text
-        return text
+        return text
+
+def check_notitications():
+    """Check if there is any notification in the database.
+
+    Returns:
+        bool: True if there is any notification, False otherwise.
+    """
+    return NOTIFICATION.query.all() != []