Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions lib/ret_web/controllers/api/v1/project_assets_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,21 @@ defmodule RetWeb.Api.V1.ProjectAssetsController do
account = Guardian.Plug.current_resource(conn)

with %Project{} = project <- Project.project_by_sid_for_account(project_sid, account),
%Asset{} = asset <- Asset.asset_by_sid_for_account(asset_sid, account),
{:ok, _} <- Project.add_asset_to_project(project, asset) do
asset = Repo.preload(asset, [:asset_owned_file, :thumbnail_owned_file])
render(conn, "show.json", asset: asset)
%Asset{} = asset <- Asset.asset_by_sid_for_account(asset_sid, account) do

project_asset = Repo.get_by(ProjectAsset, [project_id: project.project_id, asset_id: asset.asset_id])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'd do something like:

if Repo.get_by(...) do
  render_asset(asset)
else
  case Project.add_asset_to_project(..) do
    { :error } -> ...
    _ -> render_asset(asset)
end

defp render_asset(asset)
  render(conn, "show.json", asset: asset |> Repo.preload([:asset_owned_file, :thumbnail_owned_file])
end


if is_nil(project_asset) do
case Project.add_asset_to_project(project, asset) do
{:error, error} -> render_error_json(conn, error)
%ProjectAsset{} = project_asset ->
asset = Repo.preload(asset, [:asset_owned_file, :thumbnail_owned_file])
render(conn, "show.json", asset: asset)
end
else
asset = Repo.preload(asset, [:asset_owned_file, :thumbnail_owned_file])
render(conn, "show.json", asset: asset)
end
else
{:error, error} -> render_error_json(conn, error)
nil -> render_error_json(conn, :not_found)
Expand Down