Merge pull request #197 from aroskanalen/feature/970-playlist-slide-weight

Fixed playlist slide weight

Author: tuj

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#197](https://github.com/os2display/display-api-service/pull/197)
+  - Fixed weight issue when assigning slides to playlist.
 - [#194](https://github.com/os2display/display-api-service/pull/194)
   Updated test run documentation and added test for `rrule` in playlist.
 - Fixed issue with PlaylistSlide transaction.

src/Repository/PlaylistSlideRepository.php

@@ -98,27 +98,24 @@ public function updatePlaylistSlideRelations(Ulid $playlistUlid, ArrayCollection
                 $this->entityManager->remove($entity);
             }
 
-            foreach ($slideIdsToAdd as $slideIdToAdd) {
-                $slide = $slideRepos->findOneBy(['id' => $slideIdToAdd, 'tenant' => $tenant]);
+            foreach ($collection->toArray() as $slideToAdd) {
+                $slide = $slideRepos->findOneBy(['id' => $slideToAdd->slide, 'tenant' => $tenant]);
 
                 if (is_null($slide)) {
                     throw new InvalidArgumentException('Slide not found');
                 }
 
-                $playlistSlideRelations = $this->findOneBy(['slide' => $slide, 'playlist' => $playlist]);
+                $playlistSlideRelation = $this->findOneBy(['slide' => $slide, 'playlist' => $playlist]);
 
-                if (is_null($playlistSlideRelations)) {
-                    $ulid = $this->validationUtils->validateUlid($slide->getId());
-                    $weight = $this->getWeight($ulid);
-
-                    // Create new relation.
-                    $ps = new PlaylistSlide();
-                    $ps->setPlaylist($playlist)
-                        ->setSlide($slide)
-                        ->setWeight($weight);
+                if (is_null($playlistSlideRelation)) {
+                    $playlistSlideRelation = new PlaylistSlide();
+                    $playlistSlideRelation->setPlaylist($playlist)
+                        ->setSlide($slide);
 
-                    $this->entityManager->persist($ps);
+                    $this->entityManager->persist($playlistSlideRelation);
                 }
+
+                $playlistSlideRelation->setWeight($slideToAdd->weight);
             }
             $this->entityManager->flush();
 
@@ -162,26 +159,26 @@ public function updateSlidePlaylistRelations(Ulid $slideUlid, ArrayCollection $c
                 $this->entityManager->remove($entity);
             }
 
-            foreach ($playlistIdsToAdd as $playlistIdToAdd) {
-                $playlist = $playlistRepos->findOneBy(['id' => $playlistIdToAdd, 'tenant' => $tenant]);
+            foreach ($playlistIdsToAdd as $playlistId) {
+                $playlist = $playlistRepos->findOneBy(['id' => $playlistId, 'tenant' => $tenant]);
 
                 if (is_null($playlist)) {
                     throw new InvalidArgumentException('Playlist not found');
                 }
 
-                $playlistSlideRelations = $this->findOneBy(['slide' => $slide, 'playlist' => $playlist]);
+                $playlistSlideRelation = $this->findOneBy(['slide' => $slide, 'playlist' => $playlist]);
 
-                if (is_null($playlistSlideRelations)) {
+                if (is_null($playlistSlideRelation)) {
                     $ulid = $this->validationUtils->validateUlid($playlist->getId());
                     $weight = $this->getWeight($ulid);
 
                     // Create new relation.
-                    $ps = new PlaylistSlide();
-                    $ps->setPlaylist($playlist)
+                    $playlistSlideRelation = new PlaylistSlide();
+                    $playlistSlideRelation->setPlaylist($playlist)
                     ->setSlide($slide)
                     ->setWeight($weight);
 
-                    $this->entityManager->persist($ps);
+                    $this->entityManager->persist($playlistSlideRelation);
                 }
             }
             $this->entityManager->flush();