absorb database into common

.gitignore

@@ -18,8 +18,5 @@ erl_crash.dump
 
 /.elixir_ls/
 
-/apps/tag_editor/assets/package-lock.json
-/apps/website/assets/package-lock.json
-
 # Ignore ZSH plugin files
 **/.mix_tasks

.travis.yml

@@ -15,6 +15,9 @@ git:
 
 sudo: false
 
+addons:
+  postgresql: '9.6'
+
 env:
   global:
     - ELIXIR_ASSERT_TIMEOUT=2000
@@ -24,6 +27,11 @@ install:
   - mix do local.hex --force, local.rebar --force || echo "WARNING! Unable to update hex or rebar"
   - mix deps.get
   - mix deps.compile
+  - npm install -g elm elm-format elm-test
+  - pushd apps/tag_editor/assets
+  - npm install
+  - popd
+
 script:
   - mix format --check-formatted
   - for f in $(mix format --check-formatted 2>&1 | cut -s -d' ' -f4- | grep -E '^.+\.exs?$'); do echo $f; cat $f | mix format - | diff $f -; done
@@ -33,12 +41,17 @@ script:
   - mix coveralls.travis -u
   - mix credo --strict
   - travis_wait mix dialyzer --halt-exit-status
+  - pushd apps/tag_editor/assets/
+  - travis_wait elm-test
+  - elm-format $(find tests elm-src -name '*.elm') --validate #| jq '.[] | .path + ":\t" + .message' -r
+  - popd
 
 # Cache as much as possible
 cache:
   directories:
     - deps
     - _build
+    - apps/tag_editor/assets/tests/elm-stuff
 
 # Trigger our discord webhook
 after_success:

apps/common/config/config.exs

@@ -10,11 +10,11 @@ use Mix.Config
 
 # You can configure your application as:
 #
-#     config :common, key: :value
+#     config :database, key: :value
 #
 # and access this configuration in your application as:
 #
-#     Application.get_env(:common, :key)
+#     Application.get_env(:database, :key)
 #
 # You can also configure a 3rd-party app:
 #
@@ -27,4 +27,11 @@ use Mix.Config
 # Configuration from the imported file will override the ones defined
 # here (which is why it is important to import them last).
 #
-#     import_config "#{Mix.env()}.exs"
+#     import_config "#{Mix.env}.exs"
+
+config :common,
+  namespace: Common,
+  ecto_repos: [Common.Repo]
+
+import_config "#{Mix.env()}.exs"
+import_config "config.mappings.exs"

apps/database/config/config.mappings.exs → apps/common/config/config.mappings.exs

@@ -1,6 +1,6 @@
 use Mix.Config
 
