delete bound storage

st-universe · Dec 9, 2023 · c60bec3 · c60bec3
1 parent 9adfc9d
commit c60bec3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/Module/Ship/Lib/Interaction/ShipTakeoverManager.php b/src/Module/Ship/Lib/Interaction/ShipTakeoverManager.php
@@ -320,9 +320,15 @@ private function changeShipOwner(ShipInterface $ship, UserInterface $user): void
         $this->shipRepository->save($ship);
 
         // change storage owner
-        foreach ($ship->getStorage() as $storage) {
-            $storage->setUser($user);
-            $this->storageRepository->save($storage);
+        foreach ($ship->getStorage() as $storage) { #
+
+            if ($storage->getCommodity()->isBoundToAccount()) {
+                $ship->getStorage()->removeElement($storage);
+                $this->storageRepository->delete($storage);
+            } else {
+                $storage->setUser($user);
+                $this->storageRepository->save($storage);
+            }
         }
     }
 

diff --git a/tests/Module/Ship/Lib/Interaction/ShipTakeoverManagerTest.php b/tests/Module/Ship/Lib/Interaction/ShipTakeoverManagerTest.php
@@ -563,6 +563,7 @@ public function testFinishTakeover(): void
         $user = $this->mock(UserInterface::class);
         $targetUser = $this->mock(UserInterface::class);
         $storage = $this->mock(StorageInterface::class);
+        $boundStorage = $this->mock(StorageInterface::class);
 
         $takeover->shouldReceive('getSourceShip')
             ->withNoArgs()
@@ -604,7 +605,7 @@ public function testFinishTakeover(): void
             ->andReturn($targetUser);
         $this->target->shouldReceive('getStorage')
             ->withNoArgs()
-            ->andReturn(new ArrayCollection([$storage]));
+            ->andReturn(new ArrayCollection([$storage, $boundStorage]));
         $this->target->shouldReceive('setUser')
             ->with($user)
             ->once();
@@ -628,6 +629,14 @@ public function testFinishTakeover(): void
         $storage->shouldReceive('setUser')
             ->with($user)
             ->once();
+        $storage->shouldReceive('getCommodity->isBoundToAccount')
+            ->withNoArgs()
+            ->once()
+            ->andReturnFalse();
+        $boundStorage->shouldReceive('getCommodity->isBoundToAccount')
+            ->withNoArgs()
+            ->once()
+            ->andReturnTrue();
 
         $this->shipTakeoverRepository->shouldReceive('delete')
             ->with($takeover)
@@ -643,6 +652,9 @@ public function testFinishTakeover(): void
         $this->storageRepository->shouldReceive('save')
             ->with($storage)
             ->once();
+        $this->storageRepository->shouldReceive('delete')
+            ->with($boundStorage)
+            ->once();
 
         $this->privateMessageSender->shouldReceive('send')
             ->with(