From 5c1945bb7a3d8a391de1bf75904f3fe79d589e51 Mon Sep 17 00:00:00 2001 From: gakigaki Date: Thu, 12 Feb 2026 22:05:11 +0900 Subject: [PATCH] feat(photoalbums): optimize moreContents loading and add feature tests --- .../User/Photoalbums/PhotoalbumsPlugin.php | 380 ++++++++++++------ ..._photoalbum_contents_for_more_contents.php | 32 ++ .../PhotoalbumsMoreContentsFeatureTest.php | 212 ++++++++++ 3 files changed, 499 insertions(+), 125 deletions(-) create mode 100644 database/migrations/2026_02_12_000000_add_index_to_photoalbum_contents_for_more_contents.php create mode 100644 tests/Feature/Plugins/User/Photoalbums/PhotoalbumsMoreContentsFeatureTest.php diff --git a/app/Plugins/User/Photoalbums/PhotoalbumsPlugin.php b/app/Plugins/User/Photoalbums/PhotoalbumsPlugin.php index e57f1222c..6bab9e2b4 100644 --- a/app/Plugins/User/Photoalbums/PhotoalbumsPlugin.php +++ b/app/Plugins/User/Photoalbums/PhotoalbumsPlugin.php @@ -2,6 +2,7 @@ namespace App\Plugins\User\Photoalbums; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; @@ -148,7 +149,7 @@ public function index($request, $page_id, $frame_id, $parent_id = null) $load_more_state['load_more_use'], $load_more_state['load_more_count'] ); - $covers = $this->fetchFolderCovers($index_display_items['photoalbum_folder_items']); + $covers = $this->fetchFolderCovers($index_display_items['photoalbum_folder_items'], $parent->photoalbum_id); // 表示テンプレートを呼び出す。 return $this->view('index', array_merge([ @@ -169,18 +170,205 @@ public function index($request, $page_id, $frame_id, $parent_id = null) */ private function getSortedVisibleChildren(PhotoalbumContent $parent, array $hidden_folder_ids): Collection { - $sort_folder = FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_folder); - $sort_file = FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_file); + $folder_items = $this->getSortedVisibleItemsByTarget($parent, $hidden_folder_ids, 'folder'); + $image_items = $this->getSortedVisibleItemsByTarget($parent, $hidden_folder_ids, 'image'); - $photoalbum_contents = $this->getSortedChildren($parent, $sort_folder, $sort_file); - if (empty($hidden_folder_ids)) { - return $photoalbum_contents->values(); + return $folder_items->concat($image_items)->values(); + } + + /** + * 並び順設定（フォルダ/画像）を取得する。 + * + * @return array + */ + private function getPhotoalbumSortConfig(): array + { + return [ + 'sort_folder' => FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_folder), + 'sort_file' => FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_file), + ]; + } + + /** + * 親配下の対象種別コンテンツを取得するクエリを返す。 + * + * @param \App\Models\User\Photoalbums\PhotoalbumContent $parent + * @param string $target 対象種別（folder|image） + * @param array $hidden_folder_ids + * @return \Illuminate\Database\Eloquent\Builder + */ + private function getVisibleChildrenQueryByTarget(PhotoalbumContent $parent, string $target, array $hidden_folder_ids): Builder + { + $is_folder = $target === 'folder' + ? PhotoalbumContent::is_folder_on + : PhotoalbumContent::is_folder_off; + + $query = PhotoalbumContent::query() + ->where('photoalbum_id', $parent->photoalbum_id) + ->where('parent_id', $parent->id) + ->where('is_folder', $is_folder); + + if ($is_folder == PhotoalbumContent::is_folder_on && !empty($hidden_folder_ids)) { + $query->whereNotIn('id', $hidden_folder_ids); + } + + return $this->appendTargetRelations($query, $target); + } + + /** + * フォトアルバム全体の対象種別コンテンツを取得するクエリを返す。 + */ + private function getPhotoalbumItemsQueryByTarget(int $photoalbum_id, string $target): Builder + { + $is_folder = $target === 'folder' + ? PhotoalbumContent::is_folder_on + : PhotoalbumContent::is_folder_off; + + $query = PhotoalbumContent::query() + ->where('photoalbum_id', $photoalbum_id) + ->where('is_folder', $is_folder); + + return $this->appendTargetRelations($query, $target); + } + + /** + * 対象種別で必要な関連をクエリへ付与する。 + */ + private function appendTargetRelations(Builder $query, string $target): Builder + { + if ($target === 'image') { + $query->with('upload'); + } + + return $query; + } + + /** + * ソート設定値を有効値へ正規化する。 + */ + private function normalizePhotoalbumSortKey(?string $sort_key): string + { + if (in_array($sort_key, [ + PhotoalbumSort::name_asc, + PhotoalbumSort::name_desc, + PhotoalbumSort::created_asc, + PhotoalbumSort::created_desc, + PhotoalbumSort::manual_order, + ], true)) { + return $sort_key; + } + + return PhotoalbumSort::name_asc; + } + + /** + * 対象種別のソートキーを取得する。 + */ + private function getTargetSortKey(string $target, ?string $sort_folder, ?string $sort_file): string + { + $target_sort = $target === 'folder' ? $sort_folder : $sort_file; + return $this->normalizePhotoalbumSortKey($target_sort); + } + + /** + * 対象種別のクエリにソート条件を適用する。 + */ + private function applySortToVisibleChildrenQuery(Builder $query, string $target, ?string $sort_folder, ?string $sort_file): Builder + { + $target_sort = $this->getTargetSortKey($target, $sort_folder, $sort_file); + $name_column = 'photoalbum_contents.name'; + + if ($target === 'image' && in_array($target_sort, [PhotoalbumSort::name_asc, PhotoalbumSort::name_desc], true)) { + $query->leftJoin('uploads as sort_uploads', 'sort_uploads.id', '=', 'photoalbum_contents.upload_id') + ->select('photoalbum_contents.*'); + $name_column = 'sort_uploads.client_original_name'; + } + + switch ($target_sort) { + case PhotoalbumSort::name_desc: + $query->orderBy($name_column, 'desc'); + break; + case PhotoalbumSort::created_asc: + $query->orderBy('photoalbum_contents.created_at', 'asc'); + break; + case PhotoalbumSort::created_desc: + $query->orderBy('photoalbum_contents.created_at', 'desc'); + break; + case PhotoalbumSort::manual_order: + $query->orderBy('photoalbum_contents.display_sequence', 'asc'); + break; + case PhotoalbumSort::name_asc: + default: + $query->orderBy($name_column, 'asc'); + break; + } + + return $query->orderBy('photoalbum_contents.id', 'asc'); + } + + /** + * 親配下の表示可能コンテンツ（対象種別）を並び順付きクエリで取得する。 + */ + private function getSortedVisibleItemsQueryByTarget( + PhotoalbumContent $parent, + array $hidden_folder_ids, + string $target, + ?string $sort_folder = null, + ?string $sort_file = null + ): Builder { + if (is_null($sort_folder) || is_null($sort_file)) { + $sort_config = $this->getPhotoalbumSortConfig(); + $sort_folder = $sort_config['sort_folder']; + $sort_file = $sort_config['sort_file']; + } + + $query = $this->getVisibleChildrenQueryByTarget($parent, $target, $hidden_folder_ids); + return $this->applySortToVisibleChildrenQuery($query, $target, $sort_folder, $sort_file); + } + + /** + * 親配下の表示可能コンテンツを、対象種別ごとに並び替えて取得する。 + * + * @param \App\Models\User\Photoalbums\PhotoalbumContent $parent + * @param array $hidden_folder_ids + * @param string $target 対象種別（folder|image） + * @param string|null $sort_folder + * @param string|null $sort_file + * @return \Illuminate\Support\Collection + */ + private function getSortedVisibleItemsByTarget( + PhotoalbumContent $parent, + array $hidden_folder_ids, + string $target, + ?string $sort_folder = null, + ?string $sort_file = null + ): Collection { + return $this->getSortedVisibleItemsQueryByTarget( + $parent, + $hidden_folder_ids, + $target, + $sort_folder, + $sort_file + )->get()->values(); + } + + /** + * フォトアルバム全体の対象種別コンテンツを並び順付きで取得する。 + */ + private function getSortedPhotoalbumItemsByTarget( + int $photoalbum_id, + string $target, + ?string $sort_folder = null, + ?string $sort_file = null + ): Collection { + if (is_null($sort_folder) || is_null($sort_file)) { + $sort_config = $this->getPhotoalbumSortConfig(); + $sort_folder = $sort_config['sort_folder']; + $sort_file = $sort_config['sort_file']; } - return $photoalbum_contents->reject(function ($content) use ($hidden_folder_ids) { - return $content->is_folder == PhotoalbumContent::is_folder_on - && in_array($content->id, $hidden_folder_ids, true); - })->values(); + $query = $this->getPhotoalbumItemsQueryByTarget($photoalbum_id, $target); + return $this->applySortToVisibleChildrenQuery($query, $target, $sort_folder, $sort_file)->get()->values(); } /** @@ -245,16 +433,18 @@ private function buildIndexDisplayItems(Collection $photoalbum_contents, $load_m * 表示対象フォルダに設定されたカバー画像一覧を取得する。 * * @param \Illuminate\Support\Collection $folder_items + * @param int $photoalbum_id * @return \Illuminate\Support\Collection */ - private function fetchFolderCovers(Collection $folder_items): Collection + private function fetchFolderCovers(Collection $folder_items, int $photoalbum_id): Collection { $folder_ids = $folder_items->pluck('id'); if ($folder_ids->isEmpty()) { return collect(); } - return PhotoalbumContent::whereIn('parent_id', $folder_ids) + return PhotoalbumContent::where('photoalbum_id', $photoalbum_id) + ->whereIn('parent_id', $folder_ids) ->where('is_cover', PhotoalbumContent::is_cover_on) ->with(['upload', 'posterUpload']) ->get(); @@ -463,106 +653,33 @@ private function isHiddenPhotoalbumContent(PhotoalbumContent $content, array $hi return false; } - /** - * 指定した親の子要素をフレーム設定に合わせて並び替えて取得する - */ - private function getSortedChildren(PhotoalbumContent $parent, ?string $sort_folder, ?string $sort_file, ?Collection $preloaded_children = null) - { - $children = is_null($preloaded_children) - ? $parent->children()->with(['upload', 'posterUpload'])->get() - : $preloaded_children->get($parent->id, collect()); - - // 設定画面などで事前に読み込んだ子要素一覧を再利用し、追加クエリを避ける - if (!is_null($preloaded_children) && $children->isEmpty()) { - return collect(); - } - - return $children->sort(function ($first, $second) use ($sort_folder, $sort_file) { - return $this->comparePhotoalbumContents($first, $second, $sort_folder, $sort_file); - })->values(); - } - - /** - * 並び替え比較処理 - */ - private function comparePhotoalbumContents(PhotoalbumContent $first, PhotoalbumContent $second, ?string $sort_folder, ?string $sort_file) - { - if ($first->is_folder == $second->is_folder) { - $sort_key = $first->is_folder == PhotoalbumContent::is_folder_on ? $sort_folder : $sort_file; - - switch ($sort_key) { - case PhotoalbumSort::name_desc: - return strnatcasecmp($second->displayName, $first->displayName); - case PhotoalbumSort::created_asc: - return $this->compareDates($first->created_at, $second->created_at); - case PhotoalbumSort::created_desc: - return $this->compareDates($second->created_at, $first->created_at); - case PhotoalbumSort::manual_order: - $sequence = $first->display_sequence <=> $second->display_sequence; - return $sequence !== 0 ? $sequence : $first->id <=> $second->id; - default: - return strnatcasecmp($first->displayName, $second->displayName); - } - } - - return $second->is_folder <=> $first->is_folder; - } - - /** - * 日付比較 - */ - private function compareDates($first, $second) - { - $first_timestamp = $this->convertToTimestamp($first); - $second_timestamp = $this->convertToTimestamp($second); - - return $first_timestamp <=> $second_timestamp; - } - - /** - * 日付をタイムスタンプへ変換する - */ - private function convertToTimestamp($value) - { - if (empty($value)) { - return 0; - } - - if ($value instanceof \Carbon\Carbon) { - return $value->timestamp; - } - - return strtotime((string) $value) ?: 0; - } - /** * 並び替え済みの子要素マップを作成する */ - private function buildSortedChildrenMap(PhotoalbumContent $root, ?string $sort_folder, ?string $sort_file, ?Collection $preloaded_children = null) + private function buildSortedChildrenMap(PhotoalbumContent $root, Collection $folder_children_map, Collection $image_children_map) { $map = []; - $this->appendSortedChildrenToMap($root, $sort_folder, $sort_file, $map, $preloaded_children); + $this->appendSortedChildrenToMap($root, $folder_children_map, $image_children_map, $map); return $map; } /** - * 事前取得済みデータを元に、各親IDの並び済み子リストをマップへ格納する + * 各親IDの並び済み子リストをマップへ格納する */ - private function appendSortedChildrenToMap(PhotoalbumContent $node, ?string $sort_folder, ?string $sort_file, array &$map, ?Collection $preloaded_children = null) + private function appendSortedChildrenToMap(PhotoalbumContent $node, Collection $folder_children_map, Collection $image_children_map, array &$map) { if (isset($map[$node->id])) { return; } - $children = $this->getSortedChildren($node, $sort_folder, $sort_file, $preloaded_children); - $map[$node->id] = $children; + $folder_children = $folder_children_map->get($node->id, collect())->values(); + $image_children = $image_children_map->get($node->id, collect())->values(); + $children = $folder_children->concat($image_children)->values(); - foreach ($children as $child) { - if ($child->is_folder == PhotoalbumContent::is_folder_off) { - continue; - } + $map[$node->id] = $children; - $this->appendSortedChildrenToMap($child, $sort_folder, $sort_file, $map, $preloaded_children); + foreach ($folder_children as $child) { + $this->appendSortedChildrenToMap($child, $folder_children_map, $image_children_map, $map); } } @@ -1841,16 +1958,20 @@ public function editView($request, $page_id, $frame_id) $sorted_children_map = []; $focus_open_ids = []; if (!empty($photoalbum->id)) { - $all_contents = PhotoalbumContent::with(['upload', 'posterUpload']) - ->where('photoalbum_id', $photoalbum->id) - ->get(); + // 表示設定画面はフォルダ・画像をそれぞれ1回ずつ取得し、親IDごとに再利用してN+1を防ぐ + $folder_contents = $this->getSortedPhotoalbumItemsByTarget($photoalbum->id, 'folder', $sort_folder, $sort_file); + $image_contents = $this->getSortedPhotoalbumItemsByTarget($photoalbum->id, 'image', $sort_folder, $sort_file); + $all_contents = $folder_contents->concat($image_contents)->values(); - $preview_root = $all_contents->firstWhere('parent_id', null); + $preview_root = $folder_contents->firstWhere('parent_id', null); if (!empty($preview_root)) { // プレビュー／編集の双方で使えるよう、親IDごとの並び済みリストを構築 - $grouped_children = $all_contents->groupBy('parent_id'); - $sorted_children_map = $this->buildSortedChildrenMap($preview_root, $sort_folder, $sort_file, $grouped_children); + $sorted_children_map = $this->buildSortedChildrenMap( + $preview_root, + $folder_contents->groupBy('parent_id'), + $image_contents->groupBy('parent_id') + ); } $focus_open_ids = $this->buildFocusOpenIds($all_contents, session('photoalbum_sort_focus')); @@ -2033,16 +2154,10 @@ private function respondViewSequenceError($request, string $message, int $status */ private function respondViewSequenceJson(PhotoalbumContent $content) { - $sort_folder = FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_folder); - $sort_file = FrameConfig::getConfigValue($this->frame_configs, PhotoalbumFrameConfig::sort_file); - - $siblings = PhotoalbumContent::where('parent_id', $content->parent_id) - ->with('upload') - ->get(['id', 'is_folder', 'display_sequence', 'created_at', 'name', 'upload_id']) - ->sort(function ($first, $second) use ($sort_folder, $sort_file) { - return $this->comparePhotoalbumContents($first, $second, $sort_folder, $sort_file); - }) - ->values(); + $parent = PhotoalbumContent::find($content->parent_id); + $siblings = empty($parent) + ? collect() + : $this->getSortedVisibleChildren($parent, []); return response()->json([ 'message' => '並び順を更新しました。', @@ -2123,16 +2238,15 @@ public function moreContents($request, $page_id, $frame_id, $parent_id = null) return response()->json(['message' => 'フォトアルバムが見つかりません。'], 404); } - $items = $this->getMoreContentsItems($parent, $target, $hidden_folder_ids); $offset = max(0, (int) $request->get('offset', 0)); - $total = $items->count(); + $limit = $this->resolveMoreContentsLimit($target, $request->get('limit')); + list($slice, $total) = $this->getMoreContentsSlice($parent, $target, $hidden_folder_ids, $offset, $limit); + if ($offset >= $total) { return $this->makeMoreContentsResponse('', $total, $total); } - $limit = $this->resolveMoreContentsLimit($target, $request->get('limit')); - $slice = $items->slice($offset, $limit)->values(); - $html = $this->renderMoreContentsHtml($target, $slice); + $html = $this->renderMoreContentsHtml($target, $slice, $parent->photoalbum_id); $next_offset = min($offset + $slice->count(), $total); return $this->makeMoreContentsResponse($html, $next_offset, $total); @@ -2170,20 +2284,34 @@ private function resolveMoreContentsParent($parent_id, array $hidden_folder_ids) } /** - * もっと見る対象のアイテム一覧を取得する。 + * もっと見る対象のアイテム一覧（対象種別ごとの1ページ分）を取得する。 * * @param \App\Models\User\Photoalbums\PhotoalbumContent $parent * @param string $target 対象種別（folder|image） * @param array $hidden_folder_ids - * @return \Illuminate\Support\Collection + * @param int $offset + * @param int $limit + * @return array [\Illuminate\Support\Collection $slice, int $total] */ - private function getMoreContentsItems(PhotoalbumContent $parent, string $target, array $hidden_folder_ids): Collection + private function getMoreContentsSlice(PhotoalbumContent $parent, string $target, array $hidden_folder_ids, int $offset, int $limit): array { - $photoalbum_contents = $this->getSortedVisibleChildren($parent, $hidden_folder_ids); + $sort_config = $this->getPhotoalbumSortConfig(); + $sort_folder = $sort_config['sort_folder']; + $sort_file = $sort_config['sort_file']; + + $query = $this->getSortedVisibleItemsQueryByTarget($parent, $hidden_folder_ids, $target, $sort_folder, $sort_file); + $total = (clone $query)->count(); + if ($total === 0 || $offset >= $total) { + return [collect(), $total]; + } + + $slice = $query + ->offset($offset) + ->limit($limit) + ->get() + ->values(); - return $target === 'folder' - ? $photoalbum_contents->where('is_folder', PhotoalbumContent::is_folder_on)->values() - : $photoalbum_contents->where('is_folder', PhotoalbumContent::is_folder_off)->values(); + return [$slice, $total]; } /** @@ -2214,16 +2342,18 @@ private function resolveMoreContentsLimit(string $target, $request_limit): int * * @param string $target 対象種別（folder|image） * @param \Illuminate\Support\Collection $slice + * @param int $photoalbum_id * @return string */ - private function renderMoreContentsHtml(string $target, Collection $slice): string + private function renderMoreContentsHtml(string $target, Collection $slice, int $photoalbum_id): string { $download_check = $this->getDownloadCheck(); if ($target === 'folder') { $folder_ids = $slice->pluck('id'); $covers = $folder_ids->isEmpty() ? collect() - : PhotoalbumContent::whereIn('parent_id', $folder_ids) + : PhotoalbumContent::where('photoalbum_id', $photoalbum_id) + ->whereIn('parent_id', $folder_ids) ->where('is_cover', PhotoalbumContent::is_cover_on) ->with(['upload', 'posterUpload']) ->get(); diff --git a/database/migrations/2026_02_12_000000_add_index_to_photoalbum_contents_for_more_contents.php b/database/migrations/2026_02_12_000000_add_index_to_photoalbum_contents_for_more_contents.php new file mode 100644 index 000000000..9950741fd --- /dev/null +++ b/database/migrations/2026_02_12_000000_add_index_to_photoalbum_contents_for_more_contents.php @@ -0,0 +1,32 @@ +index( + ['photoalbum_id', 'parent_id', 'is_folder'], + 'photoalbum_contents_photoalbum_parent_folder_idx' + ); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('photoalbum_contents', function (Blueprint $table) { + $table->dropIndex('photoalbum_contents_photoalbum_parent_folder_idx'); + }); + } +}; + diff --git a/tests/Feature/Plugins/User/Photoalbums/PhotoalbumsMoreContentsFeatureTest.php b/tests/Feature/Plugins/User/Photoalbums/PhotoalbumsMoreContentsFeatureTest.php new file mode 100644 index 000000000..6488ad3ae --- /dev/null +++ b/tests/Feature/Plugins/User/Photoalbums/PhotoalbumsMoreContentsFeatureTest.php @@ -0,0 +1,212 @@ +seed(); + } + + /** + * target が不正な場合は 400 を返すこと。 + */ + public function testMoreContentsReturns400WhenTargetIsInvalid(): void + { + [$page, $frame, $root] = $this->makePhotoalbumFrame(); + + $response = $this->getJson("/json/photoalbums/moreContents/{$page->id}/{$frame->id}/{$root->id}?target=invalid"); + + $response->assertStatus(400) + ->assertJson([ + 'message' => 'invalid target', + ]); + } + + /** + * offset / limit の境界値を安全に扱うこと。 + */ + public function testMoreContentsOffsetAndLimitBoundary(): void + { + [$page, $frame, $root, $photoalbum] = $this->makePhotoalbumFrame([ + PhotoalbumFrameConfig::sort_file => PhotoalbumSort::manual_order, + PhotoalbumFrameConfig::load_more_use_flag => UseType::not_use, + ]); + + $first = $this->createImageContent($root, $photoalbum->id, 1, 'first.jpg'); + $second = $this->createImageContent($root, $photoalbum->id, 2, 'second.jpg'); + $this->createImageContent($root, $photoalbum->id, 3, 'third.jpg'); + $this->createImageContent($root, $photoalbum->id, 4, 'fourth.jpg'); + + Config::set('photoalbums.load_more_max_limit', 2); + + $response = $this->getJson("/json/photoalbums/moreContents/{$page->id}/{$frame->id}/{$root->id}?target=image&offset=-5&limit=999"); + $response->assertStatus(200) + ->assertJson([ + 'next_offset' => 2, + 'total' => 4, + ]); + + $ids = $this->extractImageIds($response->json('html'), $frame->id); + $this->assertSame([$first->id, $second->id], $ids); + + $last_response = $this->getJson("/json/photoalbums/moreContents/{$page->id}/{$frame->id}/{$root->id}?target=image&offset=4&limit=1"); + $last_response->assertStatus(200) + ->assertJson([ + 'html' => '', + 'next_offset' => 4, + 'total' => 4, + ]); + } + + /** + * index 初回表示と moreContents の並び順が一致すること（名前順・降順）。 + */ + public function testIndexAndMoreContentsKeepSameOrderForNameSort(): void + { + [$page, $frame, $root, $photoalbum] = $this->makePhotoalbumFrame([ + PhotoalbumFrameConfig::sort_file => PhotoalbumSort::name_desc, + PhotoalbumFrameConfig::load_more_use_flag => UseType::use, + PhotoalbumFrameConfig::load_more_count => 2, + ]); + + $gamma = $this->createImageContent($root, $photoalbum->id, 1, 'gamma.jpg'); + $alpha = $this->createImageContent($root, $photoalbum->id, 2, 'alpha.jpg'); + $beta = $this->createImageContent($root, $photoalbum->id, 3, 'beta.jpg'); + + $expected_order = [$gamma->id, $beta->id, $alpha->id]; + + $index_response = $this->get("/plugin/photoalbums/changeDirectory/{$page->id}/{$frame->id}/{$root->id}"); + $index_response->assertStatus(200); + $index_ids = $this->extractImageIds($index_response->getContent(), $frame->id); + $this->assertSame(array_slice($expected_order, 0, 2), $index_ids); + + $first_more_response = $this->getJson("/json/photoalbums/moreContents/{$page->id}/{$frame->id}/{$root->id}?target=image&offset=0&limit=99"); + $first_more_response->assertStatus(200) + ->assertJson([ + 'next_offset' => 2, + 'total' => 3, + ]); + $first_more_ids = $this->extractImageIds($first_more_response->json('html'), $frame->id); + $this->assertSame($index_ids, $first_more_ids); + + $second_more_response = $this->getJson("/json/photoalbums/moreContents/{$page->id}/{$frame->id}/{$root->id}?target=image&offset=2&limit=99"); + $second_more_response->assertStatus(200) + ->assertJson([ + 'next_offset' => 3, + 'total' => 3, + ]); + $second_more_ids = $this->extractImageIds($second_more_response->json('html'), $frame->id); + + $this->assertSame($expected_order, array_merge($first_more_ids, $second_more_ids)); + } + + /** + * フォトアルバム用のページ・フレーム・バケツ・ルートを作る。 + * + * @param array $frame_config_values + * @return array + */ + private function makePhotoalbumFrame(array $frame_config_values = []): array + { + $page = Page::where('permanent_link', '/')->first() ?? Page::factory()->create([ + 'permanent_link' => '/', + 'page_name' => 'home', + ]); + + $bucket = Buckets::factory()->create([ + 'bucket_name' => 'テストフォトアルバム', + 'plugin_name' => 'photoalbums', + ]); + + $frame = Frame::factory()->create([ + 'page_id' => $page->id, + 'area_id' => 2, + 'plugin_name' => 'photoalbums', + 'bucket_id' => $bucket->id, + 'template' => 'default', + 'display_sequence' => 1, + ]); + + $photoalbum = Photoalbum::create([ + 'bucket_id' => $bucket->id, + 'name' => 'テストフォトアルバム', + 'image_upload_max_size' => UploadMaxSize::two_mega_byte, + 'image_upload_max_px' => ResizedImageSize::big, + 'video_upload_max_size' => UploadMaxSize::ten_mega_byte, + ]); + + $root = PhotoalbumContent::create([ + 'photoalbum_id' => $photoalbum->id, + 'upload_id' => null, + 'name' => $photoalbum->name, + 'is_folder' => PhotoalbumContent::is_folder_on, + 'is_cover' => PhotoalbumContent::is_cover_off, + 'display_sequence' => 1, + 'parent_id' => null, + ]); + + foreach ($frame_config_values as $name => $value) { + FrameConfig::updateOrCreate( + ['frame_id' => $frame->id, 'name' => $name], + ['value' => (string) $value] + ); + } + + return [$page, $frame, $root, $photoalbum]; + } + + /** + * 画像コンテンツを作成する。 + */ + private function createImageContent(PhotoalbumContent $parent, int $photoalbum_id, int $display_sequence, string $original_name): PhotoalbumContent + { + $upload = Uploads::factory()->jpg()->create([ + 'client_original_name' => $original_name, + 'plugin_name' => 'photoalbums', + ]); + + return $parent->children()->create([ + 'photoalbum_id' => $photoalbum_id, + 'upload_id' => $upload->id, + 'name' => pathinfo($original_name, PATHINFO_FILENAME), + 'is_folder' => PhotoalbumContent::is_folder_off, + 'is_cover' => PhotoalbumContent::is_cover_off, + 'display_sequence' => $display_sequence, + 'mimetype' => $upload->mimetype, + ]); + } + + /** + * レンダリングされた HTML から画像IDを順番に抽出する。 + * + * @param string $html + * @param int $frame_id + * @return array + */ + private function extractImageIds(string $html, int $frame_id): array + { + preg_match_all('/id="photo_' . $frame_id . '_(\d+)"/', $html, $matches); + return array_map('intval', $matches[1] ?? []); + } +}