-config :database, :tag_translations, %{
+config :common, :tag_translations, %{
   "Animation - Modified" => ["Animation"],
   "Animation" => ["Animation"],
   "Armour - Shields" => ["Items.Armour.Shields"],

apps/database/config/dev.exs → apps/common/config/dev.exs

@@ -1,7 +1,7 @@
 use Mix.Config
 
 # Configure your database
-config :website, Database.Repo,
+config :common, Common.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: "postgres",
   password: "postgres",

apps/database/config/prod.secret.exs → apps/common/config/prod.secret.exs

@@ -1,6 +1,6 @@
 use Mix.Config
 
-config :website, Database.Repo,
+config :common, Common.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: "postgres",
   password: "postgres",

apps/database/config/test.exs → apps/common/config/test.exs

@@ -1,7 +1,7 @@
 use Mix.Config
 
 # Configure your database
-config :website, Database.Repo,
+config :common, Common.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: "postgres",
   password: "postgres",

apps/common/lib/common.ex

@@ -2,4 +2,8 @@ defmodule Common do
   @moduledoc """
   Documentation for Common.
   """
+
+  @type unclean_change :: %{
+          optional(binary) => binary() | unclean_change()
+        }
 end

apps/database/lib/database/application.ex → apps/common/lib/common/application.ex

@@ -1,4 +1,4 @@
-defmodule Database.Application do
+defmodule Common.Application do
   # See https://hexdocs.pm/elixir/Application.html
   # for more information on OTP Applications
   @moduledoc false
@@ -11,14 +11,14 @@ defmodule Database.Application do
     # List all child processes to be supervised
     children = [
       # Start the Ecto repository
-      supervisor(Database.Repo, [])
-      # Starts a worker by calling: Database.Worker.start_link(arg)
-      # {Database.Worker, arg},
+      supervisor(Common.Repo, [])
+      # Starts a worker by calling: Common.Worker.start_link(arg)
+      # {Common.Worker, arg},
     ]
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options
-    opts = [strategy: :one_for_one, name: Database.Supervisor]
+    opts = [strategy: :one_for_one, name: Common.Supervisor]
     Supervisor.start_link(children, opts)
   end
 end

apps/common/lib/common/moddb.ex

@@ -0,0 +1,171 @@
+defmodule Common.ModDB do
+  @moduledoc """
+  The Mods context.
+  """
+
+  require Logger
+  import Common.Utils, only: [debug: 1]
+
+  alias Common.Repo
+  alias Common.Schema.Mod
+  # alias Common.Schema.ModFile
+  alias Common.Schema.ModTag
+  alias Common.Schema.Modlist
+  alias Common.Utils
+
+  alias Ecto.Changeset
+
+  ### ====== TAGS ======
+
+  @doc """
+  Returns the list of _all_ tags.
+  """
+  @spec list_tags() :: [ModTag.t()]
+  def list_tags, do: Repo.all(ModTag)
+
+  @doc """
+  Gets a single tag.
+
+  Raises `Ecto.NoResultsError` if the ModTag does not exist.
+  """
+  @spec get_tag!(id :: ModTag.id()) :: ModTag.t()
+  def get_tag!(id), do: Repo.get!(ModTag, id)
+
+  @doc """
+  Creates a tag.
+  """
+  @spec create_tag(change :: Utils.unclean_change()) ::
+          {:ok, ModTag.t()} | {:error, Changeset.t(Mod.t())}
+  def create_tag(change \\ %{}) do
+    clean_ch = ModTag.clean_changes(change)
+
+    %ModTag{}
+    |> ModTag.changeset(clean_ch)
+    |> Repo.insert()
+  end
+
+  ### ====== MODS ======
+
+  @doc """
+  Returns the list of _all_ mods.
+  """
+  @spec list_mods() :: [Mod.t()]
+  def list_mods, do: Repo.all(Mod)
+  # TODO page this stuff, Repo.stream/2 seems useful
+
+  @doc """
+  Creates a mod.
+  """
+  @spec create_mod(change :: Utils.change()) :: {:ok, Mod.t()} | {:error, Changeset.t(Mod.t())}
+  def create_mod(change \\ %{}) do
+    cs =
+      change
+      |> Mod.clean_changes()
+      |> Mod.new()
+
+    if cs.valid? do
+      Repo.insert(cs)
+    else
+      {:error, cs}
+    end
+  end
+
+  @doc """
+  Gets a single mod. The tags are not loaded, to access `mod.tags` do `Repo.preload(mod, [:tags])` before try to access them.
+
+  Raises `Ecto.NoResultsError` if the ModTag does not exist.
+  """
+  @spec get_mod!(id :: Mod.id()) :: Mod.t()
+  def get_mod!(id), do: Repo.get!(Mod, id)
+
+  @doc """
+  Updates a mod.
+  """
+  @spec update_mod(mod :: Mod.t(), change :: Utils.unclean_change()) ::
+          {:ok, Mod.t()} | {:error, Changeset.t(Mod.t())}
+  def update_mod(%Mod{} = mod, change) do
+    clean_change = Mod.clean_changes(change)
+
+    mod
+    |> Mod.changeset(clean_change)
+    |> Repo.update()
+  end
+
+  @doc """
+  Deletes a mod.
+  """
+  @spec delete_mod(Mod.t()) :: {:ok, Mod.t()} | {:error, Changeset.t(Mod.t())}
+  def delete_mod(%Mod{} = mod), do: Repo.delete(mod)
+
+  @doc """
+  Returns an `%Ecto.Changeset{}` for tracking mod changes.
+  """
+  @spec change_mod(Mod.t()) :: Changeset.t(Mod.t())
+  def change_mod(%Mod{} = mod), do: Mod.changeset(mod, %{})
+
+  ### ====== MOD LISTS ======
+
+  @doc """
+  Returns the list of _all_ modlists.
+  """
+  @spec list_modlists() :: [Modlist.t()]
+  def list_modlists(), do: Repo.all(Modlist)
+  # TODO needs paging
+
+  @spec get_modlist!(id :: Modlist.id()) :: Modlist.t()
+  def get_modlist!(id), do: Repo.get!(Modlist, id)
+
+  @doc """
+  Return the list of _all_ modlist.
+  """
+  @spec add_mod_to_list(list :: Modlist.t(), mod :: Mod.t()) ::
+          {:ok, Modlist.t()} | {:error, Changeset.t(Modlist.t())}
+  def add_mod_to_list(list, mod) do
+    _cs = Modlist.changeset(list)
+    # TODO
+    {:ok, list}
+  end
+
+  @doc """
+  Creates a modlist.
+  """
+  @spec create_modlist(change :: Utils.unclean_change()) ::
+          {:ok, Modlist.t()} | {:error, Changeset.t(Modlist.t())}
+  def create_modlist(change \\ %{}) do
+    change
+    |> Modlist.clean_changes()
+    |> Modlist.new()
+    |> Repo.insert()
+  end
+
+  @doc """
+  Gets a single modlist.
+
+  Raises `Ecto.NoResultsError` if the ModTag does not exist.
+  """
+  @spec get_modlist!(id :: Modlist.id()) :: Modlist.t()
+  def get_modlist!(id), do: Repo.get!(Modlist, id)
+
+  @doc """
+  Updates a modlist.
+  """
+  @spec update_modlist(Modlist.t(), change :: Utils.unclean_change()) ::
+          {:ok, Modlist.t()} | {:error, Changeset.t(Modlist.t())}
+  def update_modlist(%Modlist{} = modlist, change) do
+    modlist
+    |> Modlist.changeset(change)
+    |> Repo.update()
+  end
+
+  @doc """
+  Deletes a modlist.
+  """
+  @spec delete_modlist(Modlist.t()) :: {:ok, Modlist.t()} | {:error, Changeset.t(Modlist.t())}
+  def delete_modlist(%Modlist{} = modlist), do: Repo.delete(modlist)
+
+  @doc """
+  Returns an `%Ecto.Changeset{}` for tracking modlist changes.
+  """
+  @spec change_modlist(modlist :: Modlist.t()) :: Changeset.t(Modlist.t())
+  def change_modlist(%Modlist{} = modlist), do: Modlist.changeset(modlist, %{})
+end

apps/database/lib/database/repo.ex → apps/common/lib/common/repo.ex

@@ -1,6 +1,6 @@
-defmodule Database.Repo do
+defmodule Common.Repo do
   use Ecto.Repo,
-    otp_app: :website,
+    otp_app: :common,
     adapter: Ecto.Adapters.Postgres
 
   @doc """