0001-api-add-include-workflow-data-param-71330.patch

Lauréline Guérin, 15 novembre 2022 16:46

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

Subject: [PATCH] api: add include-workflow-data param (#71330)

 tests/api/test_carddata.py   | 10 ++++++++++
 tests/api/test_formdata.py   | 15 +++++++++++++--
 wcs/backoffice/management.py | 14 +++++++++++++-
 wcs/formdata.py              | 10 +++++++---
 4 files changed, 43 insertions(+), 6 deletions(-)

     from wcs.api_access import ApiAccess
     from wcs.carddef import CardDef
     from wcs.qommon.http_request import HTTPRequest
     from wcs.qommon.upload_storage import PicklableUpload
     from ..utilities import clean_temporary_pub, create_temporary_pub, get_app
     from .utils import sign_uri
-...
         carddata.data = {'1': 'FOO BAR'}
         carddata.user_id = local_user.id
         carddata.just_created()
         upload = PicklableUpload('test.txt', 'text/plain', 'ascii')
         upload.receive([b'test'])
         upload2 = PicklableUpload('test.txt', 'text/plain', 'ascii')
         upload2.receive([b'test'])
         carddata.workflow_data = {'blah': upload, 'blah2': upload2, 'xxx': 23}
         carddata.store()
         ApiAccess.wipe()
-...
         assert 'submission' in resp.json['data'][0]
         resp = get_url('/api/cards/test/list?include-workflow=on')
         assert 'workflow' in resp.json['data'][0]
         assert 'data' not in resp.json['data'][0]['workflow']
         resp = get_url('/api/cards/test/list?include-workflow-data=on')
         assert 'workflow' in resp.json['data'][0]
         assert 'data' in resp.json['data'][0]['workflow']
     def test_carddata_user_fields(pub, local_user):

             '?include-roles=on',
             '?include-submission=on',
             '?include-workflow=on',
             '?include-workflow-data=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'user' not in resp.json[0]
-...
             '?include-evolution=on',
             '?include-roles=on',
             '?include-workflow=on',
             '?include-workflow-data=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'submission' not in resp.json[0]
-...
             '?include-evolution=on',
             '?include-roles=on',
             '?include-submission=on',
             '?include-workflow=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'workflow' not in resp.json[0]
         for params in ['?full=on', '?include-workflow=on']:
             if 'workflow' in params:
                 assert 'workflow' in resp.json[0]
                 assert 'data' not in resp.json[0]['workflow']
             else:
                 assert 'workflow' not in resp.json[0]
         for params in ['?full=on', '?include-workflow-data=on']:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'workflow' in resp.json[0]
             assert 'data' in resp.json[0]['workflow']
     def test_formdata_with_evolution_part_attachment(pub, local_user):
-...
             '?include-roles=on',
             '?include-submission=on',
             '?include-workflow=on',
             '?include-workflow-data=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'evolution' not in resp.json[0]
-...
             '?include-roles=on',
             '?include-submission=on',
             '?include-workflow=on',
             '?include-workflow-data=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'evolution' not in resp.json[0]
-...
             '?include-evolution=on',
             '?include-submission=on',
             '?include-workflow=on',
             '?include-workflow-data=on',
         ]:
             resp = get_app(pub).get(sign_uri('/api/forms/test/list%s' % params, user=local_user))
             assert 'roles' not in resp.json[0]

             include_roles = get_request().form.get('include-roles') == 'on' or full
             include_submission = get_request().form.get('include-submission') == 'on' or full
             include_workflow = get_request().form.get('include-workflow') == 'on' or full
             if include_fields or include_evolution or include_roles or include_submission or include_workflow:
             include_workflow_data = get_request().form.get('include-workflow-data') == 'on' or full
             if (
                 include_fields
                 or include_evolution
                 or include_roles
                 or include_submission
                 or include_workflow
                 or include_workflow_data
             ):
                 output = JsonFileExportAfterJob(self.formdef).create_json_export(
                     items,
                     user=user,
-...
                     include_fields=include_fields,
                     include_unnamed_fields=False,
                     include_workflow=include_workflow,
                     include_workflow_data=include_workflow_data,
+                )
             else:
                 output = [
-...
             include_fields,
             include_unnamed_fields,
             include_workflow,
             include_workflow_data,
         ):
             # noqa pylint: disable=too-many-arguments
             formdef = self.kwargs['formdef_class'].get(self.kwargs['formdef_id'])
-...
                     include_fields=include_fields,
                     include_unnamed_fields=include_unnamed_fields,
                     include_workflow=include_workflow,
                     include_workflow_data=include_workflow_data,
+                )
                 data.pop('digests')
                 if digest_key:
-...
                         include_fields=True,
                         include_unnamed_fields=True,
                         include_workflow=True,
                         include_workflow_data=True,
+                    )
                 },
                 indent=2,

             include_fields=True,
             include_unnamed_fields=False,
             include_workflow=True,
             include_workflow_data=True,
         ):
             # noqa pylint: disable=too-many-arguments
             data = {}
-...
                 wf_real_status = self.get_status()
                 if wf_real_status:
                     data['workflow']['real_status'] = {'id': wf_real_status.id, 'name': wf_real_status.name}
                 # Workflow data have unknown purpose, do not store them in anonymised export
                 if self.workflow_data and not anonymise:
                     data['workflow']['data'] = self.workflow_data
                 if self.formdef.workflow.get_backoffice_fields():
                     data['workflow']['fields'] = self.get_json_dict(
                         self.formdef.workflow.get_backoffice_fields(),
-...
                         anonymise=anonymise,
                         include_unnamed_fields=include_unnamed_fields,
+                    )
             if include_workflow_data:
                 # Workflow data have unknown purpose, do not store them in anonymised export
                 if self.workflow_data and not anonymise:
                     if 'workflow' not in data:
                         data['workflow'] = {}
                     data['workflow']['data'] = self.workflow_data
             if include_roles:
                 # add a roles dictionary, with workflow functions and two special
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-api-add-include-workflow-data-param-71330.patch