entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 16 Releases Activity

toulouse-maelis: put global catalog in cache (#82379) #377

Closed
nroche wants to merge 2 commits from wip/82379-manage-cache-on-global-catalog into wip/82966-parsifal-no-more-ref-date-on-catalog
pull from: wip/82379-manage-cache-on-global-catalog
merge into: entrouvert:wip/82966-parsifal-no-more-ref-date-on-catalog
Conversation 0 Commits 2 Files Changed 3 +74 -65
3 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
passerelle/contrib/toulouse_maelis/models.py
View File

@ -156,6 +156,39 @@ class ToulouseMaelis(BaseResource, HTTPResource):
# delete extraneous items
self.referential.filter(referential_name=referential_name, updated__lt=last_update).delete()
def update_catalog_referential(self):
last_update = now()
ref_date = last_update.date()
try:
data = self.call(
'Activity',
'readActivityList',
# pass schoolyear as '1970', it's not actually used and activities will be
# returned according to dateStartCalend/dateEndCalend.
schoolyear='1970',
dateStartCalend=(ref_date - datetime.timedelta(days=365)).isoformat(),
dateEndCalend=(ref_date + datetime.timedelta(days=365)).isoformat(),
)
except Exception as e:
raise UpdateError('Service indisponible : %s' % str(e))
for item in data or []:
id_key = item['activityPortail']['idAct']
text = item['activityPortail'].get('libelle2') or item['activityPortail']['libelle'] or ''
text = text.strip()
self.referential.update_or_create(
resource_id=self.id,
referential_name='Activity',
item_id=id_key,
defaults={
'item_text': text,
'item_data': dict({'id': id_key, 'text': text}, **item),
'updated': last_update,
},
)
# delete extraneous items
self.referential.filter(referential_name='Activity', updated__lt=last_update).delete()
def get_referential_data(self, service_name, referential_name):
try:
return self.call(service_name, 'read' + referential_name + 'List')
@ -223,6 +256,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if referential_name in ['Direct', 'Service']:
id_key, text_key = 'id', 'lib1'
self.update_referential(referential_name, data, id_key, text_key)
self.update_catalog_referential()
def update_ape_referentials(self):
indicators = self.call('Ape', 'readApeIndicatorList')
@ -258,11 +292,13 @@ class ToulouseMaelis(BaseResource, HTTPResource):
super().daily()
self.update_referentials()
def every5min(self):
self.update_activity_referentials()
def update_referentials(self):
try:
self.update_family_referentials()
self.update_site_referentials()
self.update_activity_referentials()
self.update_ape_referentials()
self.update_invoice_referentials()
# merge zip codes from base adresse into town referential
@ -2697,16 +2733,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
display_category='Inscriptions',
description='Obtenir le catalogue des activités loisir, avec leurs critères de recherche',
name='read-activity-list',
parameters={
'ref_date': {
'description': "Date de référence, utilisée pour déduire l'année scolaire",
'type': 'date',
},
},
)
def read_activity_list(self, request, ref_date=None):
if not ref_date:
ref_date = now().date()
def read_activity_list(self, request):
labels = {
'service': 'Service',
'nature': "Nature de l'activité",
@ -2719,16 +2747,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
all_criterias = {key: {'text': value, 'data': {}} for key, value in labels.items()}
criterias = {key: {'text': value, 'data': {}} for key, value in labels.items()}
activities = self.call(
'Activity',
'readActivityList',
# pass schoolyear as '1970', it's not actually used and activities will be
# returned according to dateStartCalend/dateEndCalend.
schoolyear='1970',
dateStartCalend=(ref_date - datetime.timedelta(days=365)).isoformat(),
dateEndCalend=(ref_date + datetime.timedelta(days=365)).isoformat(),
)
def add_criteria(label_key, criteria_key, criteria_value):
if not criteria_value:
return
@ -2749,15 +2767,11 @@ class ToulouseMaelis(BaseResource, HTTPResource):
]
data = []
for activity in activities:
for activity in self.get_referential('Activity'):
activity_type = activity['activityPortail'].get('activityType')
activity_nature = activity_type.get('natureSpec') if activity_type else None
if not activity_nature or activity_nature['code'] not in self.get_loisir_nature_codes():
continue
activity['id'] = activity['activityPortail']['idAct']
activity['text'] = (
activity['activityPortail']['libelle2'] or activity['activityPortail']['libelle']
)
service_id = activity['activityPortail']['idService']
service_text = self.get_referential_value('Service', service_id, default=None)
activity['activityPortail']['idService_text'] = service_text
@ -2781,9 +2795,13 @@ class ToulouseMaelis(BaseResource, HTTPResource):
unit['text'] = unit['libelle']
criterias['public']['data'] = {}
for key, value in utils.get_public_criterias(
datetime.date.today(), unit['birthDateStart'], unit['birthDateEnd']
):
start_dob = unit['birthDateStart']
end_dob = unit['birthDateEnd']
if start_dob:
start_dob = parse_date(start_dob)
if end_dob:
end_dob = parse_date(end_dob)
for key, value in utils.get_public_criterias(datetime.date.today(), start_dob, end_dob):
add_criteria('public', key, value)
update_criterias_order_field(criterias, ['public'])
@ -2810,7 +2828,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
return {
'data': data,
'meta': {
'ref_date': ref_date.isoformat(),
'all_criterias': all_criterias,
'all_criterias_order': ['service', 'nature', 'type', 'public', 'day', 'place'],
},

6
passerelle/contrib/toulouse_maelis/tools/connector_bench.py
View File

@ -13,7 +13,7 @@ from multiprocessing.sharedctypes import Value
import requests
# CONN = 'https://parsifal-passerelle.dev.publik.love/toulouse-maelis/integ-toulouse'
CONN = 'https://passerelle-parsifal.test.entrouvert.org/toulouse-maelis/test'
CONN = 'https://passerelle-parsifal.test.entrouvert.org/toulouse-maelis/maelis'
APIKEY = 'nicolas'
FAMILY_ID = '322423' # NICO TEST / UDAVE INTEG
PERSON_ID = '176658' # INTEG
@ -46,10 +46,10 @@ def get_endpoint(args):
)
)
elif args.test == 'global-catalog':
url = args.conn + '/read-activity-list?ref_date=2023-01-01'
url = args.conn + '/read-activity-list'
else:
raise Exception('unknown test')
url += '&apikey=%s' % APIKEY
url += '?apikey=%s' % APIKEY
return url, payload

