hugo/bDS2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix CSM-006

Browse Source
This commit is contained in:
Chili Palmer
2026-05-08 20:26:08 +02:00
parent 06d80e2924
commit 93a4159c31
5 changed files with 532 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bds/rendering/list_archive.ex
View File

@@ -24,9 +24,20 @@ defmodule BDS.Rendering.ListArchive do
canonical_media_paths = LinksAndLanguages.canonical_media_path_by_source_path(project_id)
input_posts = MapUtils.attr(assigns, :posts, [])
post_ids =
input_posts
|> Enum.map(&MapUtils.attr(&1, :id))
|> Enum.reject(&is_nil/1)
|> Enum.uniq()
post_records = PostRendering.load_post_records_batch(post_ids)
posts =
normalize_list_posts(
MapUtils.attr(assigns, :posts, []),
input_posts,
post_records,
canonical_post_paths,
canonical_media_paths,
language,
@@ -172,13 +183,15 @@ defmodule BDS.Rendering.ListArchive do
defp normalize_list_posts(
posts,
post_records,
canonical_post_paths,
canonical_media_paths,
language,
template_context
) do
Enum.map(posts, fn post ->
post_record = PostRendering.load_post_record(post)
post_id = MapUtils.attr(post, :id)
post_record = Map.get(post_records, post_id)
raw_content =
Map.get(
@@ -332,4 +345,5 @@ defmodule BDS.Rendering.ListArchive do
do: RenderMetadata.calendar_initial_month(post)
defp calendar_initial_month_from_posts([]), do: nil
end

33
lib/bds/rendering/post_rendering.ex
View File

@@ -1,6 +1,8 @@
defmodule BDS.Rendering.PostRendering do
@moduledoc false
import Ecto.Query
alias BDS.Rendering.Filters
alias BDS.Rendering.Labels
alias BDS.Rendering.LinksAndLanguages
@@ -101,6 +103,7 @@ defmodule BDS.Rendering.PostRendering do
}
end
@spec load_post_record(map()) :: Post.t() | Translation.t() | nil
def load_post_record(assigns) do
case MapUtils.attr(assigns, :id) do
nil -> nil
@@ -108,6 +111,36 @@ defmodule BDS.Rendering.PostRendering do
end
end
@spec load_post_records_batch([String.t()]) :: %{String.t() => Post.t() | Translation.t() | nil}
def load_post_records_batch([]), do: %{}
def load_post_records_batch(post_ids) when is_list(post_ids) do
posts =
Repo.all(from p in Post, where: p.id in ^post_ids)
|> Enum.map(&{&1.id, &1})
|> Map.new()
missing_ids = Enum.reject(post_ids, &Map.has_key?(posts, &1))
translations =
if Enum.empty?(missing_ids) do
%{}
else
Repo.all(from t in Translation, where: t.id in ^missing_ids)
|> Enum.map(&{&1.id, &1})
|> Map.new()
end
missing_after_translations = Enum.reject(missing_ids, &Map.has_key?(translations, &1))
nil_entries =
missing_after_translations
|> Enum.map(&{&1, nil})
|> Map.new()
Map.merge(posts, Map.merge(translations, nil_entries))
end
defp canonical_post_record(%Translation{translation_for: post_id}), do: Repo.get(Post, post_id)
defp canonical_post_record(%Post{} = post), do: post
defp canonical_post_record(_other), do: nil

80
lib/bds/search.ex
View File

@@ -364,6 +364,10 @@ defmodule BDS.Search do
)
posts = Repo.all(from post in Post, where: post.project_id == ^project_id)
post_ids = Enum.map(posts, & &1.id)
translations_by_post_id = preload_post_translations(post_ids)
on_progress = progress_callback(opts)
total_posts = length(posts)
@@ -372,7 +376,8 @@ defmodule BDS.Search do
posts
|> Enum.with_index(1)
|> Enum.each(fn {post, index} ->
insert_post_index(post)
translations = Map.get(translations_by_post_id, post.id, [])
insert_post_index(post, translations)
:ok = report_reindex_progress(on_progress, index, total_posts, "posts")
end)
@@ -387,6 +392,10 @@ defmodule BDS.Search do
)
media_items = Repo.all(from media in Media, where: media.project_id == ^project_id)
media_ids = Enum.map(media_items, & &1.id)
translations_by_media_id = preload_media_translations(media_ids)
on_progress = progress_callback(opts)
total_media = length(media_items)
@@ -395,7 +404,8 @@ defmodule BDS.Search do
media_items
|> Enum.with_index(1)
|> Enum.each(fn {media, index} ->
insert_media_index(media)
translations = Map.get(translations_by_media_id, media.id, [])
insert_media_index(media, translations)
:ok = report_reindex_progress(on_progress, index, total_media, "media items")
end)
@@ -465,8 +475,9 @@ defmodule BDS.Search do
)
end
defp insert_post_index(%Post{} = post) do
{title, excerpt, content, tags, categories} = post_index_fields(post)
defp insert_post_index(%Post{} = post, translations \\ nil) do
translations = translations || post_translations(post.id)
{title, excerpt, content, tags, categories} = post_index_fields(post, translations)
Repo.query!(
"INSERT INTO posts_fts (post_id, title, excerpt, content, tags, categories) VALUES (?, ?, ?, ?, ?, ?)",
@@ -474,8 +485,9 @@ defmodule BDS.Search do
)
end
defp insert_media_index(%Media{} = media) do
{title, alt, caption, original_name, tags} = media_index_fields(media)
defp insert_media_index(%Media{} = media, translations \\ nil) do
translations = translations || media_translations(media.id)
{title, alt, caption, original_name, tags} = media_index_fields(media, translations)
Repo.query!(
"INSERT INTO media_fts (media_id, title, alt, caption, original_name, tags) VALUES (?, ?, ?, ?, ?, ?)",
@@ -485,8 +497,7 @@ defmodule BDS.Search do
defp post_index_fields(post) do
translations = post_translations(post.id)
defp post_index_fields(post, translations) do
post_language = normalize_language(post.language)
title =
@@ -519,12 +530,7 @@ defmodule BDS.Search do
{title, excerpt, content, tags, categories}
end
defp media_index_fields(media) do
translations =
Repo.all(
from translation in MediaTranslation, where: translation.translation_for == ^media.id
)
defp media_index_fields(media, translations) do
media_language = normalize_language(media.language)
title =
@@ -548,6 +554,31 @@ defmodule BDS.Search do
{title, alt, caption, original_name, tags}
end
defp preload_post_translations(post_ids) when is_list(post_ids) do
if Enum.empty?(post_ids) do
%{}
else
placeholders = Enum.map_join(post_ids, ", ", fn _ -> "?" end)
Repo.query!(
"SELECT translation_for, language, title, excerpt, content, status, file_path FROM post_translations WHERE translation_for IN (#{placeholders})",
post_ids
).rows
|> Enum.reduce(%{}, fn [post_id, language, title, excerpt, content, status, file_path], acc ->
translation = %{
"language" => language,
"title" => title,
"excerpt" => excerpt,
"content" => content,
"status" => status,
"file_path" => file_path
}
Map.update(acc, post_id, [translation], &(&1 ++ [translation]))
end)
end
end
defp post_translations(post_id) do
Repo.query!(
"SELECT language, title, excerpt, content, status, file_path FROM post_translations WHERE translation_for = ?",
@@ -565,6 +596,27 @@ defmodule BDS.Search do
end)
end
defp preload_media_translations(media_ids) when is_list(media_ids) do
if Enum.empty?(media_ids) do
%{}
else
Repo.all(
from translation in MediaTranslation,
where: translation.translation_for in ^media_ids,
select: {translation.translation_for, translation}
)
|> Enum.reduce(%{}, fn {media_id, translation}, acc ->
Map.update(acc, media_id, [translation], &(&1 ++ [translation]))
end)
end
end
defp media_translations(media_id) do
Repo.all(
from translation in MediaTranslation, where: translation.translation_for == ^media_id
)
end
defp post_content(%Post{content: content}) when is_binary(content), do: content
defp post_content(%Post{project_id: project_id, file_path: file_path})