entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 14 Releases Activity

toulouse-axel: fix possible days & reference year (#44725)

This commit is contained in:
Lauréline Guérin 2020-07-02 11:02:25 +02:00
parent 1a8c34a1e6
commit c2402b2dc2
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passerelle/contrib/toulouse_axel/models.py
View File

@ -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:

14
tests/test_toulouse_axel.py
View File

@ -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')