[bug] Delete job (#69)

* change items and logs delete options

* add more data to test case

lib/crawly_ui/manager/item.ex

@@ -4,7 +4,7 @@ defmodule CrawlyUI.Manager.Item do
 
   schema "items" do
     field :data, :map
-    field :job_id, :id
+    belongs_to :job, CrawlyUI.Manager.Job
 
     timestamps()
   end

lib/crawly_ui/manager/job.ex

@@ -10,6 +10,10 @@ defmodule CrawlyUI.Manager.Job do
     field :items_count, :integer, default: 0
     field :crawl_speed, :integer, default: 0
     field :run_time, :integer, default: 0
+
+    has_many :items, CrawlyUI.Manager.Item, on_delete: :delete_all
+    has_many :logs, CrawlyUI.Manager.Log, on_delete: :delete_all
+
     timestamps()
   end
 

lib/crawly_ui/manager/log.ex

@@ -4,10 +4,11 @@ defmodule CrawlyUI.Manager.Log do
 
   schema "logs" do
     field :message, :string
-    field :job_id, :id
     field :mod, :string
     field :category, Ecto.Enum, values: [:manager, :worker, :requests, :items, :other]
 
+    belongs_to :job, CrawlyUI.Manager.Job
+
     timestamps()
   end
 

lib/crawly_ui_web/live/job_live.ex

@@ -66,7 +66,6 @@ defmodule CrawlyUIWeb.JobLive do
   def handle_event("delete", %{"job" => job_id}, socket) do
     job = job_id |> String.to_integer() |> Manager.get_job!()
 
-    job |> Manager.delete_all_job_items()
     {:ok, _} = job |> Manager.delete_job()
 
     socket = update_socket(socket)

priv/repo/migrations/20210211143950_change_item_delete_option.exs

@@ -0,0 +1,10 @@
+defmodule CrawlyUI.Repo.Migrations.ChangeItemsDeleteOption do
+  use Ecto.Migration
+
+  def change do
+    alter table(:items) do
+      modify :job_id, references(:jobs, on_delete: :nothing),
+        from: references(:jobs, on_delete: :delete_all)
+    end
+  end
+end

priv/repo/migrations/20210211152013_change_logs_delete_option.exs

@@ -0,0 +1,10 @@
+defmodule CrawlyUI.Repo.Migrations.ChangeLogsDeleteOption do
+  use Ecto.Migration
+
+  def change do
+    alter table(:logs) do
+      modify :job_id, references(:jobs, on_delete: :nothing),
+        from: references(:jobs, on_delete: :delete_all)
+    end
+  end
+end

test/crawly_ui_web/live/job_live_test.exs

@@ -169,6 +169,8 @@ defmodule CrawlyUIWeb.JobLiveTest do
     insert_item(job_2.id, inserted_at(50))
     insert_item(job_2.id, inserted_at(10))
 
+    insert_log(job_2.id)
+
     {:ok, view, _html} = live(conn, "/all")
 
     assert render(view) =~

test/support/data_case.ex

@@ -75,6 +75,14 @@ defmodule CrawlyUI.DataCase do
     })
   end
 
+  def insert_log(job_id) do
+    CrawlyUI.Repo.insert!(%CrawlyUI.Manager.Log{
+      job_id: job_id,
+      mod: "undefined",
+      message: "Dropping request: \"\" (domain filter)"
+    })
+  end
+
   def inserted_at_valid(), do: inserted_at(0)
 
   @job_abandoned_timeout 60 * 30 + 10