[SCHEMATIC-277] fix bug where columnType mistaken conflicts with no type validation type (#1635)

* fix bug where columnType mistaken conflicts with no type validaiton rules

* rearange logic

* remove unneeded comments

Author: andrewelamb

schematic/schemas/create_json_schema.py

@@ -281,30 +281,28 @@ def _get_validation_rule_based_fields(
         # Schematic will use the implicit type if the explicit type isn't specified for now,
         #   but this behavior is deprecated and will be removed in the future by SCHEMATIC-326
         implicit_js_type = get_js_type_from_inputted_rules(validation_rules)
-        # If there is an explicit type set...
-        if explicit_js_type:
-            # and the implicit type conflicts with the explicit type, then an exception is raised
-            if explicit_js_type != implicit_js_type:
-                msg = (
-                    f"Property: '{name}', has explicit type: '{explicit_js_type}' "
-                    f"that conflicts with the implicit type: '{implicit_js_type}' "
-                    f"derived from its validation rules: {validation_rules}"
-                )
-                raise ValueError(msg)
-        # If there is no explicit type...
-        else:
-            # and there is an implicit type...
-            if implicit_js_type:
-                # then the implicit type is used...
-                js_type = implicit_js_type
-                # and a warning is raised since this behavior is deprecated
-                msg = (
-                    f"No explicit type set for property: '{name}', "
-                    "using validation rules to set the type. "
-                    "Using validation rules to set type is deprecated. "
-                    "You should set the columnType for this property in your data model."
-                )
-                warnings.warn(msg)
+        # If there is an explicit and implicit type set and the implicit type conflicts with the
+        # explicit type, then an exception is raised
+        if (
+            explicit_js_type
+            and implicit_js_type
+            and explicit_js_type != implicit_js_type
+        ):
+            msg = (
+                f"Property: '{name}', has explicit type: '{explicit_js_type}' "
+                f"that conflicts with the implicit type: '{implicit_js_type}' "
+                f"derived from its validation rules: {validation_rules}"
+            )
+            raise ValueError(msg)
+        if implicit_js_type:
+            js_type = implicit_js_type
+            msg = (
+                f"No explicit type set for property: '{name}', "
+                "using validation rules to set the type. "
+                "Using validation rules to set type is deprecated. "
+                "You should set the columnType for this property in your data model."
+            )
+            warnings.warn(msg)
 
         if ValidationRuleName.URL in validation_rule_names:
             js_format = JSONSchemaFormat.URI

tests/unit/test_create_json_schema.py

@@ -283,6 +283,16 @@ def test_get_validation_rule_based_fields_no_explicit_type(
             None,
             None,
         ),
+        (
+            ["list"],
+            JSONSchemaType.STRING,
+            JSONSchemaType.STRING,
+            True,
+            None,
+            None,
+            None,
+            None,
+        ),
         (
             ["inRange 50 100"],
             JSONSchemaType.NUMBER,
@@ -324,7 +334,7 @@ def test_get_validation_rule_based_fields_no_explicit_type(
             JSONSchemaFormat.URI,
         ),
     ],
-    ids=["No rules", "String", "InRange", "Regex", "Date", "URL"],
+    ids=["No rules", "String", "List string", "InRange", "Regex", "Date", "URL"],
 )
 def test_get_validation_rule_based_fields_with_explicit_type(
     validation_rules: list[str],