0002-toulouse-axel-fix-annual-possible-days-reference-yea.patch

Lauréline Guérin, 02 juillet 2020 11:17

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] toulouse-axel: fix annual possible days & reference year
 (#44725)

 passerelle/contrib/toulouse_axel/models.py | 10 ++--
 tests/test_toulouse_axel.py                | 60 ++++++++++++++++++----
 2 files changed, 58 insertions(+), 12 deletions(-)

                 'NameID': {'description': _('Publik ID')},
                 'idpersonne': {'description': _('Child ID')},
                 'activity_type': {'description': _('Activity type (MAT, MIDI, SOIR, GARD)')},
                 'booking_date': {'description': _('Booking date (to get reference year)')},
             })
         def clae_booking_activity_annual_possible_days(self, request, NameID, idpersonne, activity_type):
         def clae_booking_activity_annual_possible_days(self, request, NameID, idpersonne, activity_type, booking_date):
             link = self.get_link(NameID)
             try:
                 booking_date = datetime.datetime.strptime(booking_date, utils.json_date_format).date()
             except ValueError:
                 raise APIError('bad date format, should be YYYY-MM-DD', err_code='bad-request', http_status=400)
             if activity_type not in ['MAT', 'MIDI', 'SOIR', 'GARD']:
                 raise APIError('bad activity_type, should be MAT, MIDI, SOIR or GARD', err_code='bad-request', http_status=400)
             today = datetime.date.today()
             reference_year = utils.get_reference_year_from_date(today)
             reference_year = utils.get_reference_year_from_date(booking_date)
             activities = self.get_child_activities(
                 dui=link.dui,
                 reference_year=reference_year,

         Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')
         with mock.patch('passerelle.contrib.toulouse_axel.schemas.enfants_activites') as operation:
             operation.side_effect = AxelError('FooBar')
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=MAT')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=MAT&booking_date=2019-09-01')
         assert resp.json['err_desc'] == "Axel error: FooBar"
         assert resp.json['err'] == 'error'
     @freezegun.freeze_time('2019-09-01')
     @pytest.mark.parametrize('value', ['foo', '20/01/2020', '2020'])
     def test_clae_booking_activity_annual_possible_days_endpoint_bad_date_format(app, resource, value):
         Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')
         resp = app.get(
             '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
             '&activity_type=MAT&booking_date=%s' % value, status=400)
         assert resp.json['err_desc'] == "bad date format, should be YYYY-MM-DD"
         assert resp.json['err'] == 'bad-request'
     @freezegun.freeze_time('2019-09-01')
     def test_clae_booking_activity_annual_possible_days_endpoint_activity_type(app, resource):
         Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')
         resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=FOO', status=400)
         resp = app.get(
             '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
             '&activity_type=FOO&booking_date=2019-09-01', status=400)
         assert resp.json['err_desc'] == "bad activity_type, should be MAT, MIDI, SOIR or GARD"
         assert resp.json['err'] == 'bad-request'
     @freezegun.freeze_time('2019-09-01')
     def test_clae_booking_activity_annual_possible_days_endpoint_no_result(app, resource):
         resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=MAT')
         resp = app.get(
             '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
             '&activity_type=MAT&booking_date=2019-09-01')
         assert resp.json['err_desc'] == "Person not found"
         assert resp.json['err'] == 'not-found'
-...
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'EnfantsActivites'):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=4242&activity_type=MAT')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=4242'
                 '&activity_type=MAT&booking_date=2019-09-01')
         assert resp.json['err_desc'] == "Child not found"
         assert resp.json['err'] == 'not-found'
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities', return_value={'ACTIVITE': []}):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=MAT')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=MAT&booking_date=2019-09-01')
         assert resp.json['err'] == 0
         assert resp.json['data'] == []
-...
         Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')
         activities = child_activities_data['ENFANT'][0]
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities', return_value=activities):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=MAT')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=MAT&booking_date=2019-09-01')
         assert resp.json['err'] == 0
         assert resp.json['data'] == [
+            {
-...
             },
+        ]
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities', return_value=activities):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=MIDI')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=MIDI&booking_date=2019-09-01')
         assert resp.json['err'] == 0
         assert resp.json['data'] == [
+            {
-...
             },
+        ]
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities', return_value=activities):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=SOIR')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=SOIR&booking_date=2019-09-01')
         assert resp.json['err'] == 0
         assert resp.json['data'] == [
+            {
-...
             },
+        ]
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities', return_value=activities):
             resp = app.get('/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535&activity_type=GARD')
             resp = app.get(
                 '/toulouse-axel/test/clae_booking_activity_annual_possible_days?NameID=yyy&idpersonne=3535'
                 '&activity_type=GARD&booking_date=2019-09-01')
         assert resp.json['err'] == 0
         assert resp.json['data'] == [
+            {
-...
+        ]
     def test_clae_booking_activity_annual_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_annual_possible_days?NameID=yyy&idpersonne=3535'
                     '&activity_type=GARD&booking_date=2020-09-01')
         assert mock_activities.call_args_list == [
             mock.call(child_id='3535', dui='XXX', reference_year=2020),
+        ]
     @freezegun.freeze_time('2019-09-01')
     def test_clae_booking_activity_prefill_endpoint_axel_error(app, resource):
         Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-toulouse-axel-fix-annual-possible-days-reference-yea.patch