Locations : Set error messages similar to targets/enumerators end point

app/blueprints/docs/surveystream.yml

@@ -3687,9 +3687,9 @@ paths:
                         description: >-
                           The field type of the column. Can be one of
                           `personal_details`, `custom_field`, or `location`.
-                      bulk_editable:
+                      allow_null_values:
                         type: boolean
-                        description: Whether the field is bulk editable or not
+                        description: Whether the field allows null values or not
                       column_source:
                         type: string
                         description: >-
@@ -3698,7 +3698,6 @@ paths:
                     required:
                       - column_name
                       - column_type
-                      - bulk_editable
                       - column_source
               required:
                 - form_uid
@@ -3757,9 +3756,9 @@ paths:
                               description: >
                                 The field type of the column. Can be one of
                                 `personal_details`, `custom_field`, or `location`.
-                            bulk_editable:
+                            allow_null_values:
                               type: boolean
-                              description: Whether the field is bulk editable or not.
+                              description: Whether the field allows null values or not.
                             column_source:
                               type: string
                               description: >-
@@ -7382,13 +7381,12 @@ paths:
                         description: >-
                           The field type of the column. Can be one of
                           `basic_details`, `custom_field`, or `location`.
-                      bulk_editable:
+                      allow_null_values:
                         type: boolean
-                        description: Whether the field is bulk editable or not
+                        description: Whether the field allows null values or not
                     required:
                       - column_name
                       - column_type
-                      - bulk_editable
                 filters:
                   type: array
                   description: >-
@@ -7459,9 +7457,9 @@ paths:
                         items:
                           type: object
                           properties:
-                            bulk_editable:
+                            allow_null_values:
                               type: boolean
-                              description: Whether the field is bulk editable or not.
+                              description: Whether the field allows null values or not.
                             column_name:
                               type: string
                               description: The field name of the column.

app/blueprints/enumerators/controllers.py

@@ -1027,7 +1027,12 @@ def bulk_update_enumerators(validated_payload):
     }
 
     for column in column_config:
-        if column.column_type != "location" and column.bulk_editable is True:
+        if column.column_type != "location" and column.column_name not in (
+            "enumerator_id",
+            "email",
+            "mobile_primary",
+            "name",
+        ):
             bulk_editable_fields[column.column_type].append(column.column_name)
 
     personal_details_patch_keys = []
@@ -1264,23 +1269,13 @@ def update_enumerator_column_config(validated_payload):
     db.session.flush()
 
     for column in payload["column_config"]:
-        if not isinstance(column["bulk_editable"], bool):
-            return (
-                jsonify(
-                    {
-                        "success": False,
-                        "errors": f"Field 'bulk_editable' must be a boolean",
-                    }
-                ),
-                422,
-            )
 
         db.session.add(
             EnumeratorColumnConfig(
                 form_uid=form_uid,
                 column_name=column["column_name"],
                 column_type=column["column_type"],
-                bulk_editable=column["bulk_editable"],
+                allow_null_values=column["allow_null_values"],
             )
         )
 
@@ -1323,7 +1318,7 @@ def get_enumerator_column_config(validated_query_params):
         {
             "column_name": column.column_name,
             "column_type": column.column_type,
-            "bulk_editable": column.bulk_editable,
+            "allow_null_values": column.allow_null_values,
         }
         for column in column_config
     ]

app/blueprints/enumerators/models.py

@@ -1,10 +1,12 @@
-from app import db
-from app.blueprints.forms.models import Form
-from app.blueprints.locations.models import Location
 from sqlalchemy import CheckConstraint
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import backref
 from sqlalchemy.ext.mutable import MutableDict
+from sqlalchemy.orm import backref
+
+from app import db
+from app.blueprints.forms.models import Form
+from app.blueprints.locations.models import Location
+
 
 class Enumerator(db.Model):
     """
@@ -237,7 +239,7 @@ class EnumeratorColumnConfig(db.Model):
         ),
         nullable=False,
     )
-    bulk_editable = db.Column(db.Boolean(), nullable=False, default=False)
+    allow_null_values = db.Column(db.Boolean(), nullable=False, server_default="true")
 
     __table_args__ = (
         db.PrimaryKeyConstraint("form_uid", "column_name"),