more progress

Author: ildyria

app/Actions/Album/Merge.php

@@ -12,7 +12,6 @@
 use App\Exceptions\Internal\QueryBuilderException;
 use App\Exceptions\ModelDBException;
 use App\Models\Album;
-use App\Models\Photo;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -35,7 +34,7 @@ public function do(Album $target_album, Collection $albums): void
 		$photos_ids = DB::table(PA::PHOTO_ALBUM)
 			->whereIn(PA::ALBUM_ID, $origin_ids)
 			->pluck(PA::PHOTO_ID)->all();
-		
+
 		// Delete the existing links at destination (avoid duplicates key contraint)
 		DB::table(PA::PHOTO_ALBUM)
 			->whereIn(PA::PHOTO_ID, $photos_ids)

app/Actions/Album/PositionData.php

@@ -25,7 +25,7 @@ public function get(AbstractAlbum $album, bool $include_sub_albums = false): Pos
 
 		$photo_relation
 			->with([
-				'album' => function (BelongsTo $b): void {
+				'albums' => function (BelongsTo $b): void {
 					// The album is required for photos to properly
 					// determine access and visibility rights; but we
 					// don't need to determine the cover and thumbnail for

app/Actions/Albums/PositionData.php

@@ -39,7 +39,7 @@ public function do(): PositionDataResource
 			query: Photo::query()
 				->with([
 					// TODO: FIX ME.
-					'album' => function ($b): void {
+					'albums' => function ($b): void {
 						// The album is required for photos to properly
 						// determine access and visibility rights; but we
 						// don't need to determine the cover and thumbnail for

app/Actions/Metrics/GetMetrics.php

@@ -21,7 +21,7 @@ public function get(): Collection
 		/** @var User $user */
 		$user = Auth::user() ?? throw new UnauthorizedException();
 
-		return LiveMetrics::query()->with(['photo', 'photo.size_variants', 'album', 'album_impl', 'album.thumb'])
+		return LiveMetrics::query()->with(['photo', 'photo.size_variants', 'albums', 'album_impl', 'album.thumb'])
 			->join('photos', 'photos.id', '=', 'live_metrics.photo_id', 'left')
 			->join('base_albums', 'base_albums.id', '=', 'live_metrics.album_id', 'left')
 			->join('albums', 'albums.id', '=', 'live_metrics.album_id', 'left')

app/Actions/Photo/Create.php

@@ -141,8 +141,9 @@ private function handleDuplicate(InitDTO $init_dto): Photo
 		$pipes[] = Duplicate\ThrowSkipDuplicate::class;
 		$pipes[] = Duplicate\ReplicateAsPhoto::class;
 		$pipes[] = Shared\SetStarred::class;
-		$pipes[] = Shared\SetParentAndOwnership::class;
+		$pipes[] = Shared\SetOwnership::class;
 		$pipes[] = Shared\Save::class;
+		$pipes[] = Shared\SetParent::class;
 		$pipes[] = Shared\SaveStatistics::class;
 		$pipes[] = Shared\NotifyAlbums::class;
 
@@ -167,14 +168,15 @@ private function handleStandalone(InitDTO $init_dto): Photo
 			Standalone\InitNamingStrategy::class,
 			Shared\HydrateMetadata::class,
 			Shared\SetStarred::class,
-			Shared\SetParentAndOwnership::class,
+			Shared\SetOwnership::class,
 			Standalone\SetOriginalChecksum::class,
 			Standalone\FetchSourceImage::class,
 			Standalone\ExtractGoogleMotionPictures::class,
 			Standalone\PlacePhoto::class,
 			Standalone\PlaceGoogleMotionVideo::class,
 			Standalone\SetChecksum::class,
 			Shared\Save::class,
+			Shared\SetParent::class,
 			Shared\SaveStatistics::class,
 			Standalone\CreateOriginalSizeVariant::class,
 			Standalone\CreateSizeVariants::class,
@@ -257,14 +259,15 @@ private function handlePhotoLivePartner(InitDTO $init_dto): Photo
 			Standalone\InitNamingStrategy::class,
 			Shared\HydrateMetadata::class,
 			Shared\SetStarred::class,
-			Shared\SetParentAndOwnership::class,
+			Shared\SetOwnership::class,
 			Standalone\SetOriginalChecksum::class,
 			Standalone\FetchSourceImage::class,
 			Standalone\ExtractGoogleMotionPictures::class,
 			Standalone\PlacePhoto::class,
 			Standalone\PlaceGoogleMotionVideo::class,
 			Standalone\SetChecksum::class,
 			Shared\Save::class,
+			Shared\SetParent::class,
 			Standalone\CreateOriginalSizeVariant::class,
 			Standalone\CreateSizeVariants::class,
 			Standalone\EncodePlaceholder::class,

app/Actions/Photo/MoveOrDuplicate.php

@@ -19,13 +19,13 @@ class MoveOrDuplicate
 {
 	/**
 	 * Move or Duplicates a set of photos.
-	 * 
+	 *
 	 * If $from_album = $to_album, this is a duplication.
 	 * If $from_album != $to_album, this is a move.
 	 *
-	 * @param Collection<int,Photo> $photos the source photos
+	 * @param Collection<int,Photo> $photos     the source photos
 	 * @param Album                 $from_album the origin album; `null` means root album
-	 * @param Album                 $to_album the destination album; `null` means root album
+	 * @param Album                 $to_album   the destination album; `null` means root album
 	 *
 	 * @return void
 	 */
@@ -50,7 +50,7 @@ public function do(Collection $photos, ?Album $from_album, ?Album $to_album): vo
 			// Add the new links.
 			DB::table(PA::PHOTO_ALBUM)->insert(array_map(fn (string $id) => ['photo_id' => $id, 'album_id' => $to_album->id], $photos_ids));
 		}
- 
+
 		// In case of move, we need to remove the header_id of said photos.
 		if ($from_album !== null && $from_album->id !== $to_album?->id) {
 			Album::query()

app/Actions/Photo/Pipes/Shared/SetOwnership.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Actions\Photo\Pipes\Shared;
+
+use App\Contracts\PhotoCreate\SharedPipe;
+use App\DTO\PhotoCreate\DuplicateDTO;
+use App\DTO\PhotoCreate\StandaloneDTO;
+use App\Models\Album;
+
+class SetOwnership implements SharedPipe
+{
+	public function handle(DuplicateDTO|StandaloneDTO $state, \Closure $next): DuplicateDTO|StandaloneDTO
+	{
+		$state->photo->owner_id = $state->album instanceof Album ? $state->album->owner_id : $state->intended_owner_id;
+
+		return $next($state);
+	}
+}

app/Actions/Photo/Pipes/Shared/SetParent.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Actions\Photo\Pipes\Shared;
+
+use App\Constants\PhotoAlbum as PA;
+use App\Contracts\PhotoCreate\SharedPipe;
+use App\DTO\PhotoCreate\DuplicateDTO;
+use App\DTO\PhotoCreate\StandaloneDTO;
+use App\Exceptions\Internal\LycheeLogicException;
+use App\Models\Album;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * This MUST be called after a first save() otherwise we do not have a photo id.
+ */
+class SetParent implements SharedPipe
+{
+	public function handle(DuplicateDTO|StandaloneDTO $state, \Closure $next): DuplicateDTO|StandaloneDTO
+	{
+		if ($state->album instanceof Album) {
+			if ($state->photo->id === null) {
+				throw new LycheeLogicException('Photo Id is null, cannot set a parent album.');
+			}
+
+			// Avoid duplicates key constraint
+			DB::table(PA::PHOTO_ALBUM)
+				->where(PA::PHOTO_ID, '=', $state->photo->id)
+				->where(PA::ALBUM_ID, '=', $state->album->id)
+				->delete();
+
+			// Insert the new link
+			DB::table(PA::PHOTO_ALBUM)
+				->insert([
+					'photo_id' => $state->photo->id,
+					'album_id' => $state->album->id,
+				]);
+
+			// Avoid unnecessary DB request, when we access the album of a
+			// photo later (e.g. when a notification is sent).
+			$state->photo->load('albums');
+		}
+
+		return $next($state);
+	}
+}

app/Actions/Photo/Pipes/Shared/SetParentAndOwnership.php

@@ -77,7 +77,7 @@ public function do(): Collection
 		/** @var Collection<int,Photo> $photos */
 		$photos = $this->photo_query_policy
 			->applySearchabilityFilter(
-				query: Photo::query()->with(['album', 'owner', 'size_variants']),
+				query: Photo::query()->with(['albums', 'owner', 'size_variants']),
 				origin: null,
 				include_nsfw: !Configs::getValueAsBool('hide_nsfw_in_rss')
 			)