feat: remove selection plan ref from presentation when a category is removed from a category group

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

Author: romanetar

app/Models/Foundation/Summit/Events/Presentations/PresentationCategory.php

@@ -679,6 +679,28 @@ public function calculateSlug(){
         return $this;
     }
 
+    /**
+     * @param int[] $selection_plan_ids
+     * @return Presentation[]
+     */
+    public function getPresentationsBySelectionPlanIds(array $selection_plan_ids): array
+    {
+        if (empty($selection_plan_ids)) return [];
+
+        $query = <<<DQL
+SELECT p
+FROM models\summit\Presentation p
+WHERE p.category = :track
+AND p.selection_plan IN (:selection_plan_ids)
+DQL;
+
+        return $this->getEM()
+            ->createQuery($query)
+            ->setParameter('track', $this)
+            ->setParameter('selection_plan_ids', $selection_plan_ids)
+            ->getResult();
+    }
+
     /**
      * @return SummitEvent[]
      */

app/Models/Foundation/Summit/Events/Presentations/PresentationCategoryGroup.php

@@ -13,6 +13,7 @@
  **/
 
 use App\Models\Foundation\Summit\ScheduleEntity;
+use App\Models\Foundation\Summit\SelectionPlan;
 use Doctrine\Common\Collections\Criteria;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
@@ -70,13 +71,43 @@ class PresentationCategoryGroup extends SilverstripeBaseModel
     protected $max_attendee_votes;
 
 
+    /**
+     * inverse side
+     * @var SelectionPlan[]
+     */
+    #[ORM\ManyToMany(targetEntity: \App\Models\Foundation\Summit\SelectionPlan::class, mappedBy: 'category_groups', fetch: 'EXTRA_LAZY')]
+    protected $selection_plans;
+
     public function __construct()
     {
         parent::__construct();
         $this->begin_attendee_voting_period_date = null;
         $this->end_attendee_voting_period_date = null;
         $this->max_attendee_votes = 0;
         $this->categories = new ArrayCollection;
+        $this->selection_plans = new ArrayCollection;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getSelectionPlanIds(): array
+    {
+        return $this->selection_plans->map(function ($sp) {
+            return $sp->getId();
+        })->toArray();
+    }
+
+    public function addSelectionPlan(SelectionPlan $selection_plan): void
+    {
+        if ($this->selection_plans->contains($selection_plan)) return;
+        $this->selection_plans->add($selection_plan);
+    }
+
+    public function removeSelectionPlan(SelectionPlan $selection_plan): void
+    {
+        if (!$this->selection_plans->contains($selection_plan)) return;
+        $this->selection_plans->removeElement($selection_plan);
     }
 
 
@@ -382,4 +413,4 @@ public function clearAttendeeVotingPeriod():void{
     }
 
     use ScheduleEntity;
-}
+}

app/Models/Foundation/Summit/SelectionPlan.php

@@ -169,7 +169,7 @@ class SelectionPlan extends SilverstripeBaseModel
     #[ORM\JoinTable(name: 'SelectionPlan_CategoryGroups')]
     #[ORM\JoinColumn(name: 'SelectionPlanID', referencedColumnName: 'ID')]
     #[ORM\InverseJoinColumn(name: 'PresentationCategoryGroupID', referencedColumnName: 'ID')]
-    #[ORM\ManyToMany(targetEntity: \models\summit\PresentationCategoryGroup::class, fetch: 'EXTRA_LAZY')]
+    #[ORM\ManyToMany(targetEntity: \models\summit\PresentationCategoryGroup::class, inversedBy: 'selection_plans', fetch: 'EXTRA_LAZY')]
     private $category_groups;
 
     /**
@@ -596,6 +596,7 @@ public function addTrackGroup(PresentationCategoryGroup $track_group)
     {
         if ($this->category_groups->contains($track_group)) return;
         $this->category_groups->add($track_group);
+        $track_group->addSelectionPlan($this);
     }
 
     /**
@@ -605,6 +606,7 @@ public function removeTrackGroup(PresentationCategoryGroup $track_group)
     {
         if (!$this->category_groups->contains($track_group)) return;
         $this->category_groups->removeElement($track_group);
+        $track_group->removeSelectionPlan($this);
     }
 
     public function addEventType(SummitEventType $eventType)

app/Services/Model/Imp/PresentationCategoryGroupService.php

@@ -252,6 +252,27 @@ public function disassociateTrack2TrackGroup(Summit $summit, $track_group_id, $t
                 );
             }
 
+            $presentations = $track->getPresentationsBySelectionPlanIds($track_group->getSelectionPlanIds());
+
+            // Only clear the selection plan if no other category group in that plan
+            // still contains $track. A selection plan can span multiple groups, so
+            // removing $track from $track_group does not necessarily invalidate the
+            // plan for presentations under $track — another group may still cover it.
+            // We exclude $track_group from the check because removeCategory has not
+            // been called yet at this point.
+            foreach ($presentations as $presentation) {
+                $selection_plan = $presentation->getSelectionPlan();
+                $track_reachable_via_another_group = $selection_plan->getCategoryGroups()->exists(
+                    function ($key, $group) use ($track, $track_group) {
+                        return $group->getId() !== $track_group->getId()
+                            && $group->hasCategory($track->getId());
+                    }
+                );
+                if (!$track_reachable_via_another_group) {
+                    $presentation->clearSelectionPlan();
+                }
+            }
+
             $track_group->removeCategory($track);
 
         });
@@ -380,4 +401,4 @@ public function disassociateAllowedGroup2TrackGroup(Summit $summit, $track_group
 
         });
     }
-}
+}

tests/oauth2/OAuth2TrackGroupsApiTest.php

@@ -1,4 +1,8 @@
 <?php namespace Tests;
+use LaravelDoctrine\ORM\Facades\Registry;
+use models\summit\Presentation;
+use models\utils\SilverstripeBaseModel;
+
 /**
  * Copyright 2018 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -341,6 +345,16 @@ public function testDisassociateTrack2TrackGroup(){
 
         $this->assertResponseStatus(201);
 
+        // verify presentations of defaultTrack have a selection plan before disassociation
+        $presentations = self::$defaultTrack->getPresentationsBySelectionPlanIds(
+            self::$defaultTrackGroup->getSelectionPlanIds()
+        );
+        $this->assertNotEmpty($presentations);
+        foreach ($presentations as $presentation) {
+            $this->assertTrue($presentation->getSelectionPlanId() > 0);
+        }
+        $presentation_ids = array_map(fn($p) => $p->getId(), $presentations);
+
         // now disassociate
         $response = $this->action(
             "DELETE",
@@ -353,6 +367,14 @@ public function testDisassociateTrack2TrackGroup(){
         );
 
         $this->assertResponseStatus(204);
+
+        // reset EM (closed after the API transaction) and re-fetch presentations to verify selection plan was cleared
+        self::$em = Registry::resetManager(SilverstripeBaseModel::EntityManager);
+        foreach ($presentation_ids as $id) {
+            $presentation = self::$em->find(Presentation::class, $id);
+            $this->assertNotNull($presentation);
+            $this->assertEquals(0, $presentation->getSelectionPlanId());
+        }
     }
 
     public function testAddPrivateTrackGroup(){
@@ -480,4 +502,4 @@ public function testDeleteExistentTrackGroup(){
         $content = $response->getContent();
         $this->assertResponseStatus(204);
     }
-}
+}