Merge branch 'master' into event_management_helpers

Author: gdaviet

collectives/api/__init__.py

@@ -10,9 +10,9 @@
 
 """
 
-from collectives.api.autocomplete_user import find_users_by_fuzzy_name
 from collectives.api.autocomplete_reservation import find_equipment_types
 
+import collectives.api.autocomplete_user
 import collectives.api.admin
 import collectives.api.event
 import collectives.api.equipment

collectives/api/autocomplete_user.py

@@ -8,7 +8,7 @@
 
 from flask import request, abort
 from flask_login import current_user
-from sqlalchemy.sql import text
+from sqlalchemy.orm import Query
 from sqlalchemy import func, and_
 from marshmallow import fields
 
@@ -31,39 +31,18 @@ class Meta:
         fields = (
             "id",
             "full_name",
-            "license_expiry_date",
+            "is_active",
         )
 
 
-def find_users_by_fuzzy_name(pattern, limit=8):
-    """Find user for autocomplete from a part of their full name.
+def _make_autocomplete_query(pattern: str) -> Query:
+    """Builds the autocomplete query for the provided pattern"""
 
-    Comparison are case insensitive.
+    query = db.session.query(User)
+    query = query.filter(func.lower(User.full_name()).like(f"%{pattern}%"))
+    query = query.order_by(User.is_active.desc(), User.full_name(), User.id)
 
