From 6279d19be5f96cc3dbffc902a8ad89327e0b1fb7 Mon Sep 17 00:00:00 2001 From: Ping Date: Mon, 28 Aug 2017 13:30:14 +0800 Subject: [PATCH] Refactor to use not create variables in the version schema module --- lib/version.ex | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/version.ex b/lib/version.ex index 3b1513d2..adced670 100644 --- a/lib/version.ex +++ b/lib/version.ex @@ -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) @@ -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))