From c2402b2dc2bd024a59db6d741fac0f0a1045c35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Thu, 2 Jul 2020 11:02:25 +0200 Subject: [PATCH] toulouse-axel: fix possible days & reference year (#44725) --- passerelle/contrib/toulouse_axel/models.py | 2 +- tests/test_toulouse_axel.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/passerelle/contrib/toulouse_axel/models.py b/passerelle/contrib/toulouse_axel/models.py index e218aca3..d46fab38 100644 --- a/passerelle/contrib/toulouse_axel/models.py +++ b/passerelle/contrib/toulouse_axel/models.py @@ -1149,7 +1149,7 @@ class ToulouseAxel(BaseResource): # besure that start_date is after greatest DATEENTREE, # and end_date is before smallest DATESORTIE - reference_year = utils.get_reference_year_from_date(today) + reference_year = utils.get_reference_year_from_date(start_date) possible_days_min, possible_days_max = self.get_min_and_max_possible_days( dui=link.dui, reference_year=reference_year, child_id=idpersonne) if possible_days_min and possible_days_max: diff --git a/tests/test_toulouse_axel.py b/tests/test_toulouse_axel.py index c8ce3191..c6f1d191 100644 --- a/tests/test_toulouse_axel.py +++ b/tests/test_toulouse_axel.py @@ -3008,6 +3008,20 @@ def test_clae_booking_activity_possible_days_period(app, resource, today, start_ assert resp.json['data'][-1]['id'] == '3535:MAT:TOTO:%s' % last_date +def test_clae_booking_activity_possible_days_next_year(app, resource): + Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42') + with freezegun.freeze_time('2020-07-01'): + with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities') as mock_activities: + mock_activities.return_value = {} + app.get( + '/toulouse-axel/test/clae_booking_activity_possible_days?NameID=yyy&idpersonne=3535' + '&start_date=2020-09-01&end_date=2020-09-30&activity_type=MAT') + assert mock_activities.call_args_list == [ + mock.call(child_id='3535', dui='XXX', reference_year=2020), + mock.call(child_id='3535', dui='XXX', reference_year=2020), + ] + + @freezegun.freeze_time('2019-09-01') def test_clae_booking_activity_possible_days_endpoint_dates(app, resource, child_activities_data): Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')