From 75579b48e07dfb1c1e53178db3e2039369e223a7 Mon Sep 17 00:00:00 2001
From: Emric Pichonnier <emric.pichonnier@gmail.com>
Date: Fri, 25 Mar 2022 16:19:31 +0100
Subject: [PATCH] feat: remove old datastore (#175)

---
 apps/lenra/lib/lenra/db_schema/datastore.ex   | 29 ----------------
 .../lib/lenra/db_schema/lenra_application.ex  |  2 --
 .../lenra/services/data_services_test.exs     | 34 +++++++++----------
 3 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 apps/lenra/lib/lenra/db_schema/datastore.ex

diff --git a/apps/lenra/lib/lenra/db_schema/datastore.ex b/apps/lenra/lib/lenra/db_schema/datastore.ex
deleted file mode 100644
index d5965efe..00000000
--- a/apps/lenra/lib/lenra/db_schema/datastore.ex
+++ /dev/null
@@ -1,29 +0,0 @@
-defmodule Lenra.Datastore do
-  @moduledoc """
-    The datastore schema.
-  """
-
-  use Lenra.Schema
-  import Ecto.Changeset
-
-  alias Lenra.{Datastore, LenraApplication, User}
-
-  schema "datastores" do
-    belongs_to(:user, User)
-    belongs_to(:application, LenraApplication)
-    field(:data, :map)
-    timestamps()
-  end
-
-  def changeset(datastore, params \\ %{}) do
-    datastore
-    |> cast(params, [:data])
-    |> validate_required([:data])
-    |> unique_constraint(:user_application_unique, name: :datastores_user_id_application_id_index)
-  end
-
-  def new(user_id, application_id, data) do
-    %Datastore{user_id: user_id, application_id: application_id}
-    |> Datastore.changeset(%{"data" => data})
-  end
-end
diff --git a/apps/lenra/lib/lenra/db_schema/lenra_application.ex b/apps/lenra/lib/lenra/db_schema/lenra_application.ex
index d99ff7ba..fc484926 100644
--- a/apps/lenra/lib/lenra/db_schema/lenra_application.ex
+++ b/apps/lenra/lib/lenra/db_schema/lenra_application.ex
@@ -10,7 +10,6 @@ defmodule Lenra.LenraApplication do
     ApplicationMainEnv,
     AppUserSession,
     Build,
-    Datastore,
     Environment,
     LenraApplication,
     User
@@ -32,7 +31,6 @@ defmodule Lenra.LenraApplication do
     field(:repository, :string, redact: true)
 
     belongs_to(:creator, User)
-    has_many(:datastores, Datastore, foreign_key: :application_id)
     has_many(:environments, Environment, foreign_key: :application_id)
     has_many(:builds, Build, foreign_key: :application_id)
     has_one(:main_env, ApplicationMainEnv, foreign_key: :application_id)
diff --git a/apps/lenra/test/lenra/services/data_services_test.exs b/apps/lenra/test/lenra/services/data_services_test.exs
index bb1ed748..d3831a98 100644
--- a/apps/lenra/test/lenra/services/data_services_test.exs
+++ b/apps/lenra/test/lenra/services/data_services_test.exs
@@ -23,7 +23,7 @@ defmodule Lenra.DataServicesTest do
   end
 
   describe "DataServices.create_1/1" do
-    test "should create data if json valid", %{env_id: env_id, user_id: user_id} do
+    test "should create data if json valid", %{env_id: env_id, user_id: _user_id} do
       {:ok, inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
 
       {:ok, %{inserted_data: inserted_data}} =
@@ -35,7 +35,7 @@ defmodule Lenra.DataServicesTest do
       assert data.data == %{"name" => "toto"}
     end
 
-    test "should return error if json invalid", %{env_id: env_id, user_id: user_id} do
+    test "should return error if json invalid", %{env_id: env_id, user_id: _user_id} do
       Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
 
       assert {:error, :data, :json_format_invalid, _changes_so_far} =
@@ -45,7 +45,7 @@ defmodule Lenra.DataServicesTest do
                })
     end
 
-    test "should return error if env_id invalid", %{env_id: env_id, user_id: user_id} do
+    test "should return error if env_id invalid", %{env_id: env_id, user_id: _user_id} do
       Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
 
       assert {:error, :datastore, :datastore_not_found, _changes_so_far} =
@@ -55,7 +55,7 @@ defmodule Lenra.DataServicesTest do
                })
     end
 
