progress

Author: ildyria

app/Actions/Album/Merge.php

@@ -8,12 +8,14 @@
 
 namespace App\Actions\Album;
 
+use App\Constants\PhotoAlbum as PA;
 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;
 
 class Merge
 {
@@ -27,10 +29,28 @@ class Merge
 	 */
 	public function do(Album $target_album, Collection $albums): void
 	{
-		// Merge photos of source albums into target
-		Photo::query()
-			->whereIn('album_id', $albums->pluck('id'))
-			->update(['album_id' => $target_album->id]);
+		$origin_ids = $albums->pluck('id')->all();
+
+		// Select all photos ids of the source albums
+		$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)
+			->where(PA::ALBUM_ID, '=', $target_album->id)
+			->delete();
+
+		// Insert the new links
+		DB::table(PA::PHOTO_ALBUM)
+			->insert(array_map(fn (string $id) => ['photo_id' => $id, 'album_id' => $target_album->id], $photos_ids));
+
+		// Delete the existing links from the origins
+		DB::table(PA::PHOTO_ALBUM)
+			->whereIn(PA::PHOTO_ID, $photos_ids)
+			->whereIn(PA::ALBUM_ID, $origin_ids)
+			->delete();
 
 		// Merge sub-albums of source albums into target
 		/** @var Album $album */

app/Actions/Photo/Delete.php

@@ -161,7 +161,7 @@ private function collectSizeVariantPathsByAlbumID(array $album_ids): void
 			$size_variants = SizeVariant::query()
 				->from('size_variants as sv')
 				->select(['sv.short_path', 'sv.storage_disk'])
-				->leftJoin(PA::PHOTO_ALBUM, PA::PHOTO_ID, '=', 'p.id')
+				->leftJoin(PA::PHOTO_ALBUM, PA::PHOTO_ID, '=', 'sv.photo_id')
 				->join('photos as p', 'p.id', '=', 'sv.photo_id')
 				->joinSub(DB::table('photos')->leftJoin(PA::PHOTO_ALBUM, 'photos.id', '=', PA::PHOTO_ID)->select('id', 'checksum', 'album_id'), 'dup',
 					function (JoinClause $join) use ($album_ids): void {

app/Actions/Photo/Duplicate.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Actions\Photo;
+
+use App\Actions\User\Notify;
+use App\Constants\PhotoAlbum as PA;
+use App\Models\Album;
+use App\Models\Photo;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+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 Album                 $from_album the origin album; `null` means root album
+	 * @param Album                 $to_album the destination album; `null` means root album
+	 *
+	 * @return void
+	 */
+	public function do(Collection $photos, ?Album $from_album, ?Album $to_album): void
+	{
+		// Extract the photos Ids.
+		$photos_ids = $photos->pluck('id')->all();
+
+		if ($from_album !== null) {
+			// Delete the existing links.
+			DB::table(PA::PHOTO_ALBUM)
+				->whereIn(PA::PHOTO_ID, $photos_ids)
+				->whereIn(PA::ALBUM_ID, $from_album->id)
+				->delete();
+		}
+
+		if ($to_album !== null) {
+			// Delete the existing links at destination (avoid duplicates key contraint)
+			// If $from === to this operation is not needed.
+			DB::table(PA::PHOTO_ALBUM)->whereIn(PA::PHOTO_ID, $photos_ids)->where(PA::ALBUM_ID, '=', $to_album->id)->delete();
+
+			// 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()
+				->where('id', '=', $from_album->id)
+				->whereIn('header_id', $photos->map(fn (Photo $p) => $p->id))->update(['header_id' => null]);
+		}
+
+		$notify = new Notify();
+		/** @var Photo $photo */
+		foreach ($photos as $photo) {
+			$notify->do($photo);
+		}
+	}
+}

app/Actions/Photo/Move.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Contracts\Http\Requests;
+
+use App\Models\Album;
+
+interface HasFromAlbum extends HasBaseAlbum
+{
+	/**
+	 * @return Album|null
+	 */
+	public function from_album(): ?Album;
+}

app/Actions/Photo/MoveOrDuplicate.php

@@ -22,6 +22,7 @@ class RequestAttribute
 
 	public const PARENT_ID_ATTRIBUTE = 'parent_id';
 
+	public const FROM_ID_ATTRIBUTE = 'from_id';
 	public const ALBUM_ID_ATTRIBUTE = 'album_id';
 	public const ALBUM_IDS_ATTRIBUTE = 'album_ids';
 	public const ALBUM_DECORATION_ATTRIBUTE = 'album_decoration';

app/Contracts/Http/Requests/HasFromAlbum.php

@@ -12,6 +12,7 @@
 use App\Actions\Photo\Delete;
 use App\Actions\Photo\Duplicate;
 use App\Actions\Photo\Move;
+use App\Actions\Photo\MoveOrDuplicate;
 use App\Actions\Photo\Rotate;
 use App\Constants\FileSystem;
 use App\Contracts\Models\AbstractAlbum;
@@ -148,9 +149,13 @@ public function star(SetPhotosStarredRequest $request): void
 	/**
 	 * Moves the photos to an album.
 	 */
-	public function move(MovePhotosRequest $request, Move $move): void
+	public function move(MovePhotosRequest $request, MoveOrDuplicate $move): void
 	{
-		$move->do($request->photos(), $request->album());
+		$move->do(
+			photos: $request->photos(),
+			from_album: $request->from_album(), 
+			to_album: $request->album()
+		);
 	}
 
 	/**
@@ -181,9 +186,9 @@ public function rotate(RotatePhotoRequest $request): PhotoResource
 	 * Copy a photos to an album.
 	 * Only the SQL entry is duplicated for space reason.
 	 */
-	public function copy(CopyPhotosRequest $request, Duplicate $duplicate): void
+	public function copy(CopyPhotosRequest $request, MoveOrDuplicate $duplicate): void
 	{
-		$duplicate->do($request->photos(), $request->album());
+		$duplicate->do($request->photos(), $request->album(), $request->album());
 	}
 
 	/**

app/Contracts/Http/Requests/RequestAttribute.php

@@ -9,22 +9,53 @@
 namespace App\Http\Requests\Photo;
 
 use App\Contracts\Http\Requests\HasAlbum;
+use App\Contracts\Http\Requests\HasFromAlbum;
 use App\Contracts\Http\Requests\HasPhotos;
 use App\Contracts\Http\Requests\RequestAttribute;
+use App\Contracts\Models\AbstractAlbum;
 use App\Http\Requests\BaseApiRequest;
 use App\Http\Requests\Traits\Authorize\AuthorizeCanEditPhotosAlbumTrait;
 use App\Http\Requests\Traits\HasAlbumTrait;
+use App\Http\Requests\Traits\HasFromAlbumTrait;
 use App\Http\Requests\Traits\HasPhotosTrait;
 use App\Models\Album;
 use App\Models\Photo;
+use App\Policies\AlbumPolicy;
+use App\Policies\PhotoPolicy;
 use App\Rules\RandomIDRule;
+use Illuminate\Support\Facades\Gate;
 
-class MovePhotosRequest extends BaseApiRequest implements HasPhotos, HasAlbum
+class MovePhotosRequest extends BaseApiRequest implements HasPhotos, HasAlbum, HasFromAlbum
 {
 	use HasPhotosTrait;
 	use HasAlbumTrait;
+	use HasFromAlbumTrait;
 	use AuthorizeCanEditPhotosAlbumTrait;
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function authorize(): bool
+	{
+		if (!Gate::check(AlbumPolicy::CAN_EDIT, [AbstractAlbum::class, $this->album])) {
+			return false;
+		}
+
+		if (!Gate::check(AlbumPolicy::CAN_EDIT, [AbstractAlbum::class, $this->from_album])) {
+			return false;
+		}
+
+		// TODO: refactor this check so it does not explode.
+		/** @var Photo $photo */
+		foreach ($this->photos as $photo) {
+			if (!Gate::check(PhotoPolicy::CAN_EDIT, $photo)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -34,6 +65,7 @@ public function rules(): array
 			RequestAttribute::PHOTO_IDS_ATTRIBUTE => 'required|array|min:1',
 			RequestAttribute::PHOTO_IDS_ATTRIBUTE . '.*' => ['required', new RandomIDRule(false)],
 			RequestAttribute::ALBUM_ID_ATTRIBUTE => ['present', new RandomIDRule(true)],
+			RequestAttribute::FROM_ID_ATTRIBUTE => ['present', new RandomIDRule(true)],
 		];
 	}
 
@@ -46,8 +78,13 @@ protected function processValidatedValues(array $values, array $files): void
 		$photos_ids = $values[RequestAttribute::PHOTO_IDS_ATTRIBUTE];
 		$this->photos = Photo::query()
 			->findOrFail($photos_ids);
+
 		/** @var string|null */
 		$target_album_id = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
 		$this->album = $target_album_id === null ? null : Album::query()->findOrFail($target_album_id);
+
+		/** @var string|null */
+		$from_album_id = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+		$this->from_album = $from_album_id === null ? null : Album::query()->findOrFail($from_album_id);
 	}
 }

app/Http/Controllers/Gallery/PhotoController.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Http\Requests\Traits;
+
+use App\Models\Album;
+
+trait HasFromAlbumTrait
+{
+	protected ?Album $from_album = null;
+
+	/**
+	 * @return Album|null
+	 */
+	public function from_album(): ?Album
+	{
+		return $this->from_album;
+	}
+}