feat: new workflow for cases where the collection has already started and there are no diffs

Author: andrestejerina97

app/Audit/AuditEventListener.php

@@ -177,7 +177,10 @@ private function auditCollection($subject, $uow, string $eventType): array
         $payload = ['collection' => $subject];
 
         if ($eventType === IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE
-            && !$subject->isInitialized() ) {
+            && (
+                !$subject->isInitialized()
+                || ($subject->isInitialized() && count($subject->getDeleteDiff()) === 0)
+            )) {
             if ($this->em instanceof EntityManagerInterface) {
                 $payload['deleted_ids'] = $this->fetchManyToManyIds($subject, $this->em);
             }

app/Audit/AuditLogOtlpStrategy.php

@@ -189,9 +189,16 @@ private function buildAuditLogData($entity, $subject, array $change_set, string
                     $data['audit.collection_type'] = $this->getCollectionType($collection);
                     if (!empty($change_set['deleted_ids'])) {
                         $data['audit.collection_count'] = count($change_set['deleted_ids']);
-                        $data['audit.collection_current_count'] = 0;
-                        $data['audit.collection_snapshot_count'] = 0;
-                        $data['audit.collection_is_dirty'] = 'true';
+                        if ($collection->isInitialized()) {
+                            $changes = $this->getCollectionChanges($collection, $change_set);
+                            $data['audit.collection_current_count'] = $changes['current_count'];
+                            $data['audit.collection_snapshot_count'] = $changes['snapshot_count'];
+                            $data['audit.collection_is_dirty'] = $changes['is_dirty'] ? 'true' : 'false';
+                        } else {
+                            $data['audit.collection_current_count'] = 0;
+                            $data['audit.collection_snapshot_count'] = 0;
+                            $data['audit.collection_is_dirty'] = 'true';
+                        }
                     } elseif ($collection->isInitialized()) {
                         $data['audit.collection_count'] = count($collection);
                         $changes = $this->getCollectionChanges($collection, $change_set);

tests/OpenTelemetry/Formatters/AuditEventListenerTest.php

@@ -108,4 +108,59 @@ public function testFetchManyToManyIdsExecutesQuery(): void
 
         $this->assertSame([10, 11], $result);
     }
+
+    public function testAuditCollectionDeleteInitializedWithoutDiffUsesJoinTableQuery(): void
+    {
+        $listener = new AuditEventListener();
+        $owner = new \stdClass();
+
+        $mapping = ManyToManyOwningSideMapping::fromMappingArrayAndNamingStrategy([
+            'fieldName' => 'tags',
+            'sourceEntity' => \stdClass::class,
+            'targetEntity' => \stdClass::class,
+            'isOwningSide' => true,
+            'joinTable' => [
+                'name' => 'owner_tags',
+                'joinColumns' => [['name' => 'owner_id', 'referencedColumnName' => 'id']],
+                'inverseJoinColumns' => [['name' => 'tag_id', 'referencedColumnName' => 'id']],
+            ],
+        ], new DefaultNamingStrategy());
+
+        $em = $this->createMock(EntityManagerInterface::class);
+        $meta = new ClassMetadata(\stdClass::class);
+        $collection = new PersistentCollection($em, $meta, new ArrayCollection());
+        $collection->setOwner($owner, $mapping);
+        $collection->takeSnapshot();
+
+        $ownerMeta = $this->getMockBuilder(ClassMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $ownerMeta->method('getIdentifierValues')->with($owner)->willReturn(['id' => 123]);
+
+        $conn = $this->getMockBuilder(Connection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $conn->method('fetchFirstColumn')->willReturn(['10', '11']);
+
+        $em->method('getConnection')->willReturn($conn);
+        $em->method('getClassMetadata')->with(get_class($owner))->willReturn($ownerMeta);
+
+        $emProp = new \ReflectionProperty(AuditEventListener::class, 'em');
+        $emProp->setAccessible(true);
+        $emProp->setValue($listener, $em);
+
+        $method = new \ReflectionMethod(AuditEventListener::class, 'auditCollection');
+        $method->setAccessible(true);
+
+        [$subject, $payload, $eventType] = $method->invoke(
+            $listener,
+            $collection,
+            new \stdClass(),
+            IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE
+        );
+
+        $this->assertSame($owner, $subject);
+        $this->assertSame([10, 11], $payload['deleted_ids']);
+        $this->assertSame(IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE, $eventType);
+    }
 }