toulouse-maelis: do not update basket removal date (#79253)
gitea/passerelle/pipeline/head This commit looks good Details

This commit is contained in:
Nicolas Roche 2023-06-30 11:58:31 +02:00 committed by Nicolas Roche
parent 7cbd27afd3
commit 659ba18a00
2 changed files with 12 additions and 1 deletions

View File

@ -807,7 +807,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
for line in basket['lignes']:
basket_id_ins[regie_id].append(line['idIns'])
for subscription in self.subscription_set.filter(invoice__isnull=True, family_id=family_id):
for subscription in self.subscription_set.filter(
basket_removal_date__isnull=True, invoice__isnull=True, family_id=family_id
):
for line in subscription.maelis_data['basket']['lignes']:
if line['idIns'] in basket_id_ins.get(subscription.regie_id, []):
break

View File

@ -11380,6 +11380,7 @@ def test_trigger_wcs_on_removed_subscriptions_cron(
assert resp.json['err'] == 0
subscription = con.subscription_set.get(wcs_form_number='13-12')
assert subscription.basket_removal_date is None
assert subscription.status() == 'pending_basket'
assert [x['idIns'] for x in subscription.maelis_data['basket']['lignes']] == ['S10055641658']
@ -11397,8 +11398,16 @@ def test_trigger_wcs_on_removed_subscriptions_cron(
assert any(['trigger wcs' in x.message for x in caplog.records])
subscription = con.subscription_set.get(wcs_form_number='13-12')
assert subscription.basket_removal_date.isoformat() == '2023-03-03T18:20:00+00:00'
assert subscription.status() == 'removed'
assert subscription.trigger_status() == 'triggered'
# removal date is keept
freezer.move_to('2023-03-03 19:20:00')
con.hourly()
subscription = con.subscription_set.get(wcs_form_number='13-12')
assert subscription.basket_removal_date.isoformat() == '2023-03-03T18:20:00+00:00'
def test_trigger_wcs_on_removed_subscriptions_job(
family_service, activity_service, wcs_service, con, app, freezer, caplog