-    :param string pattern: Part of the name that will be searched.
-    :param int limit: Maximum number of response.
-    :return: List of users corresponding to ``pattern``
-    :rtype: list(:py:class:`collectives.models.user.User`)
-    """
-    if "sqlite" in db.engine.name:
-        # SQLlite does not follow SQL standard
-        concat_clause = "(first_name || ' ' || last_name)"
-    else:
-        concat_clause = "CONCAT(first_name, ' ', last_name)"
-
-    sql = (
-        f"SELECT id, first_name, last_name from users WHERE "
-        f"LOWER({concat_clause}) LIKE :pattern LIMIT :limit"
-    )
-
-    sql_pattern = f"%{pattern.lower()}%"
-    found_users = (
-        db.session.query(User)
-        .from_statement(text(sql))
-        .params(pattern=sql_pattern, limit=limit)
-    )
-
-    return found_users
+    return query
 
 
 @blueprint.route("/users/autocomplete/create_rental")
@@ -90,8 +69,8 @@ def autocomplete_users_create_rental():
     if pattern is None or (len(pattern) < 2):
         found_users = []
     else:
-        limit = request.args.get("l", type=int) or 8
-        found_users = find_users_by_fuzzy_name(pattern, limit)
+        limit = request.args.get("l", default=8, type=int)
+        found_users = _make_autocomplete_query(pattern).limit(limit)
 
     content = json.dumps(AutocompleteUserSchema(many=True).dump(found_users))
     return content, 200, {"content-type": "application/json"}
@@ -121,8 +100,8 @@ def autocomplete_users():
     if pattern is None or (len(pattern) < 2):
         found_users = []
     else:
-        limit = request.args.get("l", type=int) or 8
-        found_users = find_users_by_fuzzy_name(pattern, limit)
+        limit = request.args.get("l", default=8, type=int)
+        found_users = _make_autocomplete_query(pattern).limit(limit)
 
     content = json.dumps(AutocompleteUserSchema(many=True).dump(found_users))
     return content, 200, {"content-type": "application/json"}
@@ -148,16 +127,11 @@ def autocomplete_leaders():
     if len(pattern) < 2:
         found_users = []
     else:
-        limit = request.args.get("l", type=int) or 8
+        limit = request.args.get("l", default=8, type=int)
 
-        query = db.session.query(User)
-        condition = func.lower(User.first_name + " " + User.last_name).like(
-            f"%{pattern}%"
-        )
-        query = query.filter(condition)
+        query = _make_autocomplete_query(pattern)
         query = query.filter(User.led_events)
-        found_users = query.order_by(User.id).all()
-        found_users = found_users[0:limit]
+        found_users = query.limit(limit)
 
     content = json.dumps(AutocompleteUserSchema(many=True).dump(found_users))
     return content, 200, {"content-type": "application/json"}
@@ -188,15 +162,15 @@ def autocomplete_available_leaders():
     if pattern is None or (len(pattern) < 2):
         found_users = []
     else:
-        limit = request.args.get("l", type=int) or 8
+        limit = request.args.get("l", default=8, type=int)
+
+        query = _make_autocomplete_query(pattern)
         event_type = db.session.get(
             EventType, request.args.get("etype", type=int, default=0)
         )
         activity_ids = request.args.getlist("aid", type=int)
         existing_ids = request.args.getlist("eid", type=int)
 
-        query = db.session.query(User)
-
         if event_type and event_type.requires_activity:
             ok_roles = RoleIds.all_activity_leader_roles()
         else:
@@ -206,12 +180,7 @@ def autocomplete_available_leaders():
             role_condition = and_(role_condition, Role.activity_id.in_(activity_ids))
         query = query.filter(User.roles.any(role_condition))
         query = query.filter(~User.id.in_(existing_ids))
-        condition = func.lower(User.first_name + " " + User.last_name).ilike(
-            f"%{pattern}%"
-        )
-        query = query.filter(condition)
 
-        query = query.order_by(User.first_name, User.last_name, User.id)
         found_users = query.limit(limit)
 
     content = json.dumps(AutocompleteUserSchema(many=True).dump(found_users))

collectives/configuration.yaml

@@ -277,11 +277,13 @@ Template mail:
         description: Email subject for user self unregister
         type: ShortString
 
-    SELF_UNREGISTER_MESSAGE:
+    SELF_UNREGISTER_MESSAGE_v2:
         content: |
             Bonjour,
 
             '{user_name}' vient de se désinscrire de l'événement '{event_title}' que vous encadrez.
+            {reason}
+            
             Lien vers l'événement :
             {link}
 
@@ -400,11 +402,13 @@ Template mail:
         description: Email subject for rejected registration to an event
         type: ShortString
 
-    REJECTED_REGISTRATION_MESSAGE:
+    REJECTED_REGISTRATION_MESSAGE_v2:
         content: |
             Bonjour,
 
-            {rejector_name} vient de refuser votre inscription à la collective {event_title} débutant le {event_date}.
+            {rejector_name} vient de refuser votre inscription à l'événement {event_title} débutant le {event_date}.
+            {reason}
+            
             Lien vers l'événement :
             {link}
 
@@ -437,42 +441,35 @@ Template mail:
         description: Sujet de l'email pour l'utilisateur lorsque que son inscription est activée.
         type: ShortString
 
-    ACTIVATED_REGISTRATION_MESSAGE:
+    ACTIVATED_REGISTRATION_MESSAGE_v2:
         content: |
             Bonjour,
 
-            Une place vient de se libérer pour la collective {event_title} débutant le {event_date}.
-            Votre place dans la liste d'attente a donc été validée et vous êtes à présent inscrit(e)
-            à la collective, ou en attente de paiement si la collective en nécessite un.
-
-            Si vous ne pouvez plus participer, merci de vous désincrire au plus tôt afin de ne pas 
-            perturber l'organisation de la collective.
+            Votre inscription vient d'être validée pour l'événement {event_title} débutant le {event_date}
+            pour lequel vous étiez jusqu'alors en liste d'attente.
 
-            Merci de vérifier si la collective nécessite un paiement de votre part:
+            Merci de vérifier si l'événement nécessite un paiement de votre part et de procéder à celui-ci le cas échéant:
             {link}
 
+            {unregistration_text}
+
             Vous recevez cet e-mail en tant qu'adhérent inscrit à cette collective.
             Cet e-mail est envoyé par un automate, répondre à cet e-mail sera sans effet.
         description: Template d'email pour l'utilisateur lorsque que son inscription est activée.
         type: LongString
-
-    ACTIVATED_REGISTRATION_UPCOMING_EVENT_MESSAGE:
+    
+    ACTIVATED_REGISTRATION_STANDARD_EVENT_MESSAGE:
         content: |
-            Bonjour,
-
-            Une place vient de se libérer pour la collective {event_title} débutant le {event_date}.
-            Votre place dans la liste d'attente a donc été validée et vous êtes à présent inscrit(e)
-            à la collective, ou en attente de paiement si la collective en nécessite un.
+            Si vous ne pouvez plus participer, merci de vous désincrire au plus tôt afin de ne pas 
+            perturber l'organisation de la collective.
+        description: Template d'email pour l'utilisateur lorsque que son inscription est activée et que l'événement commence bientôt.
+        type: LongString
 
-            Cet événement commence bientôt ; si vous ne pouvez plus participer, merci de vous désincrire 
+    ACTIVATED_REGISTRATION_UPCOMING_EVENT_WARNING:
+        content: |
+            Attention : cet événement commence bientôt ! Si vous ne pouvez plus participer, merci de vous désincrire 
             dans les prochaines {grace_period} heures afin de ne pas perturber l'organisation et que
             votre désinscription ne soit pas considérée comme tardive.
-
-            Merci de vérifier si la collective nécessite un paiement de votre part:
-            {link}
-
-            Vous recevez cet e-mail en tant qu'adhérent inscrit à cette collective.
-            Cet e-mail est envoyé par un automate, répondre à cet e-mail sera sans effet.
         description: Template d'email pour l'utilisateur lorsque que son inscription est activée et que l'événement commence bientôt.
         type: LongString
 

collectives/email_templates.py

@@ -14,6 +14,8 @@
     Registration,
     ConfirmationToken,
     BadgeIds,
+    Event,
+    User,
 )
 from collectives.models.auth import ConfirmationTokenType, TokenEmailStatus
 from collectives.utils import mail
@@ -51,19 +53,24 @@ def send_new_event_notification(event):
             current_app.logger.error(f"Mailer error: {err}")
 
 
-def send_unregister_notification(event, user):
+def send_unregister_notification(event: Event, user: User, reason: str):
     """Send a notification to leaders when a user unregisters from an event
 
     :param event: Event on which user unregisters.
