invoke App.ListItems.add_all_items_to_all_list_for_person_id/1 in mou…

…nt to ensure All items on "all" list #145 #356

lib/app/cid.ex

@@ -8,11 +8,17 @@ defmodule App.Cid do
   This is done transparently so nobody needs to _think_ about cids.
   """
   def put_cid(changeset) do
+    # don't add a cid to a changeset that already has one
     if Map.has_key?(changeset.changes, :cid) do
       changeset
     else
-      cid = Cid.cid(changeset.changes)
-      %{changeset | changes: Map.put(changeset.changes, :cid, cid)}
+      # Only add cid to changeset that has :name i.e. list.name or :text i.e. item.text
+      if Map.has_key?(changeset.changes, :name) || Map.has_key?(changeset.changes, :text) do
+        cid = Cid.cid(changeset.changes)
+        %{changeset | changes: Map.put(changeset.changes, :cid, cid)}
+      else
+        changeset
+      end
     end
   end
 end

lib/app/item.ex

@@ -228,7 +228,7 @@ defmodule App.Item do
     all_list = App.List.get_all_list_for_person(person_id)
     # dbg(all_list)
     seq = App.ListItems.get_list_items(all_list.cid)
-    dbg(seq)
+    # dbg(seq)
 
     sql = """
     SELECT i.id, i.cid, i.text, i.status, i.person_id, i.updated_at,
@@ -245,8 +245,6 @@ defmodule App.Item do
       Ecto.Adapters.SQL.query!(Repo, sql, [seq])
       |> map_columns_to_values()
 
-    dbg(values)
-
     items_tags =
       list_person_items(person_id)
       |> Enum.reduce(%{}, fn i, acc -> Map.put(acc, i.id, i) end)

lib/app_web/live/app_live.ex

@@ -27,7 +27,7 @@ defmodule AppWeb.AppLive do
     all_list = App.List.get_all_list_for_person(person_id)
     # dbg(all_list)
     # Temporary function to add All *existing* items to the "All" list:
-    # App.ListItems.add_all_items_to_all_list_for_person_id(person_id)
+    App.ListItems.add_all_items_to_all_list_for_person_id(person_id)
 
     items = Item.items_with_timers(person_id)
     tags = Tag.list_person_tags(person_id)
@@ -98,7 +98,7 @@ defmodule AppWeb.AppLive do
 
     # need to restrict getting items to the people who own or have rights to access them!
     item = Item.get_item!(Map.get(data, "id"))
-    Item.update_item(item, %{status: status, person_id: person_id})
+    Item.update_item(item, %{status: status, person_id: person_id, cid: item.cid})
     Timer.stop_timer_for_item_id(item.id)
 
     AppWeb.Endpoint.broadcast(@topic, "update", :toggle)
@@ -401,7 +401,11 @@ defmodule AppWeb.AppLive do
 
   # 2: uncategorised (when item are created), 3: active
   def status?(item), do: not is_nil(item) && Map.has_key?(item, :status)
-  def active?(item), do:  status?(item) && item.status == 2 || status?(item) && item.status == 3
+
+  def active?(item),
+    do:
+      (status?(item) && item.status == 2) || (status?(item) && item.status == 3)
+
   def done?(item), do: status?(item) && item.status == 4
   def archived?(item), do: status?(item) && item.status == 6
 
@@ -483,6 +487,7 @@ defmodule AppWeb.AppLive do
   defp filter_items(items, filter, filter_tag) do
     # avoid nil items mvp#412
     items = Enum.reject(items, &is_nil/1)
+
     items =
       case filter do
         "active" ->