event_test

Author: matt-beanland

lib/diffo/helpers/util.ex

@@ -412,10 +412,28 @@ defmodule Diffo.Util do
 
   """
   def nest(list, tuple_keys, new_tuple_key) when is_list(list) and is_list(tuple_keys) do
-    {nested_list, remainder_list} = Enum.split_with(list, fn {tuple_key, _} -> tuple_key in tuple_keys end)
+    {nested_list, remainder_list} =
+      Enum.split_with(list, fn {tuple_key, _} -> tuple_key in tuple_keys end)
+
     set(remainder_list, new_tuple_key, nested_list)
   end
 
+  @doc """
+  Nest values from list of tuples into a map, with a new tuple key
+    ## Examples
+    iex> list = [state: :up, weeks: 1, days: 5]
+    iex> Diffo.Util.nest_as_map(list, [:weeks, :days], :duration)
+    iex>
+    [state: :up, duration: %{weeks: 1, days: 5}]
+
+  """
+  def nest_as_map(list, tuple_keys, new_tuple_key) when is_list(list) and is_list(tuple_keys) do
+    {nested_list, remainder_list} =
+      Enum.split_with(list, fn {tuple_key, _} -> tuple_key in tuple_keys end)
+
+    set(remainder_list, new_tuple_key, Map.new(nested_list))
+  end
+
   defimpl Jason.Encoder, for: Tuple do
     def encode(tuple, _opts) when is_tuple(tuple) do
       tuple

lib/diffo/provider/components/base_instance.ex

@@ -204,7 +204,7 @@ defmodule Diffo.Provider.BaseInstance do
       constraints one_of: Diffo.Provider.Service.service_operating_statuses()
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
 
@@ -479,7 +479,7 @@ defmodule Diffo.Provider.BaseInstance do
                 :places,
                 :parties
               ],
-              sort: [inserted_at: :desc]
+              sort: [created_at: :desc]
             )
   end
 

lib/diffo/provider/components/characteristic.ex

@@ -107,7 +107,7 @@ defmodule Diffo.Provider.Characteristic do
       constraints one_of: [:instance, :feature, :relationship]
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end

lib/diffo/provider/components/entity.ex

@@ -112,7 +112,7 @@ defmodule Diffo.Provider.Entity do
       public? true
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end

lib/diffo/provider/components/entity_ref.ex

@@ -94,7 +94,7 @@ defmodule Diffo.Provider.EntityRef do
       public? true
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end
@@ -121,7 +121,7 @@ defmodule Diffo.Provider.EntityRef do
   end
 
   preparations do
-    prepare build(load: [:entity], sort: [inserted_at: :desc])
+    prepare build(load: [:entity], sort: [created_at: :desc])
   end
 
   @doc """

lib/diffo/provider/components/event.ex

@@ -4,7 +4,7 @@
 
 defmodule Diffo.Provider.Event do
   @moduledoc """
-  Diffo - TMF Service and Resource Management with a difference
+  Diffo - TMF Service and Reource Management with a difference
 
   Event - Ash Resource for a TMF Event
   """
@@ -21,28 +21,34 @@ defmodule Diffo.Provider.Event do
     plural_name :events
   end
 
+  code_interface do
+    define :create
+    define :destroy
+  end
+
   neo4j do
     relate [
-      {:instance, :FIRED, :incoming, :Instance},
-      #{:earlier_event, :AFTER, :outgoing, :Event}
+      {:instance, :FIRED, :incoming, :Instance}
+      # {:earlier_event, :AFTER, :outgoing, :Event}
     ]
   end
 
   jason do
-    rename id: :eventId, inserted_at: :eventTime, type: :eventType
+    pick [:id, :created_at, :type, :instance]
+    rename id: :eventId, created_at: :eventTime, type: :eventType
 
     customize fn result, record ->
       result
-      |> Event.time(record)
-      |> Util.rename(:instance, record.type)
-      |> Util.nest([record.type], :event)
+      |> __MODULE__.time(record)
+      |> Util.rename(:instance, record.instance_type)
+      |> Util.nest_as_map([record.instance_type], :event)
     end
 
     order [:eventId, :eventTime, :eventType, :event]
   end
 
   outstanding do
-    expect [:eventType, :eventTime, :event]
+    expect [:type, :created_at, :instance_id, :instance]
   end
 
   actions do
@@ -52,11 +58,11 @@ defmodule Diffo.Provider.Event do
       description "creates an event, fired by an instance"
       accept [:type]
       argument :instance_id, :uuid
-      argument :earlier_event_id, :uuid
+      # argument :earlier_event_id, :uuid
 
       change manage_relationship(:instance_id, :instance, type: :append_and_remove)
-      #change manage_relationship(:earlier_event_id, :earlier_event, type: :append_and_remove)
-      change load [:instance_type]
+      # change manage_relationship(:earlier_event_id, :earlier_event, type: :append_and_remove)
+      change load [:instance_type, :instance]
     end
 
     read :list do
@@ -80,9 +86,20 @@ defmodule Diffo.Provider.Event do
       description "the type of the event"
       allow_nil? false
       public? true
+
+      constraints one_of: [
+                    :serviceCreateEvent,
+                    :serviceStateChangeEvent,
+                    :serviceAttributeValueChangeEvent,
+                    :serviceDeleteEvent,
+                    :resourceCreateEvent,
+                    :resourceStateChangeEvent,
+                    :resourceAttributeValueChangeEvent,
+                    :resourceDeleteEvent
+                  ]
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end
@@ -94,11 +111,11 @@ defmodule Diffo.Provider.Event do
       public? true
     end
 
-    #has_one :earlier_event, Diffo.Provider.Event do
+    # has_one :earlier_event, Diffo.Provider.Event do
     #  description "the earlier event, if any"
     #  allow_nil? true
     #  public? true
-    #end
+    # end
   end
 
   calculations do
@@ -110,17 +127,18 @@ defmodule Diffo.Provider.Event do
   end
 
   preparations do
-    prepare build(load: [:instance_type], sort: [inserted_at: :desc])
+    prepare build(load: [:instance_type, :instance], sort: [created_at: :desc])
   end
 
+  @spec time([tuple()], any()) :: [tuple()]
   @doc """
   Assists in encoding event time
   """
   def time(result, record) do
     result
     |> Diffo.Util.set(
       :eventTime,
-      Diffo.Util.to_iso8601(record.inserted_at)
+      Diffo.Util.to_iso8601(record.created_at)
     )
   end
 

lib/diffo/provider/components/external_identifier.ex

@@ -111,7 +111,7 @@ defmodule Diffo.Provider.ExternalIdentifier do
       public? true
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end
@@ -144,20 +144,20 @@ defmodule Diffo.Provider.ExternalIdentifier do
   end
 
   preparations do
-    prepare build(load: [:owner], sort: [inserted_at: :desc])
+    prepare build(load: [:owner], sort: [created_at: :desc])
   end
 
   @doc """
   Compares two external identifier, by most recent insertion order
   ## Examples
-    iex> Diffo.Provider.ExternalIdentifier.compare(%{inserted_at: "a"}, %{inserted_at: "a"})
+    iex> Diffo.Provider.ExternalIdentifier.compare(%{created_at: "a"}, %{created_at: "a"})
     :eq
-    iex> Diffo.Provider.ExternalIdentifier.compare(%{inserted_at: "b"}, %{inserted_at: "a"})
+    iex> Diffo.Provider.ExternalIdentifier.compare(%{created_at: "b"}, %{created_at: "a"})
     :gt
-    iex> Diffo.Provider.ExternalIdentifier.compare(%{inserted_at: "a"}, %{inserted_at: "b"})
+    iex> Diffo.Provider.ExternalIdentifier.compare(%{created_at: "a"}, %{created_at: "b"})
     :lt
 
   """
-  def compare(%{inserted_at: inserted_at0}, %{inserted_at: inserted_at1}),
-    do: Diffo.Util.compare(inserted_at0, inserted_at1)
+  def compare(%{created_at: created_at0}, %{created_at: created_at1}),
+    do: Diffo.Util.compare(created_at0, created_at1)
 end

lib/diffo/provider/components/feature.ex

@@ -109,7 +109,7 @@ defmodule Diffo.Provider.Feature do
       default true
     end
 
-    create_timestamp :inserted_at
+    create_timestamp :created_at
 
     update_timestamp :updated_at
   end

lib/diffo/provider/components/instance/extension/party.ex

@@ -47,7 +47,7 @@ defmodule Diffo.Provider.Instance.Party do
             {:error, "couldn't relate parties"}
 
           _ ->
-            # sorted = Ash.Sort.runtime_sort(party_refs, [role: :asc, inserted_at: :desc])
+            # sorted = Ash.Sort.runtime_sort(party_refs, [role: :asc, created_at: :desc])
             {:ok, result |> Map.put(:parties, party_refs)}
         end
     end

lib/diffo/provider/components/instance/extension/place.ex

@@ -47,7 +47,7 @@ defmodule Diffo.Provider.Instance.Place do
             {:error, "couldn't relate places"}
 
           _ ->
-            # sorted = Ash.Sort.runtime_sort(place_refs, [role: :asc, inserted_at: :desc])
+            # sorted = Ash.Sort.runtime_sort(place_refs, [role: :asc, created_at: :desc])
             {:ok, result |> Map.put(:places, place_refs)}
         end
     end