Merge pull request #35 from diffo-dev/dev

matt-beanland · web-flow · commit 63c0506ea7fa · 2026-05-10T05:06:55.000+09:30
rebase
diff --git a/.formatter.exs b/.formatter.exs
@@ -3,30 +3,21 @@
 # SPDX-License-Identifier: MIT
 
 # Used by "mix format"
-locals_without_parens = [
-  id: 1,
-  category: 1,
-  is_enabled?: 1,
-  characteristic: 2,
-  pick: 1,
-  rename: 1,
-  field: 3,
-  expect: 1,
-  relate: 1,
-  translate: 1,
-  guard: 1,
-  customize: 1,
-  order: 1,
-  initial_states: 1,
-  default_initial_state: 1,
-  state_attribute: 1,
-  transition: 1
-]
+locals_without_parens = []
 
 [
   plugins: [Spark.Formatter],
   inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
-  import_deps: [:ash],
+  import_deps: [
+    :diffo,
+    :ash,
+    :ash_state_machine,
+    :ash_neo4j,
+    :ash_jason,
+    :ash_outstanding,
+    :ash_json_api,
+    :plug
+  ],
   locals_without_parens: locals_without_parens,
   export: [
     locals_without_parens: locals_without_parens
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,5 @@ diffo-*.tar
 .DS_Store
 
 # Agent related
-.claude/*
+.claude/*
+CLAUDE*
diff --git a/.igniter.exs b/.igniter.exs
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2025 diffo_example contributors <https://github.com/diffo-dev/diffo_example/graphs.contributors>
+#
+# SPDX-License-Identifier: MIT
+
+# This is a configuration file for igniter.
+# For option documentation, see https://hexdocs.pm/igniter/Igniter.Project.IgniterConfig.html
+# To keep it up to date, use `mix igniter.setup`
+[
+  module_location: :outside_matching_folder,
+  extensions: [],
+  deps_location: :last_list_literal,
+  source_folders: ["lib", "test/support"],
+  dont_move_files: [~r"lib/mix"]
+]
diff --git a/config/runtime.exs b/config/runtime.exs
@@ -4,6 +4,12 @@
 
 import Config
 
+config :bolty, Bolt,
+  uri: "bolt://localhost:7687",
+  auth: [username: "neo4j", password: "password"],
+  pool_size: 10,
+  name: Bolt
+
 if config_env() == :prod do
   database_url =
     System.get_env("DATABASE_URL") ||
diff --git a/lib/access/resources/characteristic_values/cable_value.ex b/lib/access/resources/characteristic_values/cable_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.CableValue do
 
   jason do
     pick [:name, :pairs, :length, :loss, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/resources/characteristic_values/card_value.ex b/lib/access/resources/characteristic_values/card_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.CardValue do
 
   jason do
     pick [:name, :family, :model, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/resources/characteristic_values/float_unit.ex b/lib/access/resources/characteristic_values/float_unit.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.FloatUnit do
 
   jason do
     pick [:amount, :unit]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/resources/characteristic_values/integer_unit.ex b/lib/access/resources/characteristic_values/integer_unit.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.IntegerUnit do
 
   jason do
     pick [:amount, :unit]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/resources/characteristic_values/path_value.ex b/lib/access/resources/characteristic_values/path_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.PathValue do
 
   jason do
     pick [:name, :sections, :length, :loss, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/resources/characteristic_values/shelf_value.ex b/lib/access/resources/characteristic_values/shelf_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.ShelfValue do
 
   jason do
     pick [:name, :family, :model, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/services/characteristic_values/aggregate_interface.ex b/lib/access/services/characteristic_values/aggregate_interface.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.AggregateInterface do
 
   jason do
     pick [:name, :physical_interface, :physical_layer, :link_layer, :svlan_id, :vpi]
-    compact(true)
+    compact true
 
     rename physical_interface: "physicalInterface",
            physical_layer: "physicalLayer",
diff --git a/lib/access/services/characteristic_values/bandwidth_profile.ex b/lib/access/services/characteristic_values/bandwidth_profile.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.BandwidthProfile do
 
   jason do
     pick [:downstream, :upstream, :units]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/services/characteristic_values/circuit.ex b/lib/access/services/characteristic_values/circuit.ex
@@ -14,7 +14,7 @@ defmodule DiffoExample.Access.Circuit do
 
   jason do
     pick [:circuit_id, :cvlan_id, :vci, :encapsulation, :bandwidth_profile]
-    compact(true)
+    compact true
     rename circuit_id: "circuitId", vci: "VCI", bandwidth_profile: "bandwidthProfile"
   end
 
diff --git a/lib/access/services/characteristic_values/constraints.ex b/lib/access/services/characteristic_values/constraints.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.Constraints do
 
   jason do
     pick [:max_latency, :min_profile]
-    compact(true)
+    compact true
     rename max_latency: "maxLatency", min_profile: "minProfile"
   end
 
diff --git a/lib/access/services/characteristic_values/dslam.ex b/lib/access/services/characteristic_values/dslam.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.Dslam do
 
   jason do
     pick [:name, :family, :model, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/access/services/characteristic_values/line.ex b/lib/access/services/characteristic_values/line.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Access.Line do
 
   jason do
     pick [:port, :slot, :standard, :profile]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/initializer.ex b/lib/nbn/initializer.ex
@@ -14,12 +14,12 @@ defmodule DiffoExample.Nbn.Initializer do
 
   @rsps [
     %{name: "Wedge-tail Telecom", short_name: :wedgetail, id: "0001"},
-    %{name: "Quokka Connect",     short_name: :quokka,    id: "0002"},
-    %{name: "Ibis Telecom",       short_name: :ibis,      id: "0003"},
-    %{name: "Taipan Group",       short_name: :taipan,    id: "0004"},
-    %{name: "Echidna Networks",   short_name: :echidna,   id: "0005"},
-    %{name: "Dugong Digital",     short_name: :dugong,    id: "0006"},
-    #%{name: "Lyrebird",           short_name: :lyrebird,  id: "0007"}
+    %{name: "Quokka Connect", short_name: :quokka, id: "0002"},
+    %{name: "Ibis Telecom", short_name: :ibis, id: "0003"},
+    %{name: "Taipan Group", short_name: :taipan, id: "0004"},
+    %{name: "Echidna Networks", short_name: :echidna, id: "0005"},
+    %{name: "Dugong Digital", short_name: :dugong, id: "0006"}
+    # %{name: "Lyrebird",           short_name: :lyrebird,  id: "0007"}
   ]
 
   def init do
@@ -35,7 +35,9 @@ defmodule DiffoExample.Nbn.Initializer do
           {:error, _} -> seed_rsp(attrs)
         end
       rescue
-        e -> require Logger; Logger.error("Exception seeding RSP #{attrs.id}: #{inspect(e)}")
+        e ->
+          require Logger
+          Logger.error("Exception seeding RSP #{attrs.id}: #{inspect(e)}")
       end
     end)
   end
diff --git a/lib/nbn/nbn.ex b/lib/nbn/nbn.ex
@@ -101,7 +101,6 @@ defmodule DiffoExample.Nbn do
       base_route "/rsp", Rsp do
         get :read
       end
-
     end
   end
 
@@ -171,6 +170,5 @@ defmodule DiffoExample.Nbn do
       define :suspend_rsp, action: :suspend
       define :deactivate_rsp, action: :deactivate
     end
-
   end
 end
diff --git a/lib/nbn/resources/avc.ex b/lib/nbn/resources/avc.ex
@@ -24,15 +24,15 @@ defmodule DiffoExample.Nbn.Avc do
     extensions: [AshJsonApi.Resource],
     authorizers: [Ash.Policy.Authorizer]
 
-  json_api do
-    type "avc"
-  end
-
   resource do
     description "An Ash Resource representing an Access Virtual Circuit (AVC)"
     plural_name :Avcs
   end
 
+  json_api do
+    type "avc"
+  end
+
   structure do
     specification do
       id "b2c3d4e5-6f7a-4b8c-9d0e-1f2a3b4c5d6e"
@@ -54,14 +54,6 @@ defmodule DiffoExample.Nbn.Avc do
     end
   end
 
-  attributes do
-    attribute :rsp_id, :string do
-      description "the owning RSP's id — nil for Perentie-managed infrastructure"
-      allow_nil? true
-      public? true
-    end
-  end
-
   actions do
     create :build do
       description "creates a new AVC resource instance"
@@ -115,13 +107,21 @@ defmodule DiffoExample.Nbn.Avc do
     end
   end
 
+  attributes do
+    attribute :rsp_id, :string do
+      description "the owning RSP's id — nil for Perentie-managed infrastructure"
+      allow_nil? true
+      public? true
+    end
+  end
+
   def identifier() do
     DiffoExample.Nbn.Util.identifier("AVC")
   end
 
   # mines related resource to characteristics
   def mine_related(changeset, _context) when is_struct(changeset, Ash.Changeset) do
-    avc = Ash.load!(changeset.data, [reverse_relationships: [:characteristics]])
+    avc = Ash.load!(changeset.data, reverse_relationships: [:characteristics])
 
     cvlan = {:cvlan, Diffo.Unwrap.unwrap(hd(hd(avc.reverse_relationships).characteristics).value)}
 
diff --git a/lib/nbn/resources/characteristic_values/avc_value.ex b/lib/nbn/resources/characteristic_values/avc_value.ex
@@ -14,7 +14,7 @@ defmodule DiffoExample.Nbn.AvcValue do
 
   jason do
     pick [:cvlan, :bandwidth_profile]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/resources/characteristic_values/cvc_value.ex b/lib/nbn/resources/characteristic_values/cvc_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Nbn.CvcValue do
 
   jason do
     pick [:svlan, :bandwidth]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/resources/characteristic_values/nni_group_value.ex b/lib/nbn/resources/characteristic_values/nni_group_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Nbn.NniGroupValue do
 
   jason do
     pick [:name, :location]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/resources/characteristic_values/nni_value.ex b/lib/nbn/resources/characteristic_values/nni_value.ex
@@ -12,7 +12,7 @@ defmodule DiffoExample.Nbn.NniValue do
 
   jason do
     pick [:port_id, :capacity, :technology]
-    compact(true)
+    compact true
     rename port_id: "portId"
   end
 
diff --git a/lib/nbn/resources/characteristic_values/ntd_value.ex b/lib/nbn/resources/characteristic_values/ntd_value.ex
@@ -14,7 +14,7 @@ defmodule DiffoExample.Nbn.NtdValue do
 
   jason do
     pick [:model, :serial_number, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/resources/characteristic_values/pri_value.ex b/lib/nbn/resources/characteristic_values/pri_value.ex
@@ -16,7 +16,7 @@ defmodule DiffoExample.Nbn.PriValue do
 
   jason do
     pick [:avcid, :uniid, :technology, :bandwidth_profile, :speeds]
-    compact(true)
+    compact true
     rename avcid: "AVCID", uniid: "UNIID", bandwidth_profile: "bandwidthProfile"
   end
 
diff --git a/lib/nbn/resources/characteristic_values/uni_value.ex b/lib/nbn/resources/characteristic_values/uni_value.ex
@@ -14,7 +14,7 @@ defmodule DiffoExample.Nbn.UniValue do
 
   jason do
     pick [:port, :encapsulation, :technology]
-    compact(true)
+    compact true
   end
 
   outstanding do
diff --git a/lib/nbn/resources/cvc.ex b/lib/nbn/resources/cvc.ex
diff --git a/lib/nbn/resources/nbn_ethernet.ex b/lib/nbn/resources/nbn_ethernet.ex
diff --git a/lib/nbn/resources/nni.ex b/lib/nbn/resources/nni.ex
diff --git a/lib/nbn/resources/nni_group.ex b/lib/nbn/resources/nni_group.ex
diff --git a/lib/nbn/resources/ntd.ex b/lib/nbn/resources/ntd.ex
diff --git a/lib/nbn/resources/rsp.ex b/lib/nbn/resources/rsp.ex
diff --git a/lib/nbn/resources/uni.ex b/lib/nbn/resources/uni.ex
diff --git a/mix.exs b/mix.exs
diff --git a/mix.lock b/mix.lock
diff --git a/test/nbn/rsp_test.exs b/test/nbn/rsp_test.exs