-    test "should return error if datastore name invalid", %{env_id: env_id, user_id: user_id} do
+    test "should return error if datastore name invalid", %{env_id: env_id, user_id: _user_id} do
       assert {:error, :datastore, :datastore_not_found, _changes_so_far} =
                DataServices.create(env_id, %{
                  "datastore" => "test",
@@ -63,7 +63,7 @@ defmodule Lenra.DataServicesTest do
                })
     end
 
-    test "should create reference if refs id is valid", %{env_id: env_id, user_id: user_id} do
+    test "should create reference if refs id is valid", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -83,7 +83,7 @@ defmodule Lenra.DataServicesTest do
       assert !is_nil(Repo.get_by(DataReferences, refs_id: inserted_point.id, refBy_id: inserted_data.id))
     end
 
-    test "should create 2 if give 2 refs_id", %{env_id: env_id, user_id: user_id} do
+    test "should create 2 if give 2 refs_id", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -116,7 +116,7 @@ defmodule Lenra.DataServicesTest do
              )
     end
 
-    test "should create reference if refBy id is valid", %{env_id: env_id, user_id: user_id} do
+    test "should create reference if refBy id is valid", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -133,7 +133,7 @@ defmodule Lenra.DataServicesTest do
       assert !is_nil(Repo.get_by(DataReferences, refs_id: inserted_data.id, refBy_id: inserted_user.id))
     end
 
-    test "should create reference if refs and refBy id is valid", %{env_id: env_id, user_id: user_id} do
+    test "should create reference if refs and refBy id is valid", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "team"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
@@ -160,7 +160,7 @@ defmodule Lenra.DataServicesTest do
       assert !is_nil(Repo.get_by(DataReferences, refs_id: inserted_point.id, refBy_id: inserted_user.id))
     end
 
-    test "should return error if refs id invalid ", %{env_id: env_id, user_id: user_id} do
+    test "should return error if refs id invalid ", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -172,7 +172,7 @@ defmodule Lenra.DataServicesTest do
                })
     end
 
-    test "should return error if refBy_id invalid", %{env_id: env_id, user_id: user_id} do
+    test "should return error if refBy_id invalid", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -198,7 +198,7 @@ defmodule Lenra.DataServicesTest do
   end
 
   describe "DataServices.delete_1/1" do
-    test "should delete data if json valid", %{env_id: env_id, user_id: user_id} do
+    test "should delete data if json valid", %{env_id: env_id, user_id: _user_id} do
       Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
 
       {:ok, %{inserted_data: inserted_data}} =
@@ -219,7 +219,7 @@ defmodule Lenra.DataServicesTest do
   end
 
   describe "DataServices.update_1/1" do
-    test "should update data if json valid", %{env_id: env_id, user_id: user_id} do
+    test "should update data if json valid", %{env_id: env_id, user_id: _user_id} do
       Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
 
       {:ok, %{inserted_data: inserted_data}} =
@@ -238,7 +238,7 @@ defmodule Lenra.DataServicesTest do
       assert {:error, :data, :data_not_found, _changes_so_far} = DataServices.update(-1, %{"data" => %{}})
     end
 
-    test "should also update refs on update", %{env_id: env_id, user_id: user_id} do
+    test "should also update refs on update", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -277,7 +277,7 @@ defmodule Lenra.DataServicesTest do
                inserted_point_bis.id
     end
 
-    test "should also update refBy on update", %{env_id: env_id, user_id: user_id} do
+    test "should also update refBy on update", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -316,7 +316,7 @@ defmodule Lenra.DataServicesTest do
                inserted_data_bis.id
     end
 
-    test "should also update refs and refBy on update", %{env_id: env_id, user_id: user_id} do
+    test "should also update refs and refBy on update", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "team"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
@@ -376,7 +376,7 @@ defmodule Lenra.DataServicesTest do
                inserted_point_bis.id
     end
 
-    test "should return error if update with invalid refs id", %{env_id: env_id, user_id: user_id} do
+    test "should return error if update with invalid refs id", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "points"}))
 
@@ -399,7 +399,7 @@ defmodule Lenra.DataServicesTest do
         })
     end
 
-    test "should return error if update with invalid ref_by id", %{env_id: env_id, user_id: user_id} do
+    test "should return error if update with invalid ref_by id", %{env_id: env_id, user_id: _user_id} do
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "team"}))
       {:ok, _inserted_datastore} = Repo.insert(Datastore.new(env_id, %{"name" => "users"}))