Skip to content

Commit

Permalink
feat: remove old datastore (#175)
Browse files Browse the repository at this point in the history
  • Loading branch information
pichoemr authored Mar 25, 2022
1 parent 344d1a2 commit 75579b4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 48 deletions.
29 changes: 0 additions & 29 deletions apps/lenra/lib/lenra/db_schema/datastore.ex

This file was deleted.

2 changes: 0 additions & 2 deletions apps/lenra/lib/lenra/db_schema/lenra_application.ex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ defmodule Lenra.LenraApplication do
ApplicationMainEnv,
AppUserSession,
Build,
Datastore,
Environment,
LenraApplication,
User
Expand All @@ -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)
Expand Down
34 changes: 17 additions & 17 deletions apps/lenra/test/lenra/services/data_services_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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}} =
Expand All @@ -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} =
Expand All @@ -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} =
Expand All @@ -55,15 +55,15 @@ 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",
"data" => %{"name" => "toto"}
})
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"}))

Expand All @@ -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"}))

Expand Down Expand Up @@ -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"}))

Expand All @@ -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"}))
Expand All @@ -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"}))

Expand All @@ -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"}))

Expand All @@ -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}} =
Expand All @@ -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}} =
Expand All @@ -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"}))

Expand Down Expand Up @@ -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"}))

Expand Down Expand Up @@ -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"}))
Expand Down Expand Up @@ -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"}))

Expand All @@ -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"}))

Expand Down

0 comments on commit 75579b4

Please sign in to comment.