fix: new test and remove unused parameters

Author: andrestejerina97

app/Audit/AbstractAuditLogFormatter.php

@@ -4,7 +4,6 @@
 
 use App\Audit\Utils\DateFormatter;
 use Doctrine\ORM\PersistentCollection;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Copyright 2025 OpenStack Foundation
@@ -194,36 +193,6 @@ protected function formatFieldChange(string $prop_name, $old_value, $new_value):
         return sprintf("Property \"%s\" has changed from \"%s\" to \"%s\"", $prop_name, $old_display, $new_display);
     }
 
-    /**
-     * Build detailed message for many-to-many collection changes
-     */
-    protected function buildManyToManyDetailedMessage(PersistentCollection $collection, array $insertDiff, array $deleteDiff): array
-    {
-        $fieldName = 'unknown';
-        $targetEntity = 'unknown';
-        
-        try {
-            $mapping = $collection->getMapping();
-            $fieldName = $mapping->fieldName ?? 'unknown';
-            $targetEntity = $mapping->targetEntity ?? 'unknown';
-            if ($targetEntity) {
-                $targetEntity = class_basename($targetEntity);
-            }
-        } catch (\Exception $e) {
-            Log::debug("AbstractAuditLogFormatter::Could not extract collection metadata: " . $e->getMessage());
-        }
-
-        $addedIds = $this->extractCollectionEntityIds($insertDiff);
-        $removedIds = $this->extractCollectionEntityIds($deleteDiff);
-
-        return [
-            'field' => $fieldName,
-            'target_entity' => $targetEntity,
-            'added_ids' => $addedIds,
-            'removed_ids' => $removedIds,
-        ];
-    }
-
     /**
      * Format detailed message for many-to-many collection changes
      */

app/Audit/AuditEventListener.php

@@ -56,15 +56,15 @@ public function onFlush(OnFlushEventArgs $eventArgs): void
                 $strategy->audit($entity, [], IAuditStrategy::EVENT_ENTITY_DELETION, $ctx);
             }   
             foreach ($uow->getScheduledCollectionDeletions() as $col) {
-                [$subject, $payload, $eventType] = $this->auditCollection($col, $uow, IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE);
+                [$subject, $payload, $eventType] = $this->auditCollection($col, IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE);
 
                 if (!is_null($subject)) {
                     $strategy->audit($subject, $payload, $eventType, $ctx);
                 }
             }
 
             foreach ($uow->getScheduledCollectionUpdates() as $col) {
-                [$subject, $payload, $eventType] = $this->auditCollection($col, $uow, IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_UPDATE);
+                [$subject, $payload, $eventType] = $this->auditCollection($col, IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_UPDATE);
 
                 if (!is_null($subject)) {
                     $strategy->audit($subject, $payload, $eventType, $ctx);
@@ -148,11 +148,10 @@ private function buildAuditContext(): AuditContext
      * Subject will be null if collection should not be audited
      * 
      * @param object $subject The collection
-     * @param mixed $uow The UnitOfWork
      * @param string $eventType The event type constant (EVENT_COLLECTION_MANYTOMANY_DELETE or EVENT_COLLECTION_MANYTOMANY_UPDATE)
      * @return array [$subject, $payload, $eventType]
      */
-    private function auditCollection($subject, $uow, string $eventType): array
+    private function auditCollection($subject, string $eventType): array
     {
         if (!$subject instanceof PersistentCollection) {
             return [null, null, null];

tests/OpenTelemetry/Formatters/AuditEventListenerTest.php

@@ -53,7 +53,6 @@ public function testAuditCollectionNonManyToManyReturnsCollectionAsSubject(): vo
         [$subject, $payload, $eventType] = $method->invoke(
             $listener,
             $collection,
-            new \stdClass(),
             IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_UPDATE
         );
 
@@ -155,7 +154,62 @@ public function testAuditCollectionDeleteInitializedWithoutDiffUsesJoinTableQuer
         [$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);
+    }
+
+    public function testAuditCollectionDeleteUninitializedUsesJoinTableQuery(): 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->setInitialized(false);
+
+        $this->assertFalse($collection->isInitialized());
+
+        $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,
             IAuditStrategy::EVENT_COLLECTION_MANYTOMANY_DELETE
         );