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

toulouse-maelis: use invoice objects instead of dict (#76394)

This commit is contained in:
Nicolas Roche 2023-04-12 18:33:21 +02:00
parent 2c335f2ed1
commit 324b787f33
2 changed files with 71 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import datetime
import difflib
import json
import re
from decimal import Decimal
from operator import itemgetter
from urllib.parse import urljoin
@ -3864,6 +3865,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
invoice_id=item['numInvoice'],
family_id=family_id,
maelis_data=item,
maelis_data_update_date=now(),
)
self.logger.info("Ajout de %s sur la famille '%s'", repr(invoice), family_id)
else:
@ -3887,30 +3889,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
"Mise à jour de %s sur la famille '%s': %s", repr(invoice), family_id, diff
)
invoices = []
for item in self.invoice_set.filter(regie_id=regie_id, family_id=family_id):
item = item.maelis_data
invoice = {
'id': '%s-%s' % (item['numFamily'], item['numInvoice']),
'created': item['dateInvoice'][:10],
'pay_limit_date': item['dateDeadline'][:10],
'display_id': str(item['numInvoice']),
'total_amount': item['amountInvoice'],
'amount': str(float(item['amountInvoice']) - float(item['amountPaid'])),
'amount_paid': item['amountPaid'],
'label': item['libelleTTF'],
'has_pdf': bool(item['pdfName']),
'online_payment': True,
'paid': item['amountInvoice'] == item['amountPaid'],
'payment_date': None,
'no_online_payment_reason': None,
'reference_id': item['numInvoice'],
'maelis_item': item,
}
if item['amountInvoice'] == item['amountPaid']:
invoice.update({'amount': '0', 'pay_limit_date': '', 'online_payment': False})
invoices.append(invoice)
return invoices
return self.invoice_set.filter(regie_id=regie_id, family_id=family_id)
@endpoint(
display_category='Facture',
@ -3927,7 +3906,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def invoices(self, request, regie_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
invoices = [i for i in self.get_invoices(family_id, regie_id) if not i['paid']]
invoices = [
i.format_content() for i in self.get_invoices(family_id, regie_id) if i.status() == 'created'
]
return {'data': invoices}
@endpoint(
@ -3945,16 +3926,19 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def invoices_history(self, request, regie_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
invoices = [i for i in self.get_invoices(family_id, regie_id) if i['paid']]
invoices = [
i.format_content()
for i in self.get_invoices(family_id, regie_id)
if i.status() in ['paid', 'notified']
]
return {'data': invoices}
def get_invoice(self, regie_id, invoice_id):
real_invoice_id = invoice_id.split('-')[-1]
family_id = invoice_id[: -(len(real_invoice_id) + 1)]
for invoice in self.get_invoices(family_id, regie_id):
if invoice['id'] == invoice_id:
break
else:
try:
invoice = self.get_invoices(family_id, regie_id).get(invoice_id=real_invoice_id)
except Invoice.DoesNotExist:
raise APIError('Invoice not found')
return invoice
@ -3971,7 +3955,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
},
)
def invoice(self, request, regie_id, invoice_id, **kwargs):
return {'data': self.get_invoice(regie_id, invoice_id)}
return {'data': self.get_invoice(regie_id, invoice_id).format_content()}
@endpoint(
display_category='Facture',
@ -3998,13 +3982,15 @@ class ToulouseMaelis(BaseResource, HTTPResource):
result = self.call(
'Invoice',
'payInvoices',
numDossier=invoice['maelis_item']['numFamily'],
numDossier=invoice.family_id,
codeRegie=regie_id,
amount=invoice['amount'],
amount=str(
Decimal(invoice.maelis_data['amountInvoice']) - Decimal(invoice.maelis_data['amountPaid'])
),
datePaiement=post_data['transaction_date'],
refTransaction=post_data['transaction_id'],
numInvoices=[invoice['display_id']],
numPerson=invoice['maelis_item']['payer']['num'],
numInvoices=[invoice.invoice_id],
numPerson=invoice.maelis_data['payer']['num'],
)
return {'data': result}
@ -4104,6 +4090,41 @@ class Invoice(models.Model):
def __repr__(self):
return '<Invoice "%s/%s">' % (self.regie_id, self.invoice_id)
def status(self):
if (
self.maelis_data['amountInvoice'] == self.maelis_data['amountPaid']
or self.maelis_notification_date is not None
):
return 'notified'
if self.lingo_notification_date is not None:
return 'paid'
return 'created'
def format_content(self):
item = self.maelis_data
paid = self.status() in ['paid', 'notified']
amount_paid = item['amountInvoice'] if paid else item['amountPaid']
invoice = {
'id': '%s-%s' % (item['numFamily'], item['numInvoice']),
'created': item['dateInvoice'][:10],
'pay_limit_date': item['dateDeadline'][:10],
'display_id': str(item['numInvoice']),
'total_amount': item['amountInvoice'],
'amount': str(Decimal(item['amountInvoice']) - Decimal(amount_paid)),
'amount_paid': amount_paid,
'label': item['libelleTTF'],
'has_pdf': bool(item['pdfName']),
'online_payment': True,
'paid': paid,
'payment_date': None,
'no_online_payment_reason': None,
'reference_id': item['numInvoice'],
'maelis_item': item,
}
if paid:
invoice.update({'pay_limit_date': '', 'online_payment': False})
return invoice
class Meta:
ordering = ('resource', 'regie_id', 'invoice_id')
unique_together = [['resource', 'regie_id', 'invoice_id']]

17
tests/test_toulouse_maelis.py
View File

@ -8825,7 +8825,7 @@ def test_create_nursery_demand_wrong_referential_key_error(con, app):
)
def test_invoices(invoice_service, con, app, caplog):
def test_invoices(invoice_service, con, app, caplog, freezer):
def request_check(request):
assert request.numDossier == 1312
assert request.codeRegie == 104
@ -8836,6 +8836,7 @@ def test_invoices(invoice_service, con, app, caplog):
)
url = get_endpoint('regie/104/invoices')
freezer.move_to('2023-03-03 18:00:00')
resp = app.get(url + '?family_id=1312')
assert resp.json['err'] == 0
assert len([x for x in caplog.records if 'Ajout de <Invoice "104/' in x.message]) == 2
@ -8874,18 +8875,24 @@ def test_invoices(invoice_service, con, app, caplog):
assert len([x for x in caplog.records if 'Mise à jour de <Invoice "104/' in x.message]) == 0
# No change
freezer.move_to('2023-03-03 18:10:00')
resp = app.get(url + '?NameID=local')
assert resp.json['err'] == 0
assert len([x for x in caplog.records if 'Ajout de <Invoice "104/' in x.message]) == 2
assert len([x for x in caplog.records if 'Mise à jour de <Invoice "104/' in x.message]) == 0
invoice = con.invoice_set.get(regie_id=104, invoice_id=30)
assert invoice.created.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:00:00'
assert invoice.updated.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:00:00'
assert invoice.maelis_data_update_date.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:00:00'
assert invoice.status() == 'created'
# Simulate change
invoice.maelis_data['pdfName'] = 'invoice.pdf'
invoice.save()
# Invoice updated
freezer.move_to('2023-03-03 18:20:00')
resp = app.get(url + '?NameID=local')
assert resp.json['err'] == 0
assert len([x for x in caplog.records if 'Ajout de <Invoice "104/' in x.message]) == 2
@ -8895,6 +8902,12 @@ def test_invoices(invoice_service, con, app, caplog):
== 'Mise à jour de <Invoice "104/30"> sur la famille \'1312\': [\'- "pdfName": null,\', \'+ "pdfName": "invoice.pdf",\']'
)
invoice = con.invoice_set.get(regie_id=104, invoice_id=30)
assert invoice.created.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:00:00'
assert invoice.updated.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:20:00'
assert invoice.maelis_data_update_date.strftime('%Y-%m-%d %H:%M:%S') == '2023-03-03 18:20:00'
assert invoice.status() == 'created'
@mock.patch('passerelle.utils.Request.get')
def test_invoices_cache(mocked_get, con, app):
@ -8997,7 +9010,7 @@ def test_invoices_history(invoice_service, con, app):
'pay_limit_date': '',
'display_id': '8',
'total_amount': '952503.6',
'amount': '0',
'amount': '0.0',
'amount_paid': '952503.6',
'label': 'CLAE JANVIER 2023',
'has_pdf': False,