Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove repo module attribute from version_queries #55

Merged
merged 2 commits into from
Jun 29, 2019
Merged

Remove repo module attribute from version_queries #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c31e2d7
Remove repo module attribute from version_queries
Jun 24, 2019
95bdefc
Run mix format
Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions lib/paper_trail/version_queries.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ defmodule PaperTrail.VersionQueries do
import Ecto.Query
alias PaperTrail.Version

@repo PaperTrail.RepoClient.repo()

@doc """
Gets all the versions of a record.
"""
Expand All @@ -30,7 +28,9 @@ defmodule PaperTrail.VersionQueries do
@spec get_versions(record :: Ecto.Schema.t(), options :: []) :: Ecto.Query.t()
def get_versions(record, options) when is_map(record) do
item_type = record.__struct__ |> Module.split() |> List.last()
version_query(item_type, PaperTrail.get_model_id(record), options) |> @repo.all

version_query(item_type, PaperTrail.get_model_id(record), options)
|> PaperTrail.RepoClient.repo().all
end

@doc """
Expand All @@ -46,7 +46,7 @@ defmodule PaperTrail.VersionQueries do
@spec get_versions(model :: module, id :: pos_integer, options :: []) :: Ecto.Query.t()
def get_versions(model, id, options) do
item_type = model |> Module.split() |> List.last()
version_query(item_type, id, options) |> @repo.all
version_query(item_type, id, options) |> PaperTrail.RepoClient.repo().all
end

@doc """
Expand Down Expand Up @@ -75,7 +75,9 @@ defmodule PaperTrail.VersionQueries do
@spec get_version(record :: Ecto.Schema.t(), options :: []) :: Ecto.Query.t()
def get_version(record, options) when is_map(record) do
item_type = record.__struct__ |> Module.split() |> List.last()
last(version_query(item_type, PaperTrail.get_model_id(record), options)) |> @repo.one

last(version_query(item_type, PaperTrail.get_model_id(record), options))
|> PaperTrail.RepoClient.repo().one
end

@doc """
Expand All @@ -91,14 +93,17 @@ defmodule PaperTrail.VersionQueries do
@spec get_version(model :: module, id :: pos_integer, options :: []) :: Ecto.Query.t()
def get_version(model, id, options) do
item_type = model |> Module.split() |> List.last()
last(version_query(item_type, id, options)) |> @repo.one
last(version_query(item_type, id, options)) |> PaperTrail.RepoClient.repo().one
end

@doc """
Gets the current model record/struct of a version
"""
def get_current_model(version) do
@repo.get(("Elixir." <> version.item_type) |> String.to_existing_atom(), version.item_id)
PaperTrail.RepoClient.repo().get(
("Elixir." <> version.item_type) |> String.to_existing_atom(),
version.item_id
)
end

defp version_query(item_type, id) do
Expand Down