add tags to hydrated data

Author: ildyria

app/Actions/Albums/Flow.php

@@ -110,7 +110,7 @@ private function getQuery(Album|null $base, bool $with_relations): AlbumBuilder
 
 		$base_query = Album::query();
 		if ($with_relations) {
-			$base_query->with(['cover', 'cover.size_variants', 'statistics', 'photos', 'photos.statistics', 'photos.size_variants', 'photos.palette']);
+			$base_query->with(['cover', 'cover.size_variants', 'statistics', 'photos', 'photos.statistics', 'photos.size_variants', 'photos.palette', 'photos.tags']);
 		}
 
 		// Only join what we need for ordering.

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

@@ -11,6 +11,7 @@
 use App\Contracts\PhotoCreate\SharedPipe;
 use App\DTO\PhotoCreate\DuplicateDTO;
 use App\DTO\PhotoCreate\StandaloneDTO;
+use App\Models\Tag;
 
 /**
  * Hydrates meta-info of the media file from the
@@ -38,8 +39,7 @@ public function handle(DuplicateDTO|StandaloneDTO $state, \Closure $next): Dupli
 			$state->photo->description = $state->exif_info->description;
 		}
 		if (count($state->photo->tags) === 0) {
-			// TODO FIX ME.
-			// $state->photo->tags = $state->exif_info->tags;
+			$state->tags = Tag::from($state->exif_info->tags);
 		}
 		if ($state->photo->type === null) {
 			$state->photo->type = $state->exif_info->type;

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

@@ -19,6 +19,7 @@ class Save implements PhotoPipe
 	public function handle(PhotoDTO $state, \Closure $next): PhotoDTO
 	{
 		$state->getPhoto()->save();
+		$state->getPhoto()->tags()->sync($state->getTags()->pluck('id')->all());
 
 		return $next($state);
 	}

app/Contracts/PhotoCreate/PhotoDTO.php

@@ -9,8 +9,15 @@
 namespace App\Contracts\PhotoCreate;
 
 use App\Models\Photo;
+use App\Models\Tag;
+use Illuminate\Support\Collection;
 
 interface PhotoDTO
 {
 	public function getPhoto(): Photo;
+
+	/**
+	 * @return Collection<int,Tag>
+	 */
+	public function getTags(): Collection;
 }

app/DTO/PhotoCreate/DuplicateDTO.php

@@ -12,6 +12,7 @@
 use App\Contracts\PhotoCreate\PhotoDTO;
 use App\Metadata\Extractor;
 use App\Models\Photo;
+use Illuminate\Support\Collection;
 
 /**
  * DTO used when dealing with duplicates.
@@ -21,6 +22,8 @@ class DuplicateDTO implements PhotoDTO
 {
 	public bool $has_been_resynced;
 
+	public Collection $tags;
+
 	public function __construct(
 		public readonly bool $shall_resync_metadata,
 		public readonly bool $shall_skip_duplicates,
@@ -39,6 +42,7 @@ public function __construct(
 		// During initial steps if duplicate is found, it will be placed here.
 		public Photo $photo,
 	) {
+		$this->tags = $this->photo->tags;
 	}
 
 	public static function ofInit(InitDTO $init_dto): DuplicateDTO
@@ -59,6 +63,11 @@ public function getPhoto(): Photo
 		return $this->photo;
 	}
 
+	public function getTags(): Collection
+	{
+		return $this->tags;
+	}
+
 	public function setHasBeenResync(bool $val): void
 	{
 		$this->has_been_resynced = $val;

app/DTO/PhotoCreate/PhotoPartnerDTO.php

@@ -11,6 +11,7 @@
 use App\Contracts\Image\StreamStats;
 use App\Contracts\PhotoCreate\PhotoDTO;
 use App\Models\Photo;
+use Illuminate\Support\Collection;
 
 class PhotoPartnerDTO implements PhotoDTO
 {
@@ -27,4 +28,9 @@ public function getPhoto(): Photo
 	{
 		return $this->photo;
 	}
+
+	public function getTags(): Collection
+	{
+		return $this->photo->tags;
+	}
 }

app/DTO/PhotoCreate/StandaloneDTO.php

@@ -18,6 +18,7 @@
 use App\Image\Files\TemporaryLocalFile;
 use App\Metadata\Extractor;
 use App\Models\Photo;
+use Illuminate\Support\Collection;
 
 class StandaloneDTO implements PhotoDTO
 {
@@ -27,6 +28,7 @@ class StandaloneDTO implements PhotoDTO
 	public FlysystemFile $target_file;
 	public StreamStats|null $stream_stat;
 	public FlysystemFile|null $backup_file = null;
+	public Collection $tags;
 
 	public function __construct(
 		// The resulting photo
@@ -44,6 +46,7 @@ public function __construct(
 		public readonly bool $shall_import_via_symlink,
 		public readonly bool $shall_delete_imported,
 	) {
+		$this->tags = new Collection();
 	}
 
 	public static function ofInit(InitDTO $init_dto): StandaloneDTO
@@ -64,4 +67,9 @@ public function getPhoto(): Photo
 	{
 		return $this->photo;
 	}
+
+	public function getTags(): Collection
+	{
+		return $this->tags;
+	}
 }

app/DTO/PhotoCreate/VideoPartnerDTO.php

@@ -12,6 +12,7 @@
 use App\Contracts\PhotoCreate\PhotoDTO;
 use App\Image\Files\BaseMediaFile;
 use App\Models\Photo;
+use Illuminate\Support\Collection;
 
 class VideoPartnerDTO implements PhotoDTO
 {
@@ -32,6 +33,11 @@ public function getPhoto(): Photo
 		return $this->photo;
 	}
 
+	public function getTags(): Collection
+	{
+		return $this->photo->tags;
+	}
+
 	public static function ofInit(InitDTO $init_dto): VideoPartnerDTO
 	{
 		return new VideoPartnerDTO(

app/Image/Handlers/GoogleMotionPictureHandler.php

@@ -51,7 +51,9 @@ class GoogleMotionPictureHandler extends VideoHandler
 	 */
 	public function __destruct()
 	{
-		$this->working_copy->delete();
+		if (isset($this->working_copy)) {
+			$this->working_copy->delete();
+		}
 	}
 
 	/**