fix: remove transport manager address optimistic lock (dvsa/olcs-back…

…end#149) * fix: Allow removal of transport manager address * fix: Test fix * fix: Unit tests
dvsa · Apr 22, 2024 · 27ece8a · 27ece8a
1 parent dfa8c54
commit 27ece8a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/app/api/module/Api/src/Domain/CommandHandler/Traits/DeleteContactDetailsAndAddressTrait.php b/app/api/module/Api/src/Domain/CommandHandler/Traits/DeleteContactDetailsAndAddressTrait.php
@@ -29,7 +29,9 @@ private function maybeDeleteContactDetailsAndAddress($contactDetails)
         $this->injectRepos();
         if ($contactDetails->getAddress() !== null) {
             $addressRepo = $this->getRepo('Address');
-            $addressRepo->delete($contactDetails->getAddress());
+            $address = $contactDetails->getAddress();
+            $addressRepo->refresh($address);
+            $addressRepo->delete($address);
         }
         $this->getRepo('ContactDetails')->delete($contactDetails);
     }

diff --git a/app/api/test/module/Api/src/Domain/CommandHandler/Licence/SaveAddressesTest.php b/app/api/test/module/Api/src/Domain/CommandHandler/Licence/SaveAddressesTest.php
@@ -650,7 +650,12 @@ public function testHandleExistingCorrespondenceUpdateWithNoChangeAndDeletedTran
             )
             ->getMock();
 
-        $this->repoMap['Address']->shouldReceive('delete')->with($transportConsultantAddress);
+        $this->repoMap['Address']->shouldReceive('delete')
+                                 ->once()
+                                 ->with($transportConsultantAddress);
+        $this->repoMap['Address']->shouldReceive('refresh')
+                                 ->once()
+                                 ->with($transportConsultantAddress);
         $result = $this->sut->handleCommand($command);
 
         $expected = [

diff --git a/...t/module/Api/src/Domain/CommandHandler/Traits/DeleteContactDetailsAndAddressTraitTest.php b/...t/module/Api/src/Domain/CommandHandler/Traits/DeleteContactDetailsAndAddressTraitTest.php
@@ -61,7 +61,12 @@ public function testMaybeDeleteContactDetailsAndAddressWithCdNull()
     public function testMaybeDeleteContactDetailsAndAddress()
     {
         $address = m::mock(AddressEntity::class);
-        $this->repoMap['Address']->shouldReceive('delete')->with($address);
+        $this->repoMap['Address']->shouldReceive('delete')
+                                 ->once()
+                                 ->with($address);
+        $this->repoMap['Address']->shouldReceive('refresh')
+                                 ->once()
+                                 ->with($address);
         $contactDetails = m::mock(ContactDetailsEntity::class);
         $contactDetails->shouldReceive('getAddress')->andReturn($address);
         $this->repoMap['ContactDetails']->shouldReceive('delete')->with($contactDetails);

diff --git a/app/api/test/module/Api/src/Domain/CommandHandler/Workshop/DeleteWorkshopTest.php b/app/api/test/module/Api/src/Domain/CommandHandler/Workshop/DeleteWorkshopTest.php
@@ -58,7 +58,12 @@ public function testHandleCommand()
         $workshopEntity1->shouldReceive('getContactDetails')->andReturn($contactDetails1);
         $workshopEntity2 = m::mock(WorkshopEntity::class);
         $workshopEntity2->shouldReceive('getContactDetails')->andReturn(null);
-        $this->repoMap['Address']->shouldReceive('delete')->with($address1);
+        $this->repoMap['Address']->shouldReceive('delete')
+                                 ->once()
+                                 ->with($address1);
+        $this->repoMap['Address']->shouldReceive('refresh')
+                                 ->once()
+                                 ->with($address1);
         $this->repoMap['ContactDetails']->shouldReceive('delete')->with($contactDetails1);
 
         $this->repoMap['Workshop']->shouldReceive('fetchById')