Skip to content

Commit 96cbf01

Browse files
Merge pull request #9 from diffo-dev/4-refactor-actionhelper
refactor to use diffo ActionHelper
2 parents 0612627 + 6983203 commit 96cbf01

6 files changed

Lines changed: 11 additions & 53 deletions

File tree

lib/access/action_helper.ex

Lines changed: 0 additions & 43 deletions
This file was deleted.

lib/access/resources/cable.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ defmodule DiffoExample.Access.Cable do
1212
alias Diffo.Provider.BaseInstance
1313
alias Diffo.Provider.Instance.Relationship
1414
alias Diffo.Provider.Instance.Characteristic
15+
alias Diffo.Provider.Instance.ActionHelper
1516
alias Diffo.Provider.Assigner
1617
alias Diffo.Provider.Assignment
1718

1819
alias DiffoExample.Access
19-
alias DiffoExample.Access.ActionHelper
2020

2121
use Ash.Resource,
2222
fragments: [BaseInstance],
@@ -56,7 +56,7 @@ defmodule DiffoExample.Access.Cable do
5656
change before_action(fn changeset, _context -> ActionHelper.build_before(changeset) end)
5757

5858
change after_action(fn changeset, result, _context ->
59-
ActionHelper.build_after(changeset, result, :get_cable_by_id)
59+
ActionHelper.build_after(changeset, result, Access, :get_cable_by_id)
6060
end)
6161

6262
change load [:href]

lib/access/resources/card.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ defmodule DiffoExample.Access.Card do
1212
alias Diffo.Provider.BaseInstance
1313
alias Diffo.Provider.Instance.Relationship
1414
alias Diffo.Provider.Instance.Characteristic
15+
alias Diffo.Provider.Instance.ActionHelper
1516
alias Diffo.Provider.Assigner
1617
alias Diffo.Provider.Assignment
1718

1819
alias DiffoExample.Access
19-
alias DiffoExample.Access.ActionHelper
2020

2121
use Ash.Resource,
2222
fragments: [BaseInstance],
@@ -56,7 +56,7 @@ defmodule DiffoExample.Access.Card do
5656
change before_action(fn changeset, _context -> ActionHelper.build_before(changeset) end)
5757

5858
change after_action(fn changeset, result, _context ->
59-
ActionHelper.build_after(changeset, result, :get_card_by_id)
59+
ActionHelper.build_after(changeset, result, Access, :get_card_by_id)
6060
end)
6161

6262
change load [:href]

lib/access/resources/path.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ defmodule DiffoExample.Access.Path do
1212
alias Diffo.Provider.BaseInstance
1313
alias Diffo.Provider.Instance.Relationship
1414
alias Diffo.Provider.Instance.Characteristic
15+
alias Diffo.Provider.Instance.ActionHelper
1516

1617
alias DiffoExample.Access
17-
alias DiffoExample.Access.ActionHelper
1818

1919
use Ash.Resource,
2020
fragments: [BaseInstance],
@@ -53,7 +53,7 @@ defmodule DiffoExample.Access.Path do
5353
change before_action(fn changeset, _context -> ActionHelper.build_before(changeset) end)
5454

5555
change after_action(fn changeset, result, _context ->
56-
ActionHelper.build_after(changeset, result, :get_path_by_id)
56+
ActionHelper.build_after(changeset, result, Access, :get_path_by_id)
5757
end)
5858

5959
change load [:href]

lib/access/resources/shelf.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ defmodule DiffoExample.Access.Shelf do
1212
alias Diffo.Provider.BaseInstance
1313
alias Diffo.Provider.Instance.Relationship
1414
alias Diffo.Provider.Instance.Characteristic
15+
alias Diffo.Provider.Instance.ActionHelper
1516
alias Diffo.Provider.Assigner
1617
alias Diffo.Provider.Assignment
1718

1819
alias DiffoExample.Access
19-
alias DiffoExample.Access.ActionHelper
2020

2121
use Ash.Resource,
2222
fragments: [BaseInstance],
@@ -56,7 +56,7 @@ defmodule DiffoExample.Access.Shelf do
5656
change before_action(fn changeset, _context -> ActionHelper.build_before(changeset) end)
5757

5858
change after_action(fn changeset, result, _context ->
59-
ActionHelper.build_after(changeset, result, :get_shelf_by_id)
59+
ActionHelper.build_after(changeset, result, Access, :get_shelf_by_id)
6060
end)
6161

6262
change load [:href]

lib/access/services/dsl_access.ex

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ defmodule DiffoExample.Access.DslAccess do
1212
alias Diffo.Provider.BaseInstance
1313
alias Diffo.Provider.Instance.Characteristic
1414
alias Diffo.Provider.Instance.Place
15+
alias Diffo.Provider.Instance.ActionHelper
16+
1517
alias DiffoExample.Access
16-
alias DiffoExample.Access.ActionHelper
1718

1819
use Ash.Resource,
1920
fragments: [BaseInstance],
@@ -65,7 +66,7 @@ defmodule DiffoExample.Access.DslAccess do
6566
change before_action(fn changeset, _context -> ActionHelper.build_before(changeset) end)
6667

6768
change after_action(fn changeset, result, _context ->
68-
ActionHelper.build_after(changeset, result, :get_dsl_by_id)
69+
ActionHelper.build_after(changeset, result, Access, :get_dsl_by_id)
6970
end)
7071

7172
change load [:href]

0 commit comments

Comments
 (0)