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

agoraplus: don't encode exception log messages (#10999)

This commit is contained in:
Thomas NOËL 2016-06-08 17:06:07 +02:00
parent b7c3122b38
commit 0a245be1ce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passerelle/contrib/agoraplus/models.py
View File

@ -440,7 +440,7 @@ class AgoraPlus(BaseResource):
push = self.request('creation_familles/', json=agora_family)
agora_family_id = push.get('id_famille')
if push.get('id') != '1' or not agora_family_id:
raise Exception((push.get('message') or '').encode('utf-8'))
raise Exception(push.get('message') or '')
# get created adults id from agora+, store back
agora_family = self.request('familles/%s' % agora_family_id)
@ -562,7 +562,7 @@ class AgoraPlus(BaseResource):
endpoint = 'contacts/'
push = self.request(endpoint, json=agora_contact)
if 'code' not in push or int(push['code']) != 1:
raise Exception(push['message'].encode('utf-8'))
raise Exception(push.get('message') or '')
sas_contact.agoraplus_id = push['id_contact']
sas_contact.save()
return {
@ -626,7 +626,7 @@ class AgoraPlus(BaseResource):
# send declaration
res = self.request('familles/%s/declarations_revenus/' % family['id'], json=resources)
if int(res['code']) != 1:
raise Exception(res['message'].encode('utf-8'))
raise Exception(res.get('message') or '')
# get final result from Agora+
return self.request('familles/%s/declarations_revenus/%s' % (family['id'],
res['id_declaration']))
@ -661,7 +661,7 @@ class AgoraPlus(BaseResource):
res = self.request('inscriptions_scols/', json=enrollment)
if int(res['code']) == 1:
return {'id': res['id_inscription']}
raise Exception(res['message'].encode('utf-8'))
raise Exception(res.get('message') or '')
def nursery_enrollment(self, enrollment_data):
enrollment = {'anneeRef': {'id': 'XX', 'name': ''},
@ -702,12 +702,12 @@ class AgoraPlus(BaseResource):
res = self.request('demande_pe/', json=enrollment)
if int(res['code']) == 1:
return {'id': res['id_reservation']}
raise Exception(res['message'].encode('utf-8'))
raise Exception(res.get('message') or '')
def get_nursery_enrollment_result(self, enroll_id):
res = self.request('demande_pe/%s/resultats_commission/' % enroll_id)
if not isinstance(res, list):
raise Exception(res['erreur'].encode('utf-8'))
raise Exception(res.get('erreur') or '')
return normalize_nursery_enroll_results(res)
def get_plannings(self, child_id):
@ -794,7 +794,7 @@ class AgoraPlus(BaseResource):
endpoint = '/familles/%s/adresses/%s' % (family['id'], address_id)
res = self.request(endpoint, json=new_address, method='PUT')
if res.get('code') != '1':
raise Exception((res.get('message') or '').encode('utf-8'))
raise Exception(res.get('message') or '')
return True
def get_agoraplus_adult_id(self, adult_id, login, name_id):
@ -822,7 +822,7 @@ class AgoraPlus(BaseResource):
# update adult data
res = self.request(endpoint, json=adult_data, method='PUT')
if res.get('code') != '1':
raise Exception((res.get('message') or '').encode('utf-8'))
raise Exception(res.get('message') or '')
return True
def update_profession(self, login, name_id, adult_id, new_profession,
@ -844,7 +844,7 @@ class AgoraPlus(BaseResource):
# update adult data
res = self.request(endpoint, json=adult_data, method='PUT')
if res.get('code') != '1':
raise Exception((res.get('message') or '').encode('utf-8'))
raise Exception(res.get('message') or '')
return True
def get_invoice_pdf(self, login, invoice_id):