Projet

Général

Profil

0001-toulouse-axel-fix-possible-days-reference-year-44725.patch

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

Télécharger (2,51 ko)

Voir les différences: 

Subject: [PATCH 1/2] 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(-)
passerelle/contrib/toulouse_axel/models.py
1147 1147 

  		




  1148
  1148
  
    
        # besure that start_date is after greatest DATEENTREE,

  		




  1149
  1149
  
    
        # and end_date is before smallest DATESORTIE

  		




  1150
  
  
    
        reference_year = utils.get_reference_year_from_date(today)

  		




  
  1150
  
    
        reference_year = utils.get_reference_year_from_date(start_date)

  		




  1151
  1151
  
    
        possible_days_min, possible_days_max = self.get_min_and_max_possible_days(

  		




  1152
  1152
  
    
            dui=link.dui, reference_year=reference_year, child_id=idpersonne)

  		




  1153
  1153
  
    
        if possible_days_min and possible_days_max:

  		












  

    
      tests/test_toulouse_axel.py
    
  





  2978
  2978
  
    
        assert resp.json['data'][-1]['id'] == '3535:MAT:TOTO:%s' % last_date

  		




  2979
  2979
  
    

  		




  2980
  2980
  
    

  		




  
  2981
  
    
def test_clae_booking_activity_possible_days_next_year(app, resource):

  		




  
  2982
  
    
    Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')

  		




  
  2983
  
    
    with freezegun.freeze_time('2020-07-01'):

  		




  
  2984
  
    
        with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.get_child_activities') as mock_activities:

  		




  
  2985
  
    
            mock_activities.return_value = {}

  		




  
  2986
  
    
            app.get(

  		




  
  2987
  
    
                '/toulouse-axel/test/clae_booking_activity_possible_days?NameID=yyy&idpersonne=3535'

  		




  
  2988
  
    
                '&start_date=2020-09-01&end_date=2020-09-30&activity_type=MAT')

  		




  
  2989
  
    
    assert mock_activities.call_args_list == [

  		




  
  2990
  
    
        mock.call(child_id='3535', dui='XXX', reference_year=2020),

  		




  
  2991
  
    
        mock.call(child_id='3535', dui='XXX', reference_year=2020),

  		




  
  2992
  
    
    ]

  		




  
  2993
  
    

  		




  
  2994
  
    

  		




  2981
  2995
  
    
@freezegun.freeze_time('2019-09-01')

  		




  2982
  2996
  
    
def test_clae_booking_activity_possible_days_endpoint_dates(app, resource, child_activities_data):

  		




  2983
  2997
  
    
    Link.objects.create(resource=resource, name_id='yyy', dui='XXX', person_id='42')

  		




  2984
  
  
    
-