Merge pull request #9 from diffo-dev/7-livebook

7 livebook

Author: matt-beanland

LICENSE LICENSE.mdLICENSE renamed to LICENSE.md

@@ -0,0 +1,12 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](Https://conventionalcommits.org) for commit guidelines.
+
+<!-- changelog -->
+
+## [v0.1.0](https://github.com/diffo-dev/diffo/compare/v0.1.0...v0.1.0) (2025-08-10)
+
+### Features:
+* initial version using Neo4j DataLayer
+

diffo.livemd

@@ -41,7 +41,7 @@ defmodule Diffo.Provider do
       define :activate_service, action: :activate
       define :suspend_service, action: :suspend
       define :terminate_service, action: :terminate
-      define :status_instance, action: :status
+      define :status_service, action: :status
       define :specify_instance, action: :specify
       define :relate_instance_features, action: :relate_features
       define :unrelate_instance_features, action: :unrelate_features

lib/CHANGELOG.md

@@ -176,26 +176,17 @@ defmodule Diffo.Provider.Instance do
 
     attribute :service_state, :atom do
       allow_nil? false
-      default :initial
+      default Diffo.Provider.Service.default_service_state()
       public? true
 
-      constraints one_of: [
-                    :initial,
-                    :cancelled,
-                    :feasibilityChecked,
-                    :reserved,
-                    :active,
-                    :inactive,
-                    :suspended,
-                    :terminated
-                  ]
+      constraints one_of: Diffo.Provider.Service.service_states()
     end
 
     attribute :service_operating_status, :atom do
       description "the service operating status, if this instance is a service"
       allow_nil? true
       public? true
-      default Diffo.Provider.Service.default_service_operating_status()
+      default nil
       constraints one_of: Diffo.Provider.Service.service_operating_statuses()
     end
 
@@ -348,9 +339,18 @@ defmodule Diffo.Provider.Instance do
     update :feasibilityCheck do
       description "feasibilityChecks a service instance"
       require_atomic? false
+      accept [:service_operating_status]
       validate attribute_equals(:type, :service)
       change transition_state(:feasibilityChecked)
-      change set_attribute(:service_operating_status, :pending)
+
+      validate argument_in(:service_operating_status, [
+                 nil,
+                 :initial,
+                 :pending,
+                 :unknown,
+                 :feasible,
+                 :not_feasible
+               ])
     end
 
     update :reserve do

lib/diffo/provider.ex

@@ -130,7 +130,7 @@ defmodule Diffo.Provider.PartyRef do
   preparations do
     prepare build(
               load: [:party],
-              sort: [role: :asc]
+              sort: [role: :asc, inserted_at: :desc]
             )
   end
 

lib/diffo/provider/resources/instance.ex

@@ -118,7 +118,7 @@ defmodule Diffo.Provider.PlaceRef do
   preparations do
     prepare build(
               load: [:place],
-              sort: [role: :asc]
+              sort: [role: :asc, inserted_at: :desc]
             )
   end
 

lib/diffo/provider/resources/party_ref.ex

@@ -26,6 +26,8 @@ defmodule Diffo.Provider.Service do
   def service_operating_statuses() do
     [
       :pending,
+      :feasible,
+      :not_feasible,
       :configured,
       :starting,
       :running,

lib/diffo/provider/resources/place_ref.ex

@@ -379,9 +379,9 @@ defmodule Diffo.Util do
     ## Examples
     iex> duration = Duration.new!(month: 1)
     iex> list = [duration: duration]
-    iex> result = Diffo.Util.extract_suppress(list, :duration, :month, :months)
-    iex> List.last(result)
-    {:months, 1}
+    iex> tl(Diffo.Util.extract_suppress(list, :duration, :month, :months))
+    [months: 1]
+
   """
   def extract_suppress(list, tuple_key, map_key, new_tuple_key) when is_list(list) do
     tuple_value = get(list, tuple_key)

lib/diffo/provider/service.ex

@@ -1,31 +1,27 @@
 defmodule Diffo.MixProject do
+  @moduledoc false
   use Mix.Project
 
+  @version "0.1.0"
+  @name "Diffo"
+  @description "TMF Service and Resource Manager with a difference"
+  @github_url "https://github.com/diffo-dev/diffo"
+
   def project do
     [
       app: :diffo,
-      version: "0.1.0",
+      version: @version,
+      name: @name,
+      description: @description,
       elixir: "~> 1.18",
       start_permanent: Mix.env() == :prod,
+      package: package(),
       deps: deps(),
       aliases: aliases(),
       elixirc_paths: elixirc_paths(Mix.env()),
-      name: "Diffo",
       source_url: "https://github.com/diffo-dev/diffo/",
       homepage_url: "http://diffo.dev/diffo/",
-      docs: [
-        main: "Diffo.Provider",
-        before_closing_body_tag: fn
-          :html ->
-            """
-            <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
-            <script>mermaid.initialize({startOnLoad: true})</script>
-            """
-
-          _ ->
-            ""
-        end
-      ]
+      docs: docs()
     ]
   end
 
@@ -55,10 +51,34 @@ defmodule Diffo.MixProject do
     end
   end
 
+  def docs do
+    [
+      homepage_url: @github_url,
+      source_url: @github_url,
+      source_ref: "v#{@version}",
+      main: "readme",
+      logo: "logos/diffo.jpg",
+      extras: [
+        "README.md": [title: "Guide"],
+        "LICENSE.md": [title: "License"]
+      ]
+    ]
+  end
+
+  defp package do
+    [
+      name: :diffo,
+      licenses: ["MIT"],
+      files: ~w(lib .formatter.exs mix.exs README* LICENSE* documentation),
+      links: %{
+        GitHub: @github_url
+      }
+    ]
+  end
+
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:outstanding, "~> 0.2.3"},
       {:ash_outstanding, "~> 0.2.1"},
       {:ash_jason, "~> 2.0"},
       {:ash_state_machine, "~> 0.2.7"},