remove people schema/table from project! #118

dwyl · Aug 5, 2022 · 316929c · 316929c
1 parent c231b71
commit 316929c
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 787 deletions.
diff --git a/README.md b/README.md
diff --git a/lib/app/person.ex b/lib/app/person.ex
diff --git a/lib/app/timer.ex b/lib/app/timer.ex
@@ -8,7 +8,6 @@ defmodule App.Timer do
 
   schema "timers" do
     field :item_id, :id
-    field :person_id, :id
     field :start, :naive_datetime
     field :stop, :naive_datetime
 
@@ -18,7 +17,7 @@ defmodule App.Timer do
   @doc false
   def changeset(timer, attrs) do
     timer
-    |> cast(attrs, [:item_id, :person_id, :start, :stop])
+    |> cast(attrs, [:item_id, :start, :stop])
     |> validate_required([:item_id, :start])
   end
 

diff --git a/lib/app_web/controllers/auth_controller.ex b/lib/app_web/controllers/auth_controller.ex
@@ -9,9 +9,6 @@ defmodule AppWeb.AuthController do
     |> AuthPlug.Helpers.strip_struct_metadata()
     |> Useful.atomize_map_keys()
 
-    IO.inspect(claims, label: "claims")
-    App.Person.upsert(claims)
-
     socket =
       socket
       |> assign_new(:person, fn -> claims end)

diff --git a/priv/repo/migrations/20220627162148_create_people.exs b/priv/repo/migrations/20220627162148_create_people.exs
diff --git a/priv/repo/migrations/20220627162154_create_items.exs b/priv/repo/migrations/20220627162154_create_items.exs
@@ -4,7 +4,7 @@ defmodule App.Repo.Migrations.CreateItems do
   def change do
     create table(:items) do
       add(:text, :string)
-      add(:person_id, references(:people, on_delete: :nothing))
+      add(:person_id, :integer)
       add(:status, :integer)
 
       timestamps()

diff --git a/priv/repo/migrations/20220627162209_create_timers.exs b/priv/repo/migrations/20220627162209_create_timers.exs
@@ -6,12 +6,10 @@ defmodule App.Repo.Migrations.CreateTimers do
       add :start, :naive_datetime
       add :stop, :naive_datetime
       add :item_id, references(:items, on_delete: :nothing)
-      add :person_id, references(:people, on_delete: :nothing)
 
       timestamps()
     end
 
     create index(:timers, [:item_id])
-    create index(:timers, [:person_id])
   end
 end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
@@ -1,23 +1,3 @@
 if not Envar.is_set?("AUTH_API_KEY") do
   Envar.load(".env")
 end
-
-# Create the default person
-App.Person.upsert(
-  %{
-    givenName: "guest",
-    auth_provider: "none",
-    status: 2, # no association just an int
-    id: 0 # stackoverflow.com/questions/32728179/primary-key-postgres-zero
-  }
-)
-# |> IO.inspect(label: "default person")
-
-App.Person.upsert(
-  %{
-    givenName: "Admin",
-    auth_provider: "google",
-    status: 1,
-    id: 1
-  }
-)
diff --git a/test/app/person_test.exs b/test/app/person_test.exs
diff --git a/test/app_web/live/app_live_test.exs b/test/app_web/live/app_live_test.exs
@@ -26,7 +26,7 @@ defmodule AppWeb.AppLiveTest do
 
     started = NaiveDateTime.utc_now()
     {:ok, _timer} =
-      Timer.start(%{item_id: item.id, person_id: 1, start: started})
+      Timer.start(%{item_id: item.id, start: started})
 
     # See: https://github.com/dwyl/useful/issues/17#issuecomment-1186070198
     # assert Useful.typeof(:timer_id) == "atom"
@@ -189,9 +189,4 @@ defmodule AppWeb.AppLiveTest do
     conn = get(conn, "/login")
     assert redirected_to(conn, 302) =~ "auth.dwyl.com"
   end
-
-  # test "test clicking logout button fires handle_event :logout", %{conn: conn} do
-  #   conn = get(conn, "/login")
-  #   assert redirected_to(conn, 302) =~ "auth.dwyl.com"
-  # end
 end