From 814f94675fa984b014317488569296d5948fabc1 Mon Sep 17 00:00:00 2001
From: Kieran Eglin <kieran.eglin@gmail.com>
Date: Tue, 28 May 2024 12:22:33 -0700
Subject: [PATCH] Refactored media item table live

---
 .../sources/source_html/media_item_table_live.ex         | 9 +++++----
 test/support/fixtures/media_fixtures.ex                  | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex b/lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex
index d5b38b7..b2d4c3e 100644
--- a/lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex
+++ b/lib/pinchflat_web/controllers/sources/source_html/media_item_table_live.ex
@@ -50,7 +50,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
           </.subtle_link>
         </:col>
         <:col :let={media_item} label="Upload Date">
-          <%= media_item.upload_date %>
+          <%= media_item.uploaded_at %>
         </:col>
         <:col :let={media_item} :if={@media_state == "other"} label="Manually Ignored?">
           <.icon name={if media_item.prevent_download, do: "hero-check", else: "hero-x-mark"} />
@@ -66,6 +66,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
     """
   end
 
+  # TODO: see how uploaded_at looks in the UI (above)
   def mount(_params, session, socket) do
     PinchflatWeb.Endpoint.subscribe("media_table")
 
@@ -150,14 +151,14 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
     |> MediaQuery.require_assoc(:media_profile)
     |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.pending()))
-    |> order_by(desc: fragment("rank"), desc: :upload_date)
+    |> order_by(desc: fragment("rank"), desc: :uploaded_at)
   end
 
   defp generate_base_query(source, "downloaded") do
     MediaQuery.new()
     |> MediaQuery.require_assoc(:media_items_search_index)
     |> where(^dynamic(^MediaQuery.for_source(source) and ^MediaQuery.downloaded()))
-    |> order_by(desc: fragment("rank"), desc: :upload_date)
+    |> order_by(desc: fragment("rank"), desc: :uploaded_at)
   end
 
   defp generate_base_query(source, "other") do
@@ -170,7 +171,7 @@ defmodule Pinchflat.Sources.MediaItemTableLive do
           (not (^MediaQuery.downloaded()) and not (^MediaQuery.pending()))
       )
     )
-    |> order_by(desc: fragment("rank"), desc: :upload_date)
+    |> order_by(desc: fragment("rank"), desc: :uploaded_at)
   end
 
   defp filter_base_query(base_query, search_term) do
diff --git a/test/support/fixtures/media_fixtures.ex b/test/support/fixtures/media_fixtures.ex
index 0581024..c9766ee 100644
--- a/test/support/fixtures/media_fixtures.ex
+++ b/test/support/fixtures/media_fixtures.ex
@@ -14,7 +14,9 @@ defmodule Pinchflat.MediaFixtures do
     media_id = Faker.String.base64(12)
 
     # TODO: remove
-    if attrs[:upload_date] || attrs["upload_date"] do
+    attrs2 = Enum.into(attrs, %{})
+
+    if attrs2[:upload_date] || attrs2["upload_date"] do
       raise "upload_date is not allowed in media_item_fixture. Use uploaded_at instead."
     end