Projet

Général

Profil

0001-toulouse_axel-return-reference-year-in-family-info-e.patch

Lauréline Guérin, 31 mars 2020 15:02

Télécharger (6,98 ko)

Voir les différences: 

Subject: [PATCH] toulouse_axel: return reference year in family info endpoint
 (#41186)


 passerelle/contrib/toulouse_axel/models.py | 11 +++++++----
 tests/test_toulouse_axel.py                | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
passerelle/contrib/toulouse_axel/models.py
513 513 

  		




  514
  514
  
    
        family_data = result.json_response['DATA']['PORTAIL']['DUI']

  		




  515
  515
  
    

  		




  
  516
  
    
        today = datetime.date.today()

  		




  
  517
  
    
        current_reference_year = utils.get_reference_year_from_date(today)

  		




  
  518
  
    
        next_reference_year = current_reference_year + 1

  		




  516
  519
  
    
        if check_registrations:

  		




  517
  
  
    
            today = datetime.date.today()

  		




  518
  
  
    
            current_reference_year = utils.get_reference_year_from_date(today)

  		




  519
  
  
    
            next_reference_year = current_reference_year + 1

  		




  520
  
  
    

  		




  521
  520
  
    
            children_registred_for_current_year = self.are_children_registered(

  		




  522
  521
  
    
                dui=dui,

  		




  523
  522
  
    
                reference_year=current_reference_year)

  		




  ......




  531
  530
  
    

  		




  532
  531
  
    
        if with_management_dates:

  		




  533
  532
  
    
            family_data['management_dates'] = self.get_management_dates()

  		




  
  533
  
    
            family_data['annee_reference'] = current_reference_year

  		




  
  534
  
    
            family_data['annee_reference_short'] = str(current_reference_year)[2:]

  		




  
  535
  
    
            family_data['annee_reference_label'] = '{}/{}'.format(current_reference_year, next_reference_year)

  		




  534
  536
  
    

  		




  535
  537
  
    
        family_data['SITUATIONFAMILIALE_label'] = utils.get_label(utils.situation_familiale_mapping, family_data['SITUATIONFAMILIALE'])

  		




  536
  538
  
    
        for key in ['RL1', 'RL2']:

  		




  ......




  1127
  1129
  
    
                start_date.strftime(utils.xml_date_format),

  		




  1128
  1130
  
    
                end_date.strftime(utils.xml_date_format))

  		




  1129
  1131
  
    
            activity['annee_reference'] = reference_year

  		




  
  1132
  
    
            activity['annee_reference_short'] = str(reference_year)[2:]

  		




  1130
  1133
  
    
            activity['annee_reference_label'] = '{}/{}'.format(reference_year, reference_year + 1)

  		




  1131
  1134
  
    
            activity['booking'] = booking_days.get(activity['IDACTIVITE'], {})

  		




  1132
  1135
  
    

  		












  

    
      tests/test_toulouse_axel.py
    
  





  757
  757
  
    
        'SITUATIONFAMILIALE_label',

  		




  758
  758
  
    
        'TELFIXE',

  		




  759
  759
  
    
        'management_dates',

  		




  
  760
  
    
        'annee_reference',

  		




  
  761
  
    
        'annee_reference_short',

  		




  
  762
  
    
        'annee_reference_label',

  		




  760
  763
  
    
    ])

  		




  761
  764
  
    
    assert resp.json['data']['ENFANT'][0]['id'] == '4242'

  		




  762
  765
  
    
    assert resp.json['data']['ENFANT'][0]['text'] == 'foo foo'

  		




  ......




  769
  772
  
    
    assert resp.json['data']['ENFANT'][1]['id'] == '3535'

  		




  770
  773
  
    
    assert resp.json['data']['ENFANT'][1]['text'] == 'foo foo'

  		




  771
  774
  
    
    assert resp.json['data']['management_dates'] == {'foo': 'bar'}

  		




  
  775
  
    
    assert resp.json['data']['annee_reference'] == 2019

  		




  
  776
  
    
    assert resp.json['data']['annee_reference_short'] == '19'

  		




  
  777
  
    
    assert resp.json['data']['annee_reference_label'] == '2019/2020'

  		




  772
  778
  
    

  		




  773
  779
  
    
    with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.are_children_registered') as registered:

  		




  774
  780
  
    
        registered.side_effect = [{'4242': True}, {}]

  		




  ......




  2206
  2212
  
    
                'id': 'A19P1M1',

  		




  2207
  2213
  
    
                'text': 'Temps du matin (inscription du 01/08/2019 au 31/07/2020)',

  		




  2208
  2214
  
    
                'annee_reference': 2019,

  		




  
  2215
  
    
                'annee_reference_short': '19',

  		




  2209
  2216
  
    
                'annee_reference_label': '2019/2020',

  		




  2210
  2217
  
    
                'COUTREVIENT': '99999',

  		




  2211
  2218
  
    
                'DATEDEBUT': '2019-08-01',

  		




  ......




  2232
  2239
  
    
                'id': 'A19P1M2',

  		




  2233
  2240
  
    
                'text': 'Temps du midi (inscription du 01/08/2019 au 31/07/2020)',

  		




  2234
  2241
  
    
                'annee_reference': 2019,

  		




  
  2242
  
    
                'annee_reference_short': '19',

  		




  2235
  2243
  
    
                'annee_reference_label': '2019/2020',

  		




  2236
  2244
  
    
                'COUTREVIENT': '99999',

  		




  2237
  2245
  
    
                'DATEDEBUT': '2019-08-01',

  		




  ......




  2258
  2266
  
    
                'id': 'A19P1M3',

  		




  2259
  2267
  
    
                'text': 'Temps du soir (inscription du 01/08/2019 au 31/07/2020)',

  		




  2260
  2268
  
    
                'annee_reference': 2019,

  		




  
  2269
  
    
                'annee_reference_short': '19',

  		




  2261
  2270
  
    
                'annee_reference_label': '2019/2020',

  		




  2262
  2271
  
    
                'COUTREVIENT': '99999',

  		




  2263
  2272
  
    
                'DATEDEBUT': '2019-08-01',

  		




  ......




  2284
  2293
  
    
                'id': 'A19P1M4',

  		




  2285
  2294
  
    
                'text': u'Temps mercredi après midi (inscription du 01/08/2019 au 31/07/2020)',

  		




  2286
  2295
  
    
                'annee_reference': 2019,

  		




  
  2296
  
    
                'annee_reference_short': '19',

  		




  2287
  2297
  
    
                'annee_reference_label': '2019/2020',

  		




  2288
  2298
  
    
                'COUTREVIENT': '99999',

  		




  2289
  2299
  
    
                'DATEDEBUT': '2019-08-01',

  		




  ......




  2423
  2433
  
    
            'id': 'A19P1M1',

  		




  2424
  2434
  
    
            'text': 'Temps du matin (inscription du 01/08/2019 au 31/07/2020)',

  		




  2425
  2435
  
    
            'annee_reference': 2019,

  		




  
  2436
  
    
            'annee_reference_short': '19',

  		




  2426
  2437
  
    
            'annee_reference_label': '2019/2020',

  		




  2427
  2438
  
    
            'COUTREVIENT': '99999',

  		




  2428
  2439
  
    
            'DATEDEBUT': '2019-08-01',

  		




  ......




  2449
  2460
  
    
            'id': 'A19P1M2',

  		




  2450
  2461
  
    
            'text': 'Temps du midi (inscription du 01/08/2019 au 31/07/2020)',

  		




  2451
  2462
  
    
            'annee_reference': 2019,

  		




  
  2463
  
    
            'annee_reference_short': '19',

  		




  2452
  2464
  
    
            'annee_reference_label': '2019/2020',

  		




  2453
  2465
  
    
            'COUTREVIENT': '99999',

  		




  2454
  2466
  
    
            'DATEDEBUT': '2019-08-01',

  		




  ......




  2475
  2487
  
    
            'id': 'A19P1M3',

  		




  2476
  2488
  
    
            'text': 'Temps du soir (inscription du 01/08/2019 au 31/07/2020)',

  		




  2477
  2489
  
    
            'annee_reference': 2019,

  		




  
  2490
  
    
            'annee_reference_short': '19',

  		




  2478
  2491
  
    
            'annee_reference_label': '2019/2020',

  		




  2479
  2492
  
    
            'COUTREVIENT': '99999',

  		




  2480
  2493
  
    
            'DATEDEBUT': '2019-08-01',

  		




  ......




  2501
  2514
  
    
            'id': 'A19P1M4',

  		




  2502
  2515
  
    
            'text': u'Temps mercredi après midi (inscription du 01/08/2019 au 31/07/2020)',

  		




  2503
  2516
  
    
            'annee_reference': 2019,

  		




  
  2517
  
    
            'annee_reference_short': '19',

  		




  2504
  2518
  
    
            'annee_reference_label': '2019/2020',

  		




  2505
  2519
  
    
            'COUTREVIENT': '99999',

  		




  2506
  2520
  
    
            'DATEDEBUT': '2019-08-01',

  		




  2507
  
  
    
-