fix: review feedback

Signed-off-by: romanetar <roman_ag@hotmail.com>

Author: romanetar

app/Models/Foundation/Main/Member.php

@@ -2014,20 +2014,6 @@ public function addSummitRegistrationOrder(SummitOrder $summit_order)
         $summit_order->setOwner($this);
     }
 
-    /**
-     * @param Summit $summit
-     * @param int $sponsor_id
-     * @return Sponsor|null
-     */
-    public function getSponsorBySummitAndId(Summit $summit, int $sponsor_id): ?Sponsor
-    {
-        $sponsor = $this->sponsor_memberships->filter(function ($entity) use ($summit, $sponsor_id) {
-            return $entity->getSummitId() == $summit->getId() && $entity->getId() == $sponsor_id;
-        })->first();
-
-        return $sponsor === false ? null : $sponsor;
-    }
-
     /**
      * @return string|null
      */

app/Services/Model/Imp/SponsorUserSyncService.php

@@ -15,12 +15,14 @@
 use App\Services\Model\AbstractService;
 use App\Services\Model\ISponsorUserSyncService;
 use Illuminate\Support\Facades\Log;
+use LaravelDoctrine\ORM\Facades\Registry;
 use libs\utils\ITransactionService;
 use models\exceptions\EntityNotFoundException;
 use models\main\IGroupRepository;
 use models\main\IMemberRepository;
 use models\summit\ISummitRepository;
 use models\summit\Summit;
+use models\utils\SilverstripeBaseModel;
 use services\model\ISummitSponsorService;
 
 /**
@@ -168,8 +170,18 @@ public function addSponsorUserToGroup(int $user_id, string $group_slug, int $spo
 
                 $this->summit_sponsor_service->addSponsorUser($summit, $sponsor_id, $member->getId());
 
+                // Flush the UoW so the INSERT is visible to the raw SQL retry
+                // on the same connection within the active transaction.
+                Registry::getManager(SilverstripeBaseModel::EntityManager)->flush();
+
                 // Retry now that the row exists.
-                $member->addSponsorPermission($sponsor_id, $group_slug);
+                $retryResult = $member->addSponsorPermission($sponsor_id, $group_slug);
+                if ($retryResult === 0) {
+                      throw new \RuntimeException(
+                          "Failed to write permission after eager Sponsor_Users creation " .
+                          "for member {$member->getId()} / sponsor {$sponsor_id}"
+                      );
+                  }
             }
 
             // Add to global group only if not already a member.
@@ -217,4 +229,4 @@ public function removeSponsorUserFromGroup(int $user_id, string $group_slug, int
             }
         });
     }
-}
+}

tests/Unit/Services/SponsorUserPermissionTrackingTest.php

@@ -93,6 +93,36 @@ private function getPermissions(int $sponsor_id, int $member_id): array
     // addSponsorUserToGroup
     // -------------------------------------------------------------------------
 
+    /**
+     * MQ race: the group event arrives before the membership event, so there is
+     * no Sponsor_Users row yet when addSponsorUserToGroup is called.
+     * The service must create the row eagerly, flush the UoW so the INSERT is
+     * visible to the raw SQL retry, and then successfully write the permission.
+     */
+    public function testAddSponsorUserToGroupEagerlyCreatesRowAndWritesPermissionOnRetry(): void
+    {
+        // sponsors[1] has no Sponsor_Users row — the member is not yet a user
+        // of this sponsor, simulating the race condition.
+        $sponsor_id  = self::$sponsors[1]->getId();
+        $member_id   = self::$member->getId();
+        $external_id = self::$member->getUserExternalId();
+        $summit_id   = self::$summit->getId();
+
+        $conn = self::$em->getConnection();
+
+        // Confirm no row exists before the call.
+        $exists = $conn->executeQuery(
+            'SELECT COUNT(*) FROM Sponsor_Users WHERE SponsorID = ? AND MemberID = ?',
+            [$sponsor_id, $member_id]
+        )->fetchOne();
+        $this->assertEquals(0, (int)$exists, 'Pre-condition: no Sponsor_Users row should exist');
+
+        $this->getService()->addSponsorUserToGroup($external_id, IGroup::Sponsors, $sponsor_id, $summit_id);
+
+        // The row must have been created and the permission written.
+        $this->assertContains(IGroup::Sponsors, $this->getPermissions($sponsor_id, $member_id));
+    }
+
     /**
      * The group slug must be written into the Sponsor_Users.Permissions JSON
      * column for the correct (SponsorID, MemberID) row.