shibao/cannery
2
3
Fork 1
Code Issues 15 Pull Requests Projects 1 Releases 40 Wiki Activity

fix pack sql naming issues

Browse Source
This commit is contained in:
shibao
2023-05-12 21:48:04 -04:00
parent 9306d0f970
commit 8a58d53dc1
3 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cannery/containers.ex
View File

@@ -203,9 +203,9 @@ defmodule Cannery.Containers do
{:ok, Container.t()} | {:error, Container.changeset()}
def delete_container(%Container{user_id: user_id} = container, %User{id: user_id}) do
Repo.one(
from ag in Pack,
where: ag.container_id == ^container.id,
select: count(ag.id)
from p in Pack,
where: p.container_id == ^container.id,
select: count(p.id)
)
|> case do
0 ->
@@ -305,10 +305,10 @@ defmodule Cannery.Containers do
@spec list_tags(search :: nil | String.t(), User.t()) :: [Tag.t()]
def list_tags(search \\ nil, user)
def list_tags(search, %{id: user_id}) when search |> is_nil() or search == "",
def list_tags(search, %User{id: user_id}) when search |> is_nil() or search == "",
do: Repo.all(from t in Tag, where: t.user_id == ^user_id, order_by: t.name)
def list_tags(search, %{id: user_id}) when search |> is_binary() do
def list_tags(search, %User{id: user_id}) when search |> is_binary() do
trimmed_search = String.trim(search)
Repo.all(