0002-maelis-allow-school-year-computation-from-a-given-da.patch

Nicolas Roche, 23 décembre 2020 17:35

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

Subject: [PATCH 2/4] maelis: allow school year computation from a given date
 (#48480)

 passerelle/apps/maelis/models.py |  6 +++---
 passerelle/apps/maelis/utils.py  | 11 ++++++-----
 tests/test_maelis.py             | 12 ++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

             try:
                 return self.link_set.get(name_id=name_id)
             except Link.DoesNotExist:
                 raise APIError('User not linked to family', err_code='not-found')
         def get_family_data(self, family_id, school_year=None):
             if not school_year:
                 # fallback to current year if not provided
                 school_year = utils.get_default_school_year()
                 school_year = utils.get_school_year()
             family_data = serialize_object(self.call('FamilyService?wsdl',
                                                      'readFamily',
                                                      dossierNumber=family_id,
                                                      schoolYear=school_year))
             for child in family_data['childInfoList']:
                 utils.normalize_person(child)
             return family_data
-...
                     'schema': {
                         'application/json': LINK_SCHEMA
+                    }
+                }
             })
         def link(self, request, NameID, post_data):
             if 'school_year' not in post_data:
                 # fallback to default year if not provided
                 post_data['school_year'] = utils.get_default_school_year()
                 post_data['school_year'] = utils.get_school_year()
             r = self.call('FamilyService?wsdl', 'readFamilyByPassword',
                           dossierNumber=post_data['family_id'],
                           password=post_data['password'],
                           schoolYear=post_data['school_year']
+                          )
             if not r.number:
                 raise APIError('Family not found', err_code='not-found')
             Link.objects.update_or_create(resource=self, name_id=NameID,
-...
             })
         def activity_list(self, request, NameID, personID, school_year=None, start_datetime=None,
                           end_datetime=None):
             link = self.get_link(NameID)
             family_data = self.get_family_data(link.family_id)
             if personID not in [c['id'] for c in family_data['childInfoList']]:
                 raise APIError('Child not found', err_code='not-found')
             if not school_year:
                 school_year = utils.get_default_school_year()
                 school_year = utils.get_school_year()
             if not start_datetime:
                 start_datetime = timezone.now()
             if not end_datetime:
                 end_datetime = start_datetime + timezone.timedelta(days=62)
             r = self.call('ActivityService?wsdl', 'readActivityList',
                           schoolyear=school_year, numPerson=personID,
                           dateStartCalend=start_datetime,
                           dateEndCalend=end_datetime)

     def normalize_person(person):
         person['id'] = person['num']
         person['text'] = '{} {}'.format(
                     person['firstname'], person['lastname']).strip()
         return person
     def get_default_school_year():
         now = timezone.now()
         if now.strftime('%m-%d') >= '07-31':
             return now.year
     def get_school_year(date=None):
         if not date:
             date = timezone.now().date()
         if date.strftime('%m-%d') >= '07-31':
             return date.year
         else:
             return now.year - 1
             return date.year - 1

     # -*- coding: utf-8 -*-
     import mock
     import os
     import pytest
     from django.utils.dateparse import parse_date
     from passerelle.apps.maelis.models import Maelis, Link
     from passerelle.apps.maelis.utils import get_school_year
     from passerelle.utils.jsonresponse import APIError
     import utils
     pytestmark = pytest.mark.django_db
-...
                                              status_code=200,
                                              headers={'Content-Type': 'text/xml'}
+                                             )
         Link.objects.create(resource=connector, family_id='3264', name_id='local')
         resp = app.get('/maelis/test/regie/1/invoice/3264-53186?NameID=local')
         assert resp.json['data']
         assert resp.json['data']['label'] == 'FACTURATION SEPTEMBRE 2014'
         assert resp.json['data']['display_id'] == '53186'
     @pytest.mark.parametrize('date, schoolyear', [
         ('2020-07-30', 2019),
         ('2020-07-31', 2020),
     ])
     def test_get_school_year(date, schoolyear):
         date = parse_date(date)
         assert schoolyear == get_school_year(date)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-maelis-allow-school-year-computation-from-a-given-da.patch