Projet

Général

Profil

0002-api-use-current-timezone-in-get_max_datetime-48464.patch

Valentin Deniaud, 18 novembre 2020 10:52

Télécharger (2,08 ko)

Voir les différences: 

Subject: [PATCH 2/2] api: use current timezone in get_max_datetime (#48464)


 chrono/api/views.py | 4 ++--
 tests/test_api.py   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
chrono/api/views.py
68 68 
    if agenda.minimal_booking_delay is None:
69 69 
        return start_datetime
70 70 

  		




  71
  
  
    
    min_datetime = now() + datetime.timedelta(days=agenda.minimal_booking_delay)

  		




  
  71
  
    
    min_datetime = localtime(now()) + datetime.timedelta(days=agenda.minimal_booking_delay)

  		




  72
  72
  
    
    min_datetime = min_datetime.replace(hour=0, minute=0, second=0, microsecond=0)

  		




  73
  73
  
    
    if start_datetime is None:

  		




  74
  74
  
    
        return min_datetime

  		




  ......




  79
  79
  
    
    if agenda.maximal_booking_delay is None:

  		




  80
  80
  
    
        return end_datetime

  		




  81
  81
  
    

  		




  82
  
  
    
    max_datetime = now() + datetime.timedelta(days=agenda.maximal_booking_delay)

  		




  
  82
  
    
    max_datetime = localtime(now()) + datetime.timedelta(days=agenda.maximal_booking_delay)

  		




  83
  83
  
    
    max_datetime = max_datetime.replace(hour=0, minute=0, second=0, microsecond=0)

  		




  84
  84
  
    
    if end_datetime is None:

  		




  85
  85
  
    
        return max_datetime

  		












  

    
      tests/test_api.py
    
  





  4473
  4473
  
    
    assert data[-1]['datetime'] == '2017-05-23 10:30:00'

  		




  4474
  4474
  
    

  		




  4475
  4475
  
    

  		




  4476
  
  
    
def test_datetimes_maximal_booking_delay(app, user):

  		




  
  4476
  
    
@pytest.mark.parametrize('test_datetime', (None, '2020-11-11 23:50'))

  		




  
  4477
  
    
def test_datetimes_maximal_booking_delay(app, user, freezer, test_datetime):

  		




  
  4478
  
    
    if test_datetime:

  		




  
  4479
  
    
        freezer.move_to(test_datetime)

  		




  4477
  4480
  
    
    foo_agenda = Agenda.objects.create(

  		




  4478
  4481
  
    
        label='Foo Meeting', kind='meetings', minimal_booking_delay=1, maximal_booking_delay=1

  		




  4479
  4482
  
    
    )

  		




  4480
  
  
    
-