-    :type event: :py:class:`collectives.modes.event.Event`
     :param user: User who unregisters.
-    :type user: :py:class:`collectives.models.user.User`
+    :param reason: Use-provided reason for unregistering
     """
     try:
         leader_emails = [l.mail for l in event.leaders]
-        message = Configuration.SELF_UNREGISTER_MESSAGE.format(
+        reason = (
+            f"Justification fournie pour la désinscription : \n {reason}"
+            if reason
+            else ""
+        )
+        message = Configuration.SELF_UNREGISTER_MESSAGE_v2.format(
             user_name=user.full_name(),
             event_title=event.title,
+            reason=reason,
             link=url_for(
                 "event.view_event",
                 event_id=event.id,
@@ -139,18 +146,16 @@ def has_succeed():
         db.session.add(token_copy)
         db.session.commit()
 
-    # Check if local dev, so that email is not sent
-    # and token validation link is displayed in flash popup
-    config = current_app.config
-    if not config["EXTRANET_DISABLE"]:
-        mail.send_mail(
-            email=email,
-            subject=f"{reason.capitalize()} de compte Collectives",
-            message=message,
-            error_action=has_failed,
-            success_action=has_succeed,
-        )
-    else:
+    mail.send_mail(
+        email=email,
+        subject=f"{reason.capitalize()} de compte Collectives",
+        message=message,
+        error_action=has_failed,
+        success_action=has_succeed,
+    )
+
+    # Check if local dev, then token validation link is displayed in flash popup
+    if current_app.config["EXTRANET_DISABLE"]:
         has_succeed()
         url = url_for(
             "auth.process_confirmation", token_uuid=token.uuid, _external=True
@@ -161,19 +166,23 @@ def has_succeed():
         flash(Markup(line))
 
 
-def send_reject_subscription_notification(rejector_name, event, rejected_user_email):
+def send_reject_subscription_notification(
+    rejector_name: str, event: Event, rejected_user_email: str, reason: str
+):
     """Send a notification to user whom registration has been rejected
 
-    :param string rejector_name: User name who rejects the subscription.
+    :param rejector_name: User name who rejects the subscription.
     :param event: Event the registraton is rejected on.
-    :type event: :py:class:`collectives.modes.event.Event`
-    :param string rejected_user_email: User email for who registraton is rejected.
+    :param rejected_user_email: User email for who registraton is rejected.
+    :param reason: Reason for the rejection
     """
     try:
-        message = Configuration.REJECTED_REGISTRATION_MESSAGE.format(
+        reason = f"Justification du refus : \n {reason}" if reason else ""
+        message = Configuration.REJECTED_REGISTRATION_MESSAGE_v2.format(
             rejector_name=rejector_name,
             event_title=event.title,
             event_date=format_date(event.start),
+            reason=reason,
             link=url_for(
                 "event.view_event",
                 event_id=event.id,
@@ -242,32 +251,30 @@ def send_update_waiting_list_notification(
         end_of_grace = current_time() + timedelta(
             hours=Configuration.UNREGISTRATION_GRACE_PERIOD + 1
         )
+
         if registration.is_in_late_unregistration_period(end_of_grace):
-            message = (
-                Configuration.ACTIVATED_REGISTRATION_UPCOMING_EVENT_MESSAGE.format(
-                    event_title=registration.event.title,
-                    event_date=format_date(registration.event.start),
+            unregistration_text = (
+                Configuration.ACTIVATED_REGISTRATION_UPCOMING_EVENT_WARNING.format(
                     grace_period=Configuration.UNREGISTRATION_GRACE_PERIOD,
-                    link=url_for(
-                        "event.view_event",
-                        event_id=registration.event.id,
-                        name=slugify(registration.event.title),
-                        _external=True,
-                    ),
                 )
             )
         else:
-            message = Configuration.ACTIVATED_REGISTRATION_MESSAGE.format(
-                event_title=registration.event.title,
-                event_date=format_date(registration.event.start),
-                link=url_for(
-                    "event.view_event",
-                    event_id=registration.event.id,
-                    name=slugify(registration.event.title),
-                    _external=True,
-                ),
+            unregistration_text = (
+                Configuration.ACTIVATED_REGISTRATION_STANDARD_EVENT_MESSAGE
             )
 
+        message = Configuration.ACTIVATED_REGISTRATION_MESSAGE_v2.format(
+            event_title=registration.event.title,
+            event_date=format_date(registration.event.start),
+            unregistration_text=unregistration_text,
+            link=url_for(
+                "event.view_event",
+                event_id=registration.event.id,
+                name=slugify(registration.event.title),
+                _external=True,
+            ),
+        )
+
         if deleted_registrations:
             event_titles = "\n".join(
                 f" - {reg.event.title}" for reg in deleted_registrations