Fix use of iconsistent timezones in tests (#791)

Author: gdaviet

Diff for: collectives/api/event.py

@@ -1,7 +1,7 @@
 """API to get the event list in index page."""
 
 import json
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from flask import url_for, request, abort
 from flask_login import current_user
@@ -15,7 +15,7 @@
 from collectives.models import Question, QuestionAnswer, Configuration
 from collectives.utils.url import slugify
 from collectives.utils.access import valid_user
-from collectives.utils.time import format_datetime_range, parse_api_date
+from collectives.utils.time import format_datetime_range, parse_api_date, current_time
 
 
 def photo_uri(event):
@@ -264,7 +264,7 @@ def events():
 
     # Hide very old events to unauthenticated
     if not current_user.is_authenticated:
-        min_date = datetime.now() - timedelta(
+        min_date = current_time() - timedelta(
             days=Configuration.MAX_HISTORY_FOR_ANONYMOUS
         )
         query = query.filter(Event.end > min_date)

Diff for: collectives/forms/reservation.py

@@ -1,12 +1,12 @@
 """Module for equipment reservation forms"""
 
-from datetime import datetime
 from wtforms import SubmitField, HiddenField
 
 from flask_wtf.form import FlaskForm
 from wtforms_alchemy import ModelForm
 
 from collectives.models import Reservation
+from collectives.utils.time import current_time
 
 
 class ReservationForm(FlaskForm, ModelForm):
@@ -27,7 +27,7 @@ def __init__(self, *args, **kwargs):
             self.event = kwargs["event"]
             self.collect_date.data = self.event.start
         else:
-            self.collect_date.data = datetime.now()
+            self.collect_date.data = current_time()
 
 
 class LeaderReservationForm(ReservationForm):

Diff for: collectives/routes/auth/signup.py

@@ -1,7 +1,5 @@
 """Auth login to perform account creation and recover."""
 
-import datetime
-
 from flask import flash, render_template, redirect, url_for, request
 from flask import current_app
 from flask_login import current_user
@@ -60,7 +58,7 @@ def process_confirmation(token_uuid):
         and token.existing_user.type == UserType.UnverifiedLocal
     ):
         token.existing_user.type = UserType.Local
-        token.existing_user.legal_text_signature_date = datetime.datetime.now()
+        token.existing_user.legal_text_signature_date = current_time()
         token.existing_user.legal_text_signed_version = (
             Configuration.CURRENT_LEGAL_TEXT_VERSION
         )

Diff for: collectives/routes/event.py

@@ -5,7 +5,7 @@
 
 # pylint: disable=too-many-lines
 from typing import Tuple, List, Set
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 import builtins
 from flask import flash, render_template, redirect, url_for, request, send_file
@@ -1220,7 +1220,7 @@ def preview(event_id):
     if event is None:
         abort(404)
 
-    min_date = datetime.now() - timedelta(days=Configuration.MAX_HISTORY_FOR_ANONYMOUS)
+    min_date = current_time() - timedelta(days=Configuration.MAX_HISTORY_FOR_ANONYMOUS)
     if event.end < min_date:
         abort(404)
 

Diff for: collectives/routes/profile.py

@@ -3,7 +3,7 @@
 This modules contains the /profile Blueprint
 """
 
-from datetime import date, datetime
+from datetime import date
 from os.path import exists
 from io import BytesIO
 import textwrap
@@ -29,6 +29,7 @@
 from collectives.utils.access import valid_user
 from collectives.utils.extranet import ExtranetError
 from collectives.utils.misc import sanitize_file_name
+from collectives.utils.time import current_time
 
 
 images = Images()
@@ -205,7 +206,7 @@ def confidentiality_agreement():
         request.method == "POST"
         and current_user.confidentiality_agreement_signature_date == None
     ):
-        current_user.confidentiality_agreement_signature_date = datetime.now()
+        current_user.confidentiality_agreement_signature_date = current_time()
         db.session.add(current_user)
         db.session.commit()
         flash("Merci d'avoir signé la charte RGPD", "success")

Diff for: collectives/utils/extranet.py

@@ -201,7 +201,7 @@ def check_license(self, license_number: str) -> LicenseInfo:
         if self.disabled():
             # Dev mode, every license is valid
             info.exists = True
-            info.renewal_date = datetime.now()
+            info.renewal_date = current_time()
             return info
 
         try:

Diff for: collectives/utils/init.py

@@ -1,7 +1,6 @@
 """Module to initialise DB"""
 
 import sqlite3
-import datetime
 import uuid
 import sys
 
@@ -12,6 +11,7 @@
 
 from collectives.models import ActivityType, EventType, User, Role, db, RoleIds
 from collectives.models import Configuration, ConfigurationTypeEnum, ConfigurationItem
+from collectives.utils.time import current_time
 
 
 def catch_db_errors(fct, app, *args, **kwargs):
@@ -133,10 +133,10 @@ def init_admin(app):
         user.license = str(uuid.uuid4())[:12]
         user.first_name = "Compte"
         user.last_name = "Administrateur"
-        user.confidentiality_agreement_signature_date = datetime.datetime.now()
+        user.confidentiality_agreement_signature_date = current_time()
         version = Configuration.CURRENT_LEGAL_TEXT_VERSION
         user.legal_text_signed_version = version
-        user.legal_text_signature_date = datetime.datetime.now()
+        user.legal_text_signature_date = current_time()
         user.password = app.config["ADMINPWD"]
         admin_role = Role(user=user, role_id=int(RoleIds.Administrator))
         user.roles.append(admin_role)

Diff for: collectives/utils/stats.py

@@ -16,6 +16,7 @@
 from collectives.models import RegistrationStatus, EventStatus, ActivityType
 from collectives.models import User, EventTag
 from collectives.utils.openpyxl import columns_best_fit
+from collectives.utils.time import current_time
 
 # Pylint does not understand that func.count IS callable.
 # See https://github.com/pylint-dev/pylint/issues/1682
@@ -223,7 +224,7 @@ def __init__(self, **kwargs) -> None:
             self.start = datetime(int(kwargs["year"]), 9, 1, 0, 0, 0)
             self.end = datetime(int(kwargs["year"]) + 1, 8, 30, 23, 59)
 
-        self.creation_time = datetime.now()
+        self.creation_time = current_time()
 
     def nb_days(self) -> int:
         """Returns number of days during the Engine interval.
@@ -482,7 +483,7 @@ def nb_unregistrations_inc_late_and_unjustified_absentees_per_week(self) -> dict
                     ]
                 ),
                 Event.start < func.now(),
-                Event.start >= datetime.now() - timedelta(weeks=52),
+                Event.start >= current_time() - timedelta(weeks=52),
             )
             .group_by("event_week", Registration.status)
         )

Diff for: tests/events/test_event.py

@@ -10,6 +10,7 @@
 
 from collectives.models import db, EventStatus, ActivityType, Event, EventVisibility
 from collectives.models import RoleIds, Question, QuestionType, RegistrationStatus
+from collectives.utils.time import current_time
 from tests import utils
 from tests.fixtures.user import promote_user
 
@@ -195,7 +196,7 @@ def test_event_creation(leader_client):
     response = leader_client.get("/collectives/add")
     assert response.status_code == 200
 
-    now = datetime.now()
+    now = current_time()
     alpinisme = ActivityType.query.filter_by(name="Alpinisme").first()
     data = {
         "update_activity": "0",
@@ -294,7 +295,7 @@ def test_event_duplication(leader_client, paying_event):
     assert response.status_code == 200
 
     data = utils.load_data_from_form(response.text, "form_edit_event")
-    now = datetime.now()
+    now = current_time()
     data["start"] = (now + timedelta(days=33)).strftime("%Y-%m-%d %X")
     data["end"] = (now + timedelta(days=33, hours=3)).strftime("%Y-%m-%d %X")
     response = leader_client.post("/collectives/add", data=data)
@@ -433,7 +434,7 @@ def test_update_attendance_upcoming_event(
     """Test leader changing status of registrations for an event that starts soon"""
 
     event = event1_with_reg_waiting_list
-    event.start = datetime.now() + timedelta(hours=1)
+    event.start = current_time() + timedelta(hours=1)
     db.session.commit()
 
     waiting_reg = event.waiting_registrations()[0]

Diff for: tests/events/test_registrations.py

@@ -1,7 +1,8 @@
 """Event actions tests related to registrations"""
 
-from datetime import date, timedelta, datetime
+from datetime import date, timedelta
 from collectives.models import db, RegistrationStatus, BadgeIds
+from collectives.utils.time import current_time
 
 
 # pylint: disable=unused-argument
@@ -526,7 +527,7 @@ def test_register_for_valid_suspended_user(
     assert user.has_a_valid_badge([BadgeIds.Suspended])
     assert user.has_a_valid_suspended_badge()
     assert len(event.registrations) == 6
-    assert not event.can_self_register(user, datetime.now())
+    assert not event.can_self_register(user, current_time())
 
     response = user_client.post(
         f"/collectives/{event.id}/self_register", follow_redirects=True

Diff for: tests/fixtures/event.py

@@ -1,6 +1,6 @@
 """Module to create fixture events."""
 
-from datetime import date, timedelta, datetime
+from datetime import date, timedelta
 from functools import wraps
 
 import pytest
@@ -9,6 +9,7 @@
 from collectives.models import EventType, Event, EventTag, EventStatus, EventVisibility
 from collectives.models import Registration, RegistrationLevels, RegistrationStatus
 from collectives.models import Question, QuestionType, QuestionAnswer
+from collectives.utils.time import current_time
 
 from tests.fixtures import payment
 
@@ -298,13 +299,13 @@ def event_in_less_than_x_hours_with_reg(
     """
 
     prototype_event_in_less_than_x_hours.registration_open_time = (
-        datetime.now() - timedelta(hours=10)
+        current_time() - timedelta(hours=10)
     )
     prototype_event_in_less_than_x_hours.registration_close_time = (
-        datetime.now() + timedelta(hours=2)
+        current_time() + timedelta(hours=2)
     )
-    prototype_event_in_less_than_x_hours.start = datetime.now() + timedelta(hours=3)
-    prototype_event_in_less_than_x_hours.end = datetime.now() + timedelta(hours=4)
+    prototype_event_in_less_than_x_hours.start = current_time() + timedelta(hours=3)
+    prototype_event_in_less_than_x_hours.end = current_time() + timedelta(hours=4)
     prototype_event_in_less_than_x_hours.num_online_slots = 9
 
     for user in [
@@ -321,7 +322,7 @@ def event_in_less_than_x_hours_with_reg(
                 status=RegistrationStatus.Active,
                 level=RegistrationLevels.Normal,
                 is_self=True,
-                registration_time=datetime.now() - timedelta(weeks=1),
+                registration_time=current_time() - timedelta(weeks=1),
             )
         )
 
@@ -336,13 +337,13 @@ def event_in_less_than_x_hours(prototype_event_in_less_than_x_hours):
     """Fixture for an event starting in less than 48 hours (parameterized)."""
 
     prototype_event_in_less_than_x_hours.registration_open_time = (
-        datetime.now() - timedelta(hours=10)
+        current_time() - timedelta(hours=10)
     )
     prototype_event_in_less_than_x_hours.registration_close_time = (
-        datetime.now() + timedelta(hours=2)
+        current_time() + timedelta(hours=2)
     )
-    prototype_event_in_less_than_x_hours.start = datetime.now() + timedelta(hours=3)
-    prototype_event_in_less_than_x_hours.end = datetime.now() + timedelta(hours=4)
+    prototype_event_in_less_than_x_hours.start = current_time() + timedelta(hours=3)
+    prototype_event_in_less_than_x_hours.end = current_time() + timedelta(hours=4)
 
     prototype_event_in_less_than_x_hours.num_online_slots = 9
 
@@ -364,13 +365,13 @@ def event_with_no_activity_type_in_less_than_x_hours_with_reg(
     """
 
     prototype_event_in_less_than_x_hours.registration_open_time = (
-        datetime.now() - timedelta(hours=10)
+        current_time() - timedelta(hours=10)
     )
     prototype_event_in_less_than_x_hours.registration_close_time = (
-        datetime.now() + timedelta(hours=2)
+        current_time() + timedelta(hours=2)
     )
-    prototype_event_in_less_than_x_hours.start = datetime.now() + timedelta(hours=3)
-    prototype_event_in_less_than_x_hours.end = datetime.now() + timedelta(hours=4)
+    prototype_event_in_less_than_x_hours.start = current_time() + timedelta(hours=3)
+    prototype_event_in_less_than_x_hours.end = current_time() + timedelta(hours=4)
     prototype_event_in_less_than_x_hours.num_online_slots = 9
 
     prototype_event_in_less_than_x_hours.num_online_slots = 9

Diff for: tests/fixtures/payment.py

@@ -2,9 +2,8 @@
 
 These are not pytest fixtures."""
 
-from datetime import datetime
-
 from collectives.models.payment import ItemPrice, PaymentItem
+from collectives.utils.time import current_time
 
 
 def regular_price():
@@ -13,7 +12,7 @@ def regular_price():
     price.amount = 12.5
     price.title = "Normal"
     price.enabled = True
-    price.update_time = datetime.now()
+    price.update_time = current_time()
     return price
 
 
@@ -27,7 +26,7 @@ def leader_price(item):
     # pylint: disable=protected-access
     price._deprecated_leader_only = True  # Test migration as well
     # pylint: enable=protected-access
-    price.update_time = datetime.now()
+    price.update_time = current_time()
     return price
 
 
@@ -37,7 +36,7 @@ def free_price():
     price.amount = 0
     price.title = "Gratuit"
     price.enabled = True
-    price.update_time = datetime.now()
+    price.update_time = current_time()
     return price
 
 
@@ -47,7 +46,7 @@ def disabled_price():
     price.amount = 0.01
     price.title = "Test"
     price.enabled = False
-    price.update_time = datetime.now()
+    price.update_time = current_time()
     return price
 
 

Diff for: tests/fixtures/user.py

@@ -1,12 +1,13 @@
 """Module to create fixture users."""
 
 from functools import wraps
-from datetime import date, datetime, timedelta
+from datetime import date, timedelta
 
 import pytest
 
 from collectives.models import User, Gender, db, Role, RoleIds, ActivityType
 from collectives.models import Badge, BadgeIds, UserType
+from collectives.utils.time import current_time
 
 # pylint: disable=unused-argument,redefined-outer-name, unused-import
 
@@ -74,7 +75,7 @@ def user(app):
         user.phone = f"0601020{identifier:03d}"
         user.emergency_contact_name = f"Emergency {identifier}"
         user.emergency_contact_phone = f"0699999{identifier:03}"
-        user.legal_text_signature_date = datetime.now()
+        user.legal_text_signature_date = current_time()
         user.legal_text_signed_version = 1
         user.gender = Gender(identifier % 2 + 1)
 
@@ -274,7 +275,7 @@ def promote_user(
         activity_type = ActivityType.query.filter_by(name=activity_name).first()
         role.activity_id = activity_type.id
     if confidentiality_agreement_signature:
-        user.confidentiality_agreement_signature_date = datetime.now()
+        user.confidentiality_agreement_signature_date = current_time()
     db.session.add(role)