All models to use public schema (#2249)

* All models to use public schema

* Fix mailer test

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to
 
 ### Changed
 
+- All models to use the `public` schema.
+  [#2249](https://github.com/OpenFn/lightning/pull/2249)
 - In the workflow diagram, smartly update the view when adding new nodes
   [#2174](https://github.com/OpenFn/lightning/issues/2174)
 - In the workflow diagram, remove the "autofit" toggle in the control bar

lib/lightning/accounts/user.ex

@@ -2,9 +2,8 @@ defmodule Lightning.Accounts.User do
   @moduledoc """
   The User model.
   """
-  use Ecto.Schema
+  use Lightning.Schema
 
-  import Ecto.Changeset
   import Ecto.Query
   import EctoEnum
 
@@ -19,8 +18,6 @@ defmodule Lightning.Accounts.User do
     :superuser
   ])
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "users" do
     field :first_name, :string
     field :last_name, :string

lib/lightning/accounts/user_backup_code.ex

@@ -3,16 +3,12 @@ defmodule Lightning.Accounts.UserBackupCode do
   User backup codes schema
   """
 
-  use Ecto.Schema
-  import Ecto.Changeset
+  use Lightning.Schema
 
   @type t :: %__MODULE__{
           id: Ecto.UUID.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
-
   schema "user_backup_codes" do
     field :code, Lightning.Encrypted.Binary,
       redact: true,

lib/lightning/accounts/user_token.ex

@@ -17,10 +17,9 @@ defmodule Lightning.Accounts.UserToken do
   session they deem invalid.
   """
 
-  use Ecto.Schema
+  use Lightning.Schema
   use Joken.Config
 
-  import Ecto.Changeset
   import Ecto.Query
 
   alias Lightning.Accounts.User
@@ -37,8 +36,6 @@ defmodule Lightning.Accounts.UserToken do
   @sudo_session_validity_in_seconds 60 * 5
   @auth_validity_in_seconds 30
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "user_tokens" do
     field :token, :binary
     field :context, :string

lib/lightning/accounts/user_totp.ex

@@ -2,8 +2,7 @@ defmodule Lightning.Accounts.UserTOTP do
   @moduledoc """
   User Time based OTPs schema
   """
-  use Ecto.Schema
-  import Ecto.Changeset
+  use Lightning.Schema
 
   @type t :: %__MODULE__{
           id: Ecto.UUID.t() | nil,
@@ -13,9 +12,6 @@ defmodule Lightning.Accounts.UserTOTP do
             Lightning.Accounts.User.t() | Ecto.Association.NotLoaded.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
-
   schema "user_totps" do
     field :secret, :binary, redact: true
     field :code, :string, virtual: true

lib/lightning/auditing/audit.ex

@@ -2,9 +2,7 @@ defmodule Lightning.Auditing.Audit do
   @moduledoc """
   Macro module to add common model behaviour to a given Ecto model
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   require Ecto.Query
   require Logger
@@ -92,8 +90,7 @@ defmodule Lightning.Auditing.Audit do
   defmodule Changes do
     @moduledoc false
 
-    use Ecto.Schema
-    import Ecto.Changeset
+    use Lightning.Schema
 
     @primary_key false
     embedded_schema do

lib/lightning/auth_providers/auth_config.ex

@@ -2,8 +2,7 @@ defmodule Lightning.AuthProviders.AuthConfig do
   @moduledoc """
   AuthProvider model
   """
-  use Ecto.Schema
-  import Ecto.Changeset
+  use Lightning.Schema
 
   @type t :: %__MODULE__{
           __meta__: Ecto.Schema.Metadata.t(),
@@ -14,8 +13,6 @@ defmodule Lightning.AuthProviders.AuthConfig do
           redirect_uri: String.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "auth_providers" do
     field :name, :string
 

lib/lightning/auth_providers/common.ex

@@ -11,8 +11,7 @@ defmodule Lightning.AuthProviders.Common do
     Defines a schema for OAuth token information.
     """
 
-    use Ecto.Schema
-    import Ecto.Changeset
+    use Lightning.Schema
 
     @primary_key false
     embedded_schema do

lib/lightning/credentials/credential.ex

@@ -2,9 +2,7 @@ defmodule Lightning.Credentials.Credential do
   @moduledoc """
   The Credential model.
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Accounts.User
   alias Lightning.Credentials.OauthClient
@@ -16,8 +14,6 @@ defmodule Lightning.Credentials.Credential do
           body: nil | %{}
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "credentials" do
     field :name, :string
     field :body, Lightning.Encrypted.Map, redact: true
@@ -31,7 +27,7 @@ defmodule Lightning.Credentials.Credential do
     has_many :project_credentials, ProjectCredential
     has_many :projects, through: [:project_credentials, :project]
 
-    timestamps(type: :utc_datetime)
+    timestamps()
   end
 
   @doc false

lib/lightning/credentials/oauth_client.ex

@@ -6,9 +6,7 @@ defmodule Lightning.Credentials.OauthClient do
   projects through relational fields.
   """
 
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Accounts.User
   alias Lightning.Credentials.Credential
@@ -21,8 +19,6 @@ defmodule Lightning.Credentials.OauthClient do
           name: String.t()
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "oauth_clients" do
     field :name, :string
     field :client_id, :string
@@ -42,7 +38,7 @@ defmodule Lightning.Credentials.OauthClient do
     has_many :project_oauth_clients, ProjectOauthClient
     has_many :projects, through: [:project_oauth_clients, :project]
 
-    timestamps(type: :utc_datetime)
+    timestamps()
   end
 
   @doc """

lib/lightning/invocation/dataclip.ex

@@ -19,8 +19,7 @@ defmodule Lightning.Invocation.Dataclip do
   * `:saved_input`
     An arbitrary input, created by a user. (Only configuration will be overwritten.)
   """
-  use Ecto.Schema
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Invocation.Step
   alias Lightning.Projects.Project
@@ -37,8 +36,6 @@ defmodule Lightning.Invocation.Dataclip do
   @type source_type :: :http_request | :global | :step_result | :saved_input
   @source_types [:http_request, :global, :step_result, :saved_input]
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "dataclips" do
     field :body, :map, load_in_query: false
     field :request, :map, load_in_query: false

lib/lightning/invocation/log_line.ex

@@ -10,9 +10,7 @@ defmodule Lightning.Invocation.LogLine do
 
   See [`LogMessage`](`Lightning.LogMessage`) for more information.
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Invocation.Step
   alias Lightning.LogMessage
@@ -33,7 +31,6 @@ defmodule Lightning.Invocation.LogLine do
            only: [:id, :source, :level, :message, :timestamp, :step_id, :run_id]}
 
   @primary_key false
-  @foreign_key_type :binary_id
   schema "log_lines" do
     field :id, Ecto.UUID
     field :source, :string

lib/lightning/invocation/run_step.ex

@@ -2,9 +2,7 @@ defmodule Lightning.RunStep do
   @moduledoc """
   Ecto model for an the Steps in a Run.
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Invocation.Step
   alias Lightning.Run
@@ -16,8 +14,6 @@ defmodule Lightning.RunStep do
           step: Step.t() | Ecto.Association.NotLoaded.t()
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "run_steps" do
     belongs_to :run, Run
     belongs_to :step, Step

lib/lightning/invocation/step.ex

@@ -18,9 +18,7 @@ defmodule Lightning.Invocation.Step do
   -  `"exception"`
   -  `"lost"`
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Credentials.Credential
   alias Lightning.Invocation.Dataclip
@@ -37,8 +35,6 @@ defmodule Lightning.Invocation.Step do
           job: Job.t() | Ecto.Association.NotLoaded.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "steps" do
     field :exit_reason, :string
     field :error_type, :string

lib/lightning/projects/project.ex

@@ -2,9 +2,7 @@ defmodule Lightning.Projects.Project do
   @moduledoc """
   Project model
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Projects.ProjectCredential
   alias Lightning.Projects.ProjectOauthClient
@@ -21,8 +19,6 @@ defmodule Lightning.Projects.Project do
 
   @retention_periods [7, 14, 30, 90, 180, 365]
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "projects" do
     field :name, :string
     field :description, :string

lib/lightning/projects/project_credential.ex

@@ -2,9 +2,7 @@ defmodule Lightning.Projects.ProjectCredential do
   @moduledoc """
   Join table to assign credentials to a project
   """
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Credentials.Credential
   alias Lightning.Projects.Project
@@ -16,8 +14,6 @@ defmodule Lightning.Projects.ProjectCredential do
           project: Project.t() | Ecto.Association.NotLoaded.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "project_credentials" do
     belongs_to :credential, Credential
     belongs_to :project, Project

lib/lightning/projects/project_oauth_client.ex

@@ -25,9 +25,7 @@ defmodule Lightning.Projects.ProjectOauthClient do
   rules such as uniqueness of the association.
   """
 
-  use Ecto.Schema
-
-  import Ecto.Changeset
+  use Lightning.Schema
 
   alias Lightning.Credentials.OauthClient
   alias Lightning.Projects.Project
@@ -39,8 +37,6 @@ defmodule Lightning.Projects.ProjectOauthClient do
           project: Project.t() | Ecto.Association.NotLoaded.t() | nil
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "project_oauth_clients" do
     belongs_to :oauth_client, OauthClient
     belongs_to :project, Project

lib/lightning/projects/project_user.ex

@@ -2,9 +2,8 @@ defmodule Lightning.Projects.ProjectUser do
   @moduledoc """
   Join table to assign users to a project
   """
-  use Ecto.Schema
+  use Lightning.Schema
 
-  import Ecto.Changeset
   import EctoEnum
 
   alias Lightning.Accounts.User
@@ -31,8 +30,6 @@ defmodule Lightning.Projects.ProjectUser do
     :monthly
   ])
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "project_users" do
     belongs_to :user, User
     belongs_to :project, Project

lib/lightning/runs/handlers.ex

@@ -15,8 +15,7 @@ defmodule Lightning.Runs.Handlers do
     @moduledoc """
     Schema to validate the input attributes of a started step.
     """
-    use Ecto.Schema
-    import Ecto.Changeset
+    use Lightning.Schema
     import Ecto.Query
 
     import Lightning.ChangesetUtils
@@ -142,8 +141,7 @@ defmodule Lightning.Runs.Handlers do
     @moduledoc """
     Schema to validate the input attributes of a completed step.
     """
-    use Ecto.Schema
-    import Ecto.Changeset
+    use Lightning.Schema
     import Ecto.Query
 
     import Lightning.ChangesetUtils

lib/lightning/runs/run.ex

@@ -4,9 +4,8 @@ defmodule Lightning.Run do
 
 
   """
-  use Ecto.Schema
+  use Lightning.Schema
 
-  import Ecto.Changeset
   import Lightning.Validators
 
   alias Lightning.Accounts.User
@@ -45,8 +44,6 @@ defmodule Lightning.Run do
           work_order: WorkOrder.t() | Ecto.Association.NotLoaded.t()
         }
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "runs" do
     belongs_to :work_order, WorkOrder