Merge pull request mautic#14928 from biozshock/edit-entity-twice-5.x

 Properly process repeating edit requests to the same data.

Author: escopecz

app/bundles/ApiBundle/Controller/CommonApiController.php

@@ -410,7 +410,18 @@ protected function processBatchForm(Request $request, $key, $entity, $params, $m
             $errors[$key] = $formResponse;
         }
 
-        $this->doctrine->getManager()->detach($entity);
+        $lastEntityIndex = -1;
+        foreach ($entities as $index => $moreEntities) {
+            if ($moreEntities !== $entity) {
+                continue;
+            }
+
+            $lastEntityIndex = $index;
+        }
+
+        if (-1 === $lastEntityIndex || $lastEntityIndex === $key) {
+            $this->doctrine->getManager()->detach($entity);
+        }
 
         $this->inBatchMode = false;
     }

app/bundles/LeadBundle/Tests/Controller/Api/LeadApiControllerFunctionalTest.php

@@ -842,6 +842,47 @@ public function testBatchDncAddAndRemove(): void
         $this->assertSame(Response::HTTP_OK, $clientResponse->getStatusCode());
     }
 
+    public function testBatchEditEndpointSameContact(): void
+    {
+        $contact1 = new Lead();
+        $contact1->setEmail('batcheditcontact1@gmail.com');
+        $this->em->persist($contact1);
+
+        $contact2 = new Lead();
+        $contact2->setEmail('batcheditcontact2@gmail.com');
+        $this->em->persist($contact2);
+
+        $this->em->flush();
+        $this->em->clear();
+
+        $payload = [
+            ['points' => 1, 'id' => $contact1->getId()],
+            ['points' => 1, 'id' => $contact2->getId()],
+            ['points' => 2, 'id' => $contact1->getId()],
+        ];
+
+        $this->client->request(Request::METHOD_PATCH, '/api/contacts/batch/edit', $payload);
+        $clientResponse = $this->client->getResponse();
+
+        self::assertResponseIsSuccessful($clientResponse->getContent());
+
+        $response = json_decode($clientResponse->getContent(), true);
+
+        self::assertCount(3, $response['contacts']);
+
+        $this->assertEquals(Response::HTTP_OK, $response['statusCodes'][0]);
+        $this->assertSame($contact1->getId(), $response['contacts'][0]['id']);
+        $this->assertSame(2, $response['contacts'][0]['points']);
+
+        $this->assertEquals(Response::HTTP_OK, $response['statusCodes'][1]);
+        $this->assertSame($contact2->getId(), $response['contacts'][1]['id']);
+        $this->assertSame(1, $response['contacts'][1]['points']);
+
+        $this->assertEquals(Response::HTTP_OK, $response['statusCodes'][2]);
+        $this->assertSame($contact1->getId(), $response['contacts'][2]['id']);
+        $this->assertSame(2, $response['contacts'][2]['points']);
+    }
+
     public function testAddAndRemoveDncToExistingContact(): void
     {
         // Create contact