Merge pull request #27 from Recruitee/adjust-validation-for-additional-fields

Adjust validation

Author: rdk08

lib/plausible/helpers/value.ex

@@ -1,5 +1,5 @@
 defmodule Plausible.ValueHelpers do
-  @prefix_pattern "[a-zA-Z]+"
+  @prefix_pattern "[a-zA-Z]+(-[a-zA-Z]+)*"
   @id_pattern "\\d+"
   @uuid_pattern "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
 

test/plausible/helpers/value_test.exs

@@ -0,0 +1,56 @@
+defmodule Plausible.ValueHelpersTest do
+  use Plausible.DataCase
+  use Timex
+
+  alias Plausible.ValueHelpers
+
+  describe "validate/2" do
+    test "returns prefixed value (with integer id) if it is successfully validated" do
+      value = "vendor-123"
+
+      assert ValueHelpers.validate(value, type: :prefixed_id) == value
+    end
+
+    test "returns prefixed value (with uuid) if it is successfully validated" do
+      value = "vendor-c2b5da86-851a-4aee-ac48-19d6069556c5"
+
+      assert ValueHelpers.validate(value, type: :prefixed_id) == value
+    end
+
+    test "returns prefixed value (with multipart prefix and id) if it is successfully validated" do
+      value = "other-vendor-prefix-456"
+
+      assert ValueHelpers.validate(value, type: :prefixed_id) == value
+    end
+
+    test "returns prefixed value (with multipart prefix and uuid id) if it is successfully validated" do
+      value = "other-vendor-prefix-782f008a-b478-4aac-8448-16569a0e4501"
+
+      assert ValueHelpers.validate(value, type: :prefixed_id) == value
+    end
+
+    test "returns nil if value does not match predefined pattern (missing id)" do
+      value = "vendor"
+
+      refute ValueHelpers.validate(value, type: :prefixed_id)
+    end
+
+    test "returns nil if value does not match predefined pattern (wrong id)" do
+      value = "vendor-123d"
+
+      refute ValueHelpers.validate(value, type: :prefixed_id)
+    end
+
+    test "returns nil if value does not match predefined pattern (wrong uuid)" do
+      value = "vendor-abcdefgh123-782f008a-b478-4aac-8448"
+
+      refute ValueHelpers.validate(value, type: :prefixed_id)
+    end
+
+    test "returns nil if value does not match predefined pattern (no prefix)" do
+      value = "123"
+
+      refute ValueHelpers.validate(value, type: :prefixed_id)
+    end
+  end
+end