58
tests/test_toulouse_maelis.py
View File

@ -247,6 +247,9 @@ def django_db_setup(django_db_setup, django_db_blocker):
activity_mock.add_soap_response(
'readServiceList', get_xml_file('R_read_service_list.xml')
)
activity_mock.add_soap_response(
'readActivityList', get_xml_file('R_read_activity_list.xml')
)
con.update_activity_referentials()
with ape_service() as ape_mock:
@ -556,6 +559,7 @@ def test_update_referential_empty(mocked_get, con):
def test_cron(db):
assert Referential.objects.filter(referential_name='Category').count() == 3
assert sorted(list({x.referential_name for x in Referential.objects.all()})) == [
'Activity',
'ActivityNatureType',
'ApeIndicator',
'CSP',
@ -6305,25 +6309,17 @@ def test_get_public_criterias(start_dob, end_dob, expected):
assert expected == [x[1] for x in result]
def test_read_activity_list(activity_service, con, app):
def request_check(request):
assert request.schoolyear == 1970
assert request.dateStartCalend == datetime.datetime(2023, 3, 1, 0, 0)
assert request.dateEndCalend == datetime.datetime(2025, 2, 28, 0, 0)
activity_service.add_soap_response(
'readActivityList',
get_xml_file('R_read_activity_list.xml'),
request_check=request_check,
)
def test_read_activity_list(con, app, freezer):
url = get_endpoint('read-activity-list')
con.loisir_nature_codes = '1,4,L,, S '
con.save()
params = {'ref_date': '2024-02-29'}
resp = app.get(url, params=params)
freezer.move_to('2024-02-29')
resp = app.get(url)
assert resp.json['err'] == 0
assert len(resp.json['data']) == 8
activity_text = [x['activity']['text'] for x in resp.json['data']]
assert activity_text == sorted(activity_text)
assert [
(
x['id'],
@ -6332,16 +6328,16 @@ def test_read_activity_list(activity_service, con, app):
)
for x in resp.json['data']
] == [
('A10056517594-A10056517595-A10056517597', 'plop', None),
('A10056514645-A10056514650-A10053179757', None, None),
('A10056514645-A10056514648-A10053179876', None, None),
('A10056514645-A10056514649-A10053179757', None, None),
('A10051141965-A10051141966-A10053179226', 'A10049329051', 'Sorties'),
('A10051141965-A10051141968-A10053179226', 'A10049329051', 'Sorties'),
('A10051141965-A10051141970-A10053179226', 'A10049329051', 'Sorties'),
('A10051141965-A10051141990-A10053179227', 'A10049329051', 'Sorties'),
('A10056514645-A10056514650-A10053179757', None, None),
('A10056514645-A10056514648-A10053179876', None, None),
('A10056514645-A10056514649-A10053179757', None, None),
('A10056517594-A10056517595-A10056517597', 'plop', None),
]
item = resp.json['data'][0]
item = resp.json['data'][4]
item['activity'] = 'N/A'
item['unit'] = 'N/A'
item['place'] = 'N/A'
@ -6386,7 +6382,6 @@ def test_read_activity_list(activity_service, con, app):
},
}
assert resp.json['meta'] == {
'ref_date': '2024-02-29',
'all_criterias': {
'service': {'text': 'Service', 'data': {'sorties': 'Sorties'}, 'order': ['sorties']},
'nature': {
@ -6445,13 +6440,12 @@ def test_read_activity_list(activity_service, con, app):
con.loisir_nature_codes = 'X,L,S'
con.save()
resp = app.get(url, params=params)
resp = app.get(url)
assert resp.json['err'] == 0
assert len(resp.json['data']) == 0
assert resp.json == {
'data': [],
'meta': {
'ref_date': '2024-02-29',
'all_criterias': {
'service': {'text': 'Service', 'data': {}, 'order': []},
'nature': {'text': "Nature de l'activité", 'data': {}, 'order': []},
@ -6466,22 +6460,20 @@ def test_read_activity_list(activity_service, con, app):
}
def test_read_activity_list_without_date(activity_service, con, app, freezer):
activity_service.add_soap_response('readActivityList', get_xml_file('R_read_activity_list.xml'))
url = get_endpoint('read-activity-list')
def test_read_activity_list_no_nature(activity_service, con, app, freezer):
def request_check(request):
assert request.schoolyear == 1970
assert request.dateStartCalend == datetime.datetime(2023, 3, 1, 0, 0)
assert request.dateEndCalend == datetime.datetime(2025, 2, 28, 0, 0)
activity_service.add_soap_response(
'readActivityList', get_xml_file('R_read_activity_list_no_nature.xml'), request_check=request_check
)
url = get_endpoint('read-activity-list')
freezer.move_to('2024-02-29')
con.update_catalog_referential()
resp = app.get(url)
assert resp.json['err'] == 0
assert resp.json['meta']['ref_date'] == '2024-02-29'
def test_read_activity_list_no_nature(activity_service, con, app):
activity_service.add_soap_response('readActivityList', get_xml_file('R_read_activity_list_no_nature.xml'))
url = get_endpoint('read-activity-list')
params = {'ref_date': '2023-01-01'}
resp = app.get(url, params=params)
assert resp.json['err'] == 0
assert len(resp.json['data']) == 0