0001-toulouse_smart-replace-by-_-in-field-varname-60870.patch

Benjamin Dauvergne, 20 janvier 2022 12:18

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

Subject: [PATCH] toulouse_smart: replace - by _ in field varname (#60870)

 passerelle/contrib/toulouse_smart/models.py   | 10 ++++----
 .../templates/toulouse_smart/wcs_block.wcs    |  2 +-
 passerelle/contrib/toulouse_smart/views.py    |  6 ++++-
 tests/test_toulouse_smart.py                  | 24 +++++++++----------
 4 files changed, 23 insertions(+), 19 deletions(-)

             data = {}
             cast = {'string': str, 'int': int, 'boolean': bool, 'item': str}
             for prop in intervention_type.get('properties') or []:
                 name = prop['name'].lower()
                 if block.get(name):
                 varname = slugify(prop['name']).replace('-', '_')
                 if block.get(varname):
                     try:
                         data[prop['name']] = cast[prop['type']](block[name])
                         data[prop['name']] = cast[prop['type']](block[varname])
                     except ValueError:
                         raise APIError(
                             "cannot cast '%s' field to %s : '%s'" % (name, cast[prop['type']], block[name]),
                             "cannot cast '%s' field to %s : '%s'" % (varname, cast[prop['type']], block[varname]),
                             http_status=400,
+                        )
                 elif prop['required']:
                     raise APIError("'%s' field is required on '%s' block" % (name, slug), http_status=400)
                     raise APIError("'%s' field is required on '%s' block" % (varname, slug), http_status=400)
             if self.wcs_requests.filter(wcs_form_api_url=post_data['form_api_url']):
                 raise APIError(

           <label>{{ property.displayName }}</label>
           <type>{{ property.type }}</type>
           <required>{{ property.required }}</required>
           <varname>{{ property.name|slugify }}</varname>
           <varname>{{ property.varname }}</varname>
           <display_locations>
             <display_location>validation</display_location>
             <display_location>summary</display_location>

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import copy
     import hashlib
     import uuid
     import zipfile
-...
             # generate file contents
             files = {}
             for intervention_type in self.object.get_intervention_types():
             # do not alter the cached intervention_types
             intervention_types = copy.deepcopy(self.object.get_intervention_types())
             for intervention_type in intervention_types:
                 slug = slugify(intervention_type['name'])
                 # only export intervention_type with properties
                 if not intervention_type.get('properties'):
-...
                 for prop in intervention_type['properties']:
                     # generate a natural id for fields
                     prop['id'] = make_id(slug + slugify(prop['name']))
                     prop['varname'] = slugify(prop['name']).replace('-', '_')
                     # adapt types
                     prop.setdefault('type', 'string')
                     if prop['type'] == 'boolean':

            <name>coin</name>
            <properties>
                <properties>
                   <name>FIELD1</name>
                   <name>TYPE-OBJET</name>
                   <displayName>Champ 1</displayName>
                   <type>string</type>
                   <required>false</required>
-...
                 'order': 1,
                 'properties': [
+                    {
                         'name': 'FIELD1',
                         'name': 'TYPE-OBJET',
                         'displayName': 'Champ 1',
                         'required': False,
                         'type': 'item',
-...
         assert [[td.text for td in tr.cssselect('td,th')] for tr in resp.pyquery('tr')] == [
             ["Nom du type d'intervention", 'Nom', 'Type', 'Requis', 'Valeur par défaut'],
             ['1 - coin'],
             [None, 'FIELD1', 'item («Candélabre», «Mât», «Ne sait pas»)', '✘', 'Ne sait pas'],
             [None, 'TYPE-OBJET', 'item («Candélabre», «Mât», «Ne sait pas»)', '✘', 'Ne sait pas'],
             [None, 'FIELD2', 'int', '✔', None],
             ['2 - empty'],
+        ]
-...
       <slug>coin</slug>
       <fields>
         <field>
           <id>038a8c2e-14de-4d4f-752f-496eb7fe90d7</id>
           <id>522697a9-de01-b198-9e37-58c35718203a</id>
           <label>Champ 1</label>
           <type>item</type>
           <required>False</required>
           <varname>field1</varname>
           <varname>type_objet</varname>
           <display_locations>
             <display_location>validation</display_location>
             <display_location>summary</display_location>
-...
     FIELDS_PAYLOAD = {
         'coin_raw': [
+            {
                 'field1': 'Candélabre',
                 'field1_raw': 'Candélabre',
                 'type_objet': 'Candélabre',
                 'type_objet_raw': 'Candélabre',
                 'field2': '42',
             },
         ],
-...
         'external_number': '42-2',
         'external_status': 'statut-1-wcs',
         'address': 'https://wcs.example.com/backoffice/management/foo/2/',
         'interventionData': {'FIELD1': 'Candélabre', 'FIELD2': 42},
         'interventionData': {'TYPE-OBJET': 'Candélabre', 'FIELD2': 42},
         'geom': {'type': 'Point', 'coordinates': [2.323349, 48.833708], 'crs': 'EPSG:4326'},
         'interventionTypeId': '1234',
         'notificationUrl': 'http://testserver/toulouse-smart/test/update-intervention?uuid=%s' % str(UUID),
-...
         field_payload = {
             'coin_raw': [
+                {
                     'field1': 'Candélabre',
                     'field1_raw': 'Candélabre',
                     'type_objet': 'Candélabre',
                     'type_objet_raw': 'Candélabre',
                     'field2': None,
                 },
             ],
-...
         field_payload = {
             'coin_raw': [
+                {
                     'field1': 'Candélabre',
                     'field1_raw': 'Candélabre',
                     'type_objet': 'Candélabre',
                     'type_objet_raw': 'Candélabre',
                 },
             ],
+        }
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-toulouse_smart-replace-by-_-in-field-varname-60870.patch