access only on diffo 040

Author: matt-beanland

lib/nbn/api_router.ex _aside/nbn/api_router.exlib/nbn/api_router.ex renamed to _aside/nbn/api_router.ex

@@ -14,6 +14,7 @@ defmodule DiffoExample.Nbn do
   """
   use Ash.Domain,
     otp_app: :diffo,
+    fragments: [Diffo.Provider.DomainFragment],
     extensions: [AshJsonApi.Domain]
 
   alias DiffoExample.Nbn.NbnEthernet
@@ -24,6 +25,13 @@ defmodule DiffoExample.Nbn do
   alias DiffoExample.Nbn.NniGroup
   alias DiffoExample.Nbn.Nni
   alias DiffoExample.Nbn.Rsp
+  alias DiffoExample.Nbn.AvcCharacteristic
+  alias DiffoExample.Nbn.CvcCharacteristic
+  alias DiffoExample.Nbn.NniGroupCharacteristic
+  alias DiffoExample.Nbn.NniCharacteristic
+  alias DiffoExample.Nbn.NtdCharacteristic
+  alias DiffoExample.Nbn.UniCharacteristic
+  alias DiffoExample.Nbn.PriCharacteristic
 
   domain do
     description "An example showing how TMF Resources for a fictional NBN domain can be extended from the Provider domain"
@@ -37,7 +45,6 @@ defmodule DiffoExample.Nbn do
         post :build
         patch :define
         patch :relate, route: "/:id/relate"
-        patch :mine, route: "/:id/mine"
         delete :destroy
       end
 
@@ -47,7 +54,6 @@ defmodule DiffoExample.Nbn do
         post :build
         patch :define
         patch :relate, route: "/:id/relate"
-        patch :mine, route: "/:id/mine"
         delete :destroy
       end
 
@@ -57,7 +63,6 @@ defmodule DiffoExample.Nbn do
         post :build
         patch :define
         patch :relate, route: "/:id/relate"
-        patch :mine, route: "/:id/mine"
         delete :destroy
       end
 
@@ -76,7 +81,6 @@ defmodule DiffoExample.Nbn do
         post :build
         patch :define
         patch :relate, route: "/:id/relate"
-        patch :mine, route: "/:id/mine"
         delete :destroy
       end
 
@@ -110,23 +114,20 @@ defmodule DiffoExample.Nbn do
       define :build_nbn_ethernet, action: :build
       define :define_nbn_ethernet, action: :define
       define :relate_nbn_ethernet, action: :relate
-      define :mine_nbn_ethernet, action: :mine
     end
 
     resource Uni do
       define :get_uni_by_id, action: :read, get_by: :id
       define :build_uni, action: :build
       define :define_uni, action: :define
       define :relate_uni, action: :relate
-      define :mine_uni, action: :mine
     end
 
     resource Avc do
       define :get_avc_by_id, action: :read, get_by: :id
       define :build_avc, action: :build
       define :define_avc, action: :define
       define :relate_avc, action: :relate
-      define :mine_avc, action: :mine
     end
 
     resource Ntd do
@@ -143,7 +144,6 @@ defmodule DiffoExample.Nbn do
       define :define_cvc, action: :define
       define :assign_cvlan, action: :assign_cvlan
       define :relate_cvc, action: :relate
-      define :mine_cvc, action: :mine
     end
 
     resource NniGroup do
@@ -170,5 +170,13 @@ defmodule DiffoExample.Nbn do
       define :suspend_rsp, action: :suspend
       define :deactivate_rsp, action: :deactivate
     end
+
+    resource AvcCharacteristic
+    resource CvcCharacteristic
+    resource NniGroupCharacteristic
+    resource NniCharacteristic
+    resource NtdCharacteristic
+    resource UniCharacteristic
+    resource PriCharacteristic
   end
 end

lib/nbn/catalog.ex _aside/nbn/catalog.exlib/nbn/catalog.ex renamed to _aside/nbn/catalog.ex

@@ -14,7 +14,7 @@ defmodule DiffoExample.Nbn.Avc do
 
   alias Diffo.Provider.BaseInstance
   alias Diffo.Provider.Instance.Relationship
-  alias Diffo.Provider.Instance.Characteristic
+  alias Diffo.Provider.Extension.Characteristic
 
   alias DiffoExample.Nbn
 
@@ -33,7 +33,7 @@ defmodule DiffoExample.Nbn.Avc do
     type "avc"
   end
 
-  structure do
+  provider do
     specification do
       id "b2c3d4e5-6f7a-4b8c-9d0e-1f2a3b4c5d6e"
       name "avc"
@@ -43,14 +43,14 @@ defmodule DiffoExample.Nbn.Avc do
     end
 
     characteristics do
-      characteristic :avc, DiffoExample.Nbn.AvcValue
-      characteristic :cvc, DiffoExample.Nbn.CvcValue
+      characteristic :avc, DiffoExample.Nbn.AvcCharacteristic
+      characteristic :cvc, DiffoExample.Nbn.CvcCharacteristic
     end
-  end
 
-  behaviour do
-    actions do
-      create :build
+    behaviour do
+      actions do
+        create :build
+      end
     end
   end
 
@@ -74,7 +74,7 @@ defmodule DiffoExample.Nbn.Avc do
       argument :characteristic_value_updates, {:array, :term}
 
       change after_action(fn changeset, result, _context ->
-               with {:ok, result} <- Characteristic.update_values(result, changeset),
+               with {:ok, result} <- Characteristic.update_all(result, changeset, characteristics()),
                     {:ok, result} <- Nbn.get_avc_by_id(result.id),
                     do: {:ok, result}
              end)
@@ -90,21 +90,6 @@ defmodule DiffoExample.Nbn.Avc do
                     do: {:ok, result}
              end)
     end
-
-    update :mine do
-      description "updates the AVC with data mined from related instances"
-      argument :characteristic_value_updates, {:array, :term}
-
-      change before_action(fn changeset, context ->
-               DiffoExample.Nbn.Avc.mine_related(changeset, context)
-             end)
-
-      change after_action(fn changeset, result, _context ->
-               with {:ok, result} <- Characteristic.update_values(result, changeset),
-                    {:ok, result} <- Nbn.get_avc_by_id(result.id),
-                    do: {:ok, result}
-             end)
-    end
   end
 
   attributes do
@@ -119,14 +104,5 @@ defmodule DiffoExample.Nbn.Avc 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])
-
-    cvlan = {:cvlan, Diffo.Unwrap.unwrap(hd(hd(avc.reverse_relationships).characteristics).value)}
-
-    Ash.Changeset.force_set_argument(changeset, :characteristic_value_updates, avc: [cvlan])
-  end
-
   use DiffoExample.Nbn.RspOwnership
 end

lib/nbn/changes/set_rsp_id.ex _aside/nbn/changes/set_rsp_id.exlib/nbn/changes/set_rsp_id.ex renamed to _aside/nbn/changes/set_rsp_id.ex

@@ -0,0 +1,71 @@
+# SPDX-FileCopyrightText: 2025 diffo_example contributors <https://github.com/diffo-dev/diffo_example/graphs.contributors>
+#
+# SPDX-License-Identifier: MIT
+
+defmodule DiffoExample.Nbn.AvcCharacteristic do
+  @moduledoc "Typed characteristic for an AVC's circuit properties."
+  use Ash.Resource,
+    fragments: [Diffo.Provider.BaseCharacteristic],
+    domain: DiffoExample.Nbn
+
+  resource do
+    description "Typed characteristic carrying AVC circuit fields"
+    plural_name :avc_characteristics
+  end
+
+  attributes do
+    attribute :cvlan, :integer, public?: true
+    attribute :bandwidth_profile, DiffoExample.Nbn.BandwidthProfile, public?: true
+  end
+
+  calculations do
+    calculate :value, Diffo.Type.CharacteristicValue,
+              Diffo.Provider.Calculations.CharacteristicValue do
+      public? true
+    end
+  end
+
+  actions do
+    create :create do
+      accept [:name, :cvlan, :bandwidth_profile]
+      argument :instance_id, :uuid
+      argument :feature_id, :uuid
+      change manage_relationship(:instance_id, :instance, type: :append)
+      change manage_relationship(:feature_id, :feature, type: :append)
+    end
+
+    update :update do
+      accept [:cvlan, :bandwidth_profile]
+    end
+  end
+
+  preparations do
+    prepare build(load: [:value])
+  end
+
+  jason do
+    pick [:name, :value]
+    compact true
+  end
+end
+
+defmodule DiffoExample.Nbn.AvcCharacteristic.Value do
+  @moduledoc false
+  use Ash.TypedStruct, extensions: [AshJason.TypedStruct, AshOutstanding.TypedStruct]
+
+  alias DiffoExample.Nbn.BandwidthProfile
+
+  typed_struct do
+    field :cvlan, :integer
+    field :bandwidth_profile, BandwidthProfile
+  end
+
+  outstanding do
+    expect [:cvlan, :bandwidth_profile]
+  end
+
+  jason do
+    pick [:cvlan, :bandwidth_profile]
+    compact true
+  end
+end