fix(audit): track chair score entries show chair, score and one row per change

app/Audit/AuditLogOtlpStrategy.php

@@ -21,6 +21,15 @@
  */
 class AuditLogOtlpStrategy implements IAuditStrategy
 {
+    /**
+     * Bidirectional collections whose changes are already audited from the other side.
+     * A track chair score is added to both Presentation::track_chairs_scores and
+     * SummitTrackChair::scores, and only the track chair side carries score removals,
+     * so auditing both emits every score twice.
+     */
+    private const SKIPPED_COLLECTIONS = [
+        \models\summit\Presentation::class => ['track_chairs_scores'],
+    ];
 
     private bool $enabled;
     private string $elasticIndex;
@@ -51,6 +60,9 @@ public function audit($subject, array $change_set, string $event_type,  AuditCon
         }
             Log::debug("AuditLogOtlpStrategy::audit", ['subject' => $subject, 'change_set' => $change_set, 'event_type' => $event_type]);
         try {
+            if ($this->isSkippedCollection($subject)) {
+                return;
+            }
             $entity = $this->resolveAuditableEntity($subject);
             if (is_null($entity)) {
                 Log::warning("AuditLogOtlpStrategy::audit subject not found");
@@ -89,6 +101,20 @@ public function audit($subject, array $change_set, string $event_type,  AuditCon
         }
     }
 
+    private function isSkippedCollection($subject): bool
+    {
+        if (!$subject instanceof PersistentCollection) {
+            return false;
+        }
+        $owner = $subject->getOwner();
+        foreach (self::SKIPPED_COLLECTIONS as $class => $fields) {
+            if ($owner instanceof $class && in_array($subject->getMapping()->fieldName, $fields, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private function resolveAuditableEntity($subject)
     {
         // 1) special cases first

app/Audit/ConcreteFormatters/ChildEntityFormatters/IChildEntityCollectionAuditLogFormatter.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Audit\ConcreteFormatters\ChildEntityFormatters;
+
+/**
+ * Copyright 2026 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Doctrine\ORM\PersistentCollection;
+
+/**
+ * Implemented by child formatters that need to see the whole collection diff at once
+ * (e.g. to render a delete + insert pair as a single "changed" entry) instead of
+ * formatting each inserted / deleted element on its own.
+ * @package App\Audit\ConcreteFormatters\ChildEntityFormatters
+ */
+interface IChildEntityCollectionAuditLogFormatter
+{
+    /**
+     * @param PersistentCollection $collection
+     * @return string|null
+     */
+    public function formatCollection(PersistentCollection $collection): ?string;
+}

app/Audit/ConcreteFormatters/ChildEntityFormatters/PresentationTrackChairScoreAuditLogFormatter.php

@@ -1,27 +1,106 @@
 <?php namespace App\Audit\ConcreteFormatters\ChildEntityFormatters;
 
 use App\Models\Foundation\Summit\Events\Presentations\TrackChairs\PresentationTrackChairScore;
+use Doctrine\ORM\PersistentCollection;
 use Illuminate\Support\Facades\Log;
+use models\summit\Presentation;
+use models\summit\SummitTrackChair;
 
-class PresentationTrackChairScoreAuditLogFormatter implements IChildEntityAuditLogFormatter
+class PresentationTrackChairScoreAuditLogFormatter
+    implements IChildEntityAuditLogFormatter, IChildEntityCollectionAuditLogFormatter
 {
+    /**
+     * Changing a score is modeled as remove old + add new in the same transaction, so a
+     * delete and an insert for the same presentation and rating type are rendered as one
+     * "changed" entry instead of two joined actions.
+     * @param PersistentCollection $collection
+     * @return string|null
+     */
+    public function formatCollection(PersistentCollection $collection): ?string
+    {
+        try {
+            $owner = $collection->getOwner();
+
+            $removed = [];
+            foreach ($collection->getDeleteDiff() as $score) {
+                if (!$score instanceof PresentationTrackChairScore) continue;
+                $removed[$this->getReplacementKey($score, $owner)] = $score;
+            }
+
+            $lines = [];
+            foreach ($collection->getInsertDiff() as $score) {
+                if (!$score instanceof PresentationTrackChairScore) continue;
+                $key = $this->getReplacementKey($score, $owner);
+                $old = $removed[$key] ?? null;
+                unset($removed[$key]);
+
+                $lines[] = is_null($old)
+                    ? sprintf(
+                        "Track Chair '%s' scored '%s' on presentation '%s'",
+                        $this->getChairName($score, $owner),
+                        $score->getType()->getName(),
+                        $this->getPresentationTitle($score, $owner)
+                    )
+                    : sprintf(
+                        "Track Chair '%s' changed score from '%s' to '%s' on presentation '%s'",
+                        $this->getChairName($score, $owner),
+                        $old->getType()->getName(),
+                        $score->getType()->getName(),
+                        $this->getPresentationTitle($score, $owner)
+                    );
+            }
+
+            foreach ($removed as $score) {
+                $lines[] = sprintf(
+                    "Track Chair '%s' removed score '%s' from presentation '%s'",
+                    $this->getChairName($score, $owner),
+                    $score->getType()->getName(),
+                    $this->getPresentationTitle($score, $owner)
+                );
+            }
+
+            return empty($lines) ? null : implode(' | ', $lines);
+        } catch (\Exception $ex) {
+            Log::warning("PresentationTrackChairScoreAuditLogFormatter::formatCollection error: " . $ex->getMessage());
+        }
+
+        return null;
+    }
+
+    private function getReplacementKey(PresentationTrackChairScore $score, $owner): string
+    {
+        $presentation = $owner instanceof Presentation ? $owner : ($score->hasPresentation() ? $score->getPresentation() : null);
+        return sprintf("%s:%s", $presentation?->getId() ?? 0, $score->getType()->getType()->getId());
+    }
+
+    /**
+     * removeScore() / removeTrackChairScore() null the back reference on the removed score,
+     * so the side that owns the collection is taken from the collection owner.
+     */
+    private function getChairName(PresentationTrackChairScore $score, $owner): string
+    {
+        $chair = $owner instanceof SummitTrackChair ? $owner : ($score->hasReviewer() ? $score->getReviewer() : null);
+        return is_null($chair) ? 'Unknown Chair' : ($chair->getMember()->getFullName() ?? 'Unknown Chair');
+    }
+
+    private function getPresentationTitle(PresentationTrackChairScore $score, $owner): string
+    {
+        $presentation = $owner instanceof Presentation ? $owner : ($score->hasPresentation() ? $score->getPresentation() : null);
+        return is_null($presentation) ? 'Unknown Presentation' : $presentation->getTitle();
+    }
+
     public function format($subject, string $child_entity_action_type, ?string $additional_info = ""): ?string
     {
         if (!$subject instanceof PresentationTrackChairScore) {
             return null;
         }
 
         try {
-            $score_type = $subject->getScoreType();
-            $score_label = $score_type ? $score_type->getLabel() : 'Unknown Score';
-
-            $presentation = $subject->getPresentation();
-            $presentation_title = $presentation ? $presentation->getTitle() : 'Unknown Presentation';
-
-            $created_by = $subject->getCreatedBy();
-            $chair_name = $created_by 
-                ? sprintf("%s %s", $created_by->getFirstName(), $created_by->getLastName())
-                : 'Unknown Chair';
+            $score_label = $subject->getType()->getName();
+            // reviewer / presentation are resolved through hasReviewer() / hasPresentation():
+            // removeScore() / removeTrackChairScore() null them and the typed getters would throw
+            $presentation_title = $this->getPresentationTitle($subject, null);
+            $chair_name = $this->getChairName($subject, null);
 
             switch ($child_entity_action_type) {
                 case self::CHILD_ENTITY_CREATION:
@@ -33,8 +112,9 @@ public function format($subject, string $child_entity_action_type, ?string $addi
                     );
                 case self::CHILD_ENTITY_DELETION:
                     return sprintf(
-                        "Score removed for Track Chair '%s' from presentation '%s'",
+                        "Track Chair '%s' removed score '%s' from presentation '%s'",
                         $chair_name,
+                        $score_label,
                         $presentation_title
                     );
                 case self::CHILD_ENTITY_UPDATE:

app/Audit/ConcreteFormatters/EntityCollectionUpdateAuditLogFormatter.php

@@ -3,8 +3,10 @@
 namespace App\Audit\ConcreteFormatters;
 
 use App\Audit\ConcreteFormatters\ChildEntityFormatters\IChildEntityAuditLogFormatter;
+use App\Audit\ConcreteFormatters\ChildEntityFormatters\IChildEntityCollectionAuditLogFormatter;
 use App\Audit\AbstractAuditLogFormatter;
 use App\Audit\Interfaces\IAuditStrategy;
+use Doctrine\ORM\PersistentCollection;
 use Illuminate\Support\Facades\Log;
 use ReflectionException;
 
@@ -44,6 +46,11 @@ public function __construct(?IChildEntityAuditLogFormatter $child_entity_formatt
      */
     public function format($subject, $change_set): ?string {
         try {
+            if ($this->child_entity_formatter instanceof IChildEntityCollectionAuditLogFormatter
+                && $subject instanceof PersistentCollection) {
+                return $this->child_entity_formatter->formatCollection($subject);
+            }
+
             if ($this->child_entity_formatter != null) {
                 $changes = [];
 

config/audit_log.php

@@ -60,6 +60,11 @@
             'enabled' => true,
             'strategy' => \App\Audit\ConcreteFormatters\PresentationFormatters\PresentationTrackChairRatingTypeAuditLogFormatter::class,
         ],
+        // scores are audited through the SummitTrackChair::scores collection; the entity-level
+        // insert/delete events would log each score again with the generic formatters
+        \App\Models\Foundation\Summit\Events\Presentations\TrackChairs\PresentationTrackChairScore::class => [
+            'enabled' => false,
+        ],
         \App\Models\Foundation\Summit\Events\Presentations\TrackChairs\PresentationTrackChairScoreType::class => [
             'enabled' => true,
             'strategy' => \App\Audit\ConcreteFormatters\PresentationFormatters\PresentationTrackChairScoreTypeAuditLogFormatter::class,

tests/OpenTelemetry/AuditLogOtlpStrategySkippedCollectionTest.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Tests\OpenTelemetry;
+
+/**
+ * Copyright 2026 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use App\Audit\AuditContext;
+use App\Audit\AuditLogOtlpStrategy;
+use App\Audit\IAuditLogFormatterFactory;
+use App\Audit\Interfaces\IAuditStrategy;
+use App\Models\Foundation\Summit\Events\Presentations\TrackChairs\PresentationTrackChairScore;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Mapping\OneToManyAssociationMapping;
+use Doctrine\ORM\PersistentCollection;
+use Illuminate\Support\Facades\Queue;
+use Mockery;
+use models\summit\Presentation;
+use models\summit\SummitTrackChair;
+
+/**
+ * Every track chair score lives in both Presentation::track_chairs_scores and
+ * SummitTrackChair::scores; only the track chair side may be audited or each score is
+ * logged twice.
+ */
+class AuditLogOtlpStrategySkippedCollectionTest extends OpenTelemetryTestCase
+{
+    protected function tearDown(): void
+    {
+        Mockery::close();
+        parent::tearDown();
+    }
+
+    private function buildStrategy(IAuditLogFormatterFactory $factory): AuditLogOtlpStrategy
+    {
+        $strategy = new AuditLogOtlpStrategy($factory);
+        $enabled = (new \ReflectionClass($strategy))->getProperty('enabled');
+        $enabled->setAccessible(true);
+        $enabled->setValue($strategy, true);
+        return $strategy;
+    }
+
+    private function buildCollection(object $owner, string $field, string $mapped_by): PersistentCollection
+    {
+        $collection = new PersistentCollection(
+            $this->createMock(EntityManagerInterface::class),
+            new ClassMetadata(PresentationTrackChairScore::class),
+            new ArrayCollection()
+        );
+        $collection->setOwner($owner, OneToManyAssociationMapping::fromMappingArray([
+            'fieldName' => $field,
+            'sourceEntity' => get_class($owner),
+            'targetEntity' => PresentationTrackChairScore::class,
+            'mappedBy' => $mapped_by,
+            'isOwningSide' => false,
+        ]));
+        return $collection;
+    }
+
+    public function testPresentationTrackChairScoresCollectionIsNotAudited(): void
+    {
+        $factory = $this->createMock(IAuditLogFormatterFactory::class);
+        $factory->expects($this->never())->method('make');
+
+        Queue::fake();
+
+        $this->buildStrategy($factory)->audit(
+            $this->buildCollection(Mockery::mock(Presentation::class), 'track_chairs_scores', 'presentation'),
+            [],
+            IAuditStrategy::EVENT_COLLECTION_UPDATE,
+            new AuditContext()
+        );
+
+        Queue::assertNothingPushed();
+    }
+
+    public function testTrackChairScoresCollectionIsAudited(): void
+    {
+        $factory = $this->createMock(IAuditLogFormatterFactory::class);
+        $factory->expects($this->once())->method('make')->willReturn(null);
+
+        $this->buildStrategy($factory)->audit(
+            $this->buildCollection(Mockery::mock(SummitTrackChair::class), 'scores', 'reviewer'),
+            [],
+            IAuditStrategy::EVENT_COLLECTION_UPDATE,
+            new AuditContext()
+        );
+    }
+}