Remove system_date_time from device optional fields

hammeraj · Aug 1, 2024 · cddae05 · cddae05
1 parent 56b9038
commit cddae05
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/lib/device.ex b/lib/device.ex
@@ -21,8 +21,7 @@ defmodule Onvif.Device do
     :auth_type,
     :time_diff_from_system_secs,
     :port,
-    :device_service_path,
-    :system_date_time
+    :device_service_path
   ]
 
   @type t :: %__MODULE__{}

diff --git a/lib/media/ver10/osd.ex b/lib/media/ver10/osd.ex
@@ -193,7 +193,16 @@ defmodule Onvif.Media.Ver10.OSD do
     ])
     |> cast_embed(:font_color, with: &color_changeset/2)
     |> cast_embed(:background_color, with: &color_changeset/2)
-    |> validate_inclusion(:date_format, ["M/d/yyyy", "MM/dd/yyyy", "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "dddd, MMMM dd, yyyy", "MMMM dd, yyyy", "dd MMMM, yyyy"])
+    |> validate_inclusion(:date_format, [
+      "M/d/yyyy",
+      "MM/dd/yyyy",
+      "dd/MM/yyyy",
+      "yyyy/MM/dd",
+      "yyyy-MM-dd",
+      "dddd, MMMM dd, yyyy",
+      "MMMM dd, yyyy",
+      "dd MMMM, yyyy"
+    ])
     |> validate_inclusion(:time_format, ["h:mm:ss tt", "hh:mm:ss tt", "H:mm:ss", "HH:mm:ss"])
   end
 

diff --git a/test/device_test.exs b/test/device_test.exs
@@ -0,0 +1,13 @@
+defmodule Onvif.DeviceTest do
+  use ExUnit.Case, async: true
+
+  @moduletag capture_log: true
+
+  describe "to_struct/1" do
+    test "should parse given map to a valid device struct" do
+      device_map = Onvif.Factory.device() |> Jason.encode!() |> Jason.decode!()
+      {:ok, device} = Onvif.Device.to_struct(device_map)
+      assert device == Onvif.Factory.device()
+    end
+  end
+end
diff --git a/test/media/get_service_capabilities_test.exs → ...a/ver10/get_service_capabilities_test.exs b/test/media/get_service_capabilities_test.exs → ...a/ver10/get_service_capabilities_test.exs