Skip to content

Commit

Permalink
Refactor to use not create variables in the version schema module
Browse files Browse the repository at this point in the history
  • Loading branch information
Ping committed Aug 28, 2017
1 parent 55e6666 commit 6279d19
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions lib/version.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,22 @@ defmodule PaperTrail.Version do
import Ecto.Changeset
import Ecto.Query

@setter PaperTrail.RepoClient.originator || nil

# @setter PaperTrail.RepoClient.originator()
# @item_type Application.get_env(:paper_trail, :item_type, :integer)
# @originator_type Application.get_env(:paper_trail, :originator_type, :integer)

schema "versions" do
item_type = Application.get_env(:paper_trail, :item_type, :integer)
originator_type = Application.get_env(:paper_trail, :originator_type, :integer)


field :event, :string
field :item_type, :string
field :item_id, item_type
field :item_id, Application.get_env(:paper_trail, :item_type, :integer)
field :item_changes, :map
field :originator_id, originator_type
field :originator_id, Application.get_env(:paper_trail, :originator_type, :integer)
field :origin, :string, read_after_writes: true
field :meta, :map

if @setter do
belongs_to @setter[:name], @setter[:model], define_field: false, foreign_key: :originator_id, type: originator_type
if PaperTrail.RepoClient.originator() do
belongs_to PaperTrail.RepoClient.originator()[:name], PaperTrail.RepoClient.originator()[:model], define_field: false, foreign_key: :originator_id, type: Application.get_env(:paper_trail, :originator_type, :integer)
end

timestamps(updated_at: false)
Expand All @@ -39,7 +35,7 @@ defmodule PaperTrail.Version do
Returns the count of all version records in the database
"""
def count do
from(version in __MODULE__, select: count(version.id)) |> PaperTrail.RepoClient.repo.one
from(version in __MODULE__, select: count(version.id)) |> PaperTrail.RepoClient.repo.one()
end
def count(options) do
from(version in __MODULE__, select: count(version.id))
Expand Down

0 comments on commit 6279d19

Please sign in to comment.