From 86d06980f269e8559a4ec8197ca6a9cca9ceadfe Mon Sep 17 00:00:00 2001
From: jekuaitk <jekua@aarhus.dk>
Date: Tue, 29 Sep 2026 17:23:46 +0200
Subject: [PATCH 1/2] 8383: Allowed multiple areas per project

---
 assets/app.js                                 | 28 ++++----
 migrations/Version20260929150846.php          | 40 ++++++++++++
 src/Controller/ProjectController.php          |  2 +-
 src/DataFixtures/AppFixtures.php              |  7 +-
 src/Entity/Project.php                        | 54 ++++++++++++----
 src/Form/ProjectType.php                      |  7 +-
 src/Repository/ProjectRepository.php          | 64 +++++++++++--------
 src/Service/DashboardData.php                 | 15 ++++-
 templates/project/_form.html.twig             |  2 +-
 templates/project/show.html.twig              |  2 +-
 tests/Controller/ProjectControllerTest.php    | 59 +++++++++++++++++
 tests/Repository/AreaRepositoryTest.php       |  3 +-
 tests/Repository/DepartmentRepositoryTest.php |  3 +-
 tests/Repository/ProjectRepositoryTest.php    | 42 +++++++++++-
 tests/Service/DashboardDataTest.php           | 28 ++++----
 tests/Unit/Entity/ProjectTest.php             | 27 ++++++--
 translations/messages.da.yaml                 |  4 +-
 translations/messages.en.yaml                 |  4 +-
 18 files changed, 305 insertions(+), 86 deletions(-)
 create mode 100644 migrations/Version20260929150846.php

diff --git a/assets/app.js b/assets/app.js
index 4b9e80e..f742749 100644
--- a/assets/app.js
+++ b/assets/app.js
@@ -180,23 +180,25 @@ function initPartnerSelect() {
     );
 }
 
-// Departments are a fixed, admin-managed pool, so the project form's
+// Departments and areas are fixed, admin-managed pools, so the project form's
 // <select multiple> becomes a searchable chip multiselect without `create`.
 // Tom Select reads the options and the selection from the select itself and
 // fires input/change on it, which is what autosave and the progress bar listen for.
-function initDepartmentSelect() {
-    document.querySelectorAll("[data-department-select]").forEach((select) => {
-        if (select.dataset.bound) {
-            return;
-        }
-        select.dataset.bound = "1";
+function initPoolSelect() {
+    document
+        .querySelectorAll("[data-department-select], [data-area-select]")
+        .forEach((select) => {
+            if (select.dataset.bound) {
+                return;
+            }
+            select.dataset.bound = "1";
 
-        new TomSelect(select, {
-            plugins: ["remove_button"],
-            hideSelected: true,
-            maxOptions: null,
+            new TomSelect(select, {
+                plugins: ["remove_button"],
+                hideSelected: true,
+                maxOptions: null,
+            });
         });
-    });
 }
 
 // One delegated handler on the document (which survives Turbo navigations and
@@ -225,7 +227,7 @@ document.addEventListener("turbo:load", () => {
     initCollections();
     initContactSelect();
     initPartnerSelect();
-    initDepartmentSelect();
+    initPoolSelect();
     initTermSelect();
 });
 
diff --git a/migrations/Version20260929150846.php b/migrations/Version20260929150846.php
new file mode 100644
index 0000000..1fa99a2
--- /dev/null
+++ b/migrations/Version20260929150846.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260929150846 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Make a project\'s area a many-to-many relation: add the project_area join table, copy each project\'s area into it and drop project.area_id.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE project_area (project_id BINARY(16) NOT NULL, area_id BINARY(16) NOT NULL, INDEX IDX_EE05F570166D1F9C (project_id), INDEX IDX_EE05F570BD0F409C (area_id), PRIMARY KEY (project_id, area_id)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('ALTER TABLE project_area ADD CONSTRAINT FK_EE05F570166D1F9C FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE project_area ADD CONSTRAINT FK_EE05F570BD0F409C FOREIGN KEY (area_id) REFERENCES area (id) ON DELETE CASCADE');
+        // Carry the existing single area over before the column goes.
+        $this->addSql('INSERT INTO project_area (project_id, area_id) SELECT id, area_id FROM project WHERE area_id IS NOT NULL');
+        $this->addSql('ALTER TABLE project DROP FOREIGN KEY `FK_2FB3D0EEBD0F409C`');
+        $this->addSql('DROP INDEX IDX_2FB3D0EEBD0F409C ON project');
+        $this->addSql('ALTER TABLE project DROP area_id');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE project ADD area_id BINARY(16) DEFAULT NULL');
+        $this->addSql('ALTER TABLE project ADD CONSTRAINT `FK_2FB3D0EEBD0F409C` FOREIGN KEY (area_id) REFERENCES area (id) ON DELETE SET NULL');
+        $this->addSql('CREATE INDEX IDX_2FB3D0EEBD0F409C ON project (area_id)');
+        // A project with several areas keeps an arbitrary one of them.
+        $this->addSql('UPDATE project p JOIN project_area pa ON pa.project_id = p.id SET p.area_id = pa.area_id');
+        $this->addSql('ALTER TABLE project_area DROP FOREIGN KEY FK_EE05F570166D1F9C');
+        $this->addSql('ALTER TABLE project_area DROP FOREIGN KEY FK_EE05F570BD0F409C');
+        $this->addSql('DROP TABLE project_area');
+    }
+}
diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
index 1d5e1db..a0c64dc 100644
--- a/src/Controller/ProjectController.php
+++ b/src/Controller/ProjectController.php
@@ -92,7 +92,7 @@ public function export(Request $request, ProjectRepository $projects, Translator
                     $row->getTitle(),
                     $row->getTopic(),
                     $translate($row->getStatus()),
-                    $row->getArea()?->getName(),
+                    $names($row->getAreas()),
                     $translate($row->getProjectType()),
                     $names($row->getOrganizationalAnchoring()),
                     $row->isEndorsement() ? $translator->trans('filter.yes') : $translator->trans('filter.no'),
diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AppFixtures.php
index f982053..4b5d7d5 100644
--- a/src/DataFixtures/AppFixtures.php
+++ b/src/DataFixtures/AppFixtures.php
@@ -136,7 +136,6 @@ public function load(ObjectManager $manager): void
         foreach ($titles as $index => $title) {
             $project = (new Project())
                 ->setTitle($title)
-                ->setArea($areas[array_rand($areas)])
                 ->setProjectType($types[array_rand($types)])
                 ->setStatus($statuses[array_rand($statuses)])
                 ->setSummary('Projektet arbejder med '.mb_strtolower($title).' gennem en tværgående indsats med fokus på borgernes hverdag og kommunens strategiske mål.')
@@ -157,10 +156,14 @@ public function load(ObjectManager $manager): void
             $project->setFunding(\array_slice($this->shuffleCopy($fundings), 0, mt_rand(1, 3)));
 
             // Roughly a third of the projects span two departments so the dashboard's
-            // cross-department views have something to show.
+            // cross-department views have something to show; likewise every fourth
+            // project sits in two areas.
             foreach (\array_slice($this->shuffleCopy($departments), 0, 0 === $index % 3 ? 2 : 1) as $department) {
                 $project->addOrganizationalAnchoring($department);
             }
+            foreach (\array_slice($this->shuffleCopy($areas), 0, 0 === $index % 4 ? 2 : 1) as $area) {
+                $project->addArea($area);
+            }
 
             $start = new \DateTimeImmutable(sprintf('2025-%02d-01', mt_rand(1, 12)));
             $project->setTimePeriodStart($start);
diff --git a/src/Entity/Project.php b/src/Entity/Project.php
index 73476b4..97ab884 100644
--- a/src/Entity/Project.php
+++ b/src/Entity/Project.php
@@ -22,13 +22,13 @@ class Project extends AbstractEntity
      * Fields that count toward {@see getCompletionPercentage()} and the client-side
      * progress bar. Limited to the project's own columns so list rendering stays
      * query-free; the booleans and the free-tagging lists are intentionally excluded.
-     * Departments are the one collection counted: they are a fixed, admin-managed
-     * pool and the anchoring is core to what a project is.
+     * Areas and departments are the two collections counted: both are fixed,
+     * admin-managed pools and core to what a project is.
      *
      * @var list<string>
      */
     public const array COMPLETION_FIELDS = [
-        'title', 'area', 'summary', 'description', 'projectType', 'status',
+        'title', 'areas', 'summary', 'description', 'projectType', 'status',
         'organizationalAnchoring',
         'budget', 'funding', 'timePeriodStart', 'timePeriodEnd',
     ];
@@ -45,9 +45,15 @@ class Project extends AbstractEntity
     #[ORM\Column(type: Types::TEXT, nullable: true)]
     private ?string $topic = null;
 
-    #[ORM\ManyToOne(targetEntity: Area::class)]
-    #[ORM\JoinColumn(onDelete: 'SET NULL')]
-    private ?Area $area = null;
+    /**
+     * The thematic areas a project belongs to. Like departments, an admin-managed
+     * pool a project can sit in several of.
+     *
+     * @var Collection<int, Area>
+     */
+    #[ORM\ManyToMany(targetEntity: Area::class)]
+    #[ORM\JoinTable(name: 'project_area')]
+    private Collection $areas;
 
     /** A few lines summing up the project's purpose and content. */
     #[ORM\Column(type: Types::TEXT, nullable: true)]
@@ -132,6 +138,7 @@ class Project extends AbstractEntity
     public function __construct()
     {
         parent::__construct();
+        $this->areas = new ArrayCollection();
         $this->organizationalAnchoring = new ArrayCollection();
         $this->strategies = new ArrayCollection();
         $this->contacts = new ArrayCollection();
@@ -163,14 +170,35 @@ public function setTopic(?string $topic): static
         return $this;
     }
 
-    public function getArea(): ?Area
+    /** @return Collection<int, Area> */
+    public function getAreas(): Collection
     {
-        return $this->area;
+        return $this->areas;
     }
 
-    public function setArea(?Area $area): static
+    public function addArea(Area $area): static
     {
-        $this->area = $area;
+        if (!$this->areas->contains($area)) {
+            $this->areas->add($area);
+        }
+
+        return $this;
+    }
+
+    public function removeArea(Area $area): static
+    {
+        $this->areas->removeElement($area);
+
+        return $this;
+    }
+
+    /** @param iterable<Area> $areas */
+    public function setAreas(iterable $areas): static
+    {
+        $this->areas->clear();
+        foreach ($areas as $area) {
+            $this->addArea($area);
+        }
 
         return $this;
     }
@@ -485,14 +513,14 @@ static function (string $link): bool {
 
     /**
      * Share of {@see COMPLETION_FIELDS} that are filled in, as a 0–100 percentage.
-     * Reads own columns plus the department collection (one lazy load), so it is
-     * cheap enough to call per row in a listing.
+     * Reads own columns plus the area and department collections (one lazy load
+     * each), so it is cheap enough to call per row in a listing.
      */
     public function getCompletionPercentage(): int
     {
         $checks = [
             null !== $this->title && '' !== $this->title,
-            null !== $this->area,
+            !$this->areas->isEmpty(),
             null !== $this->summary && '' !== $this->summary,
             null !== $this->description && '' !== $this->description,
             null !== $this->projectType,
diff --git a/src/Form/ProjectType.php b/src/Form/ProjectType.php
index 149c2ea..586b29c 100644
--- a/src/Form/ProjectType.php
+++ b/src/Form/ProjectType.php
@@ -46,12 +46,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'attr' => ['rows' => 4],
                 'help' => 'project.topic_help',
             ])
-            ->add('area', EntityType::class, [
+            ->add('areas', EntityType::class, [
                 'label' => 'project.area',
                 'class' => Area::class,
                 'choice_label' => 'name',
+                'multiple' => true,
                 'required' => false,
-                'placeholder' => 'form.choose',
+                // Areas are admin-managed like departments: a searchable multiselect
+                // (Tom Select, see app.js) without on-the-fly creation.
+                'attr' => ['data-area-select' => true, 'placeholder' => 'form.choose'],
                 'help' => 'project.area_help',
             ])
             ->add('summary', TextareaType::class, [
diff --git a/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php
index 1181091..b72693e 100644
--- a/src/Repository/ProjectRepository.php
+++ b/src/Repository/ProjectRepository.php
@@ -56,7 +56,7 @@ public function search(ProjectFilter $filter): QueryBuilder
                 // Department and area are related entities searched by their stored
                 // name ("nik" should find "Teknik og Miljø").
                 sprintf('i.id IN (SELECT idep.id FROM %s idep JOIN idep.organizationalAnchoring dep WHERE LOWER(dep.name) LIKE :q)', Project::class),
-                sprintf('i.id IN (SELECT iare.id FROM %s iare JOIN iare.area ar WHERE LOWER(ar.name) LIKE :q)', Project::class),
+                sprintf('i.id IN (SELECT iare.id FROM %s iare JOIN iare.areas ar WHERE LOWER(ar.name) LIKE :q)', Project::class),
             ];
 
             // Enum columns store slugs, but the user searches their translated
@@ -89,7 +89,7 @@ public function search(ProjectFilter $filter): QueryBuilder
         }
 
         if (null !== $filter->area) {
-            $qb->andWhere('i.area = :area')->setParameter('area', $filter->area->getId(), 'ulid');
+            $qb->andWhere(':area MEMBER OF i.areas')->setParameter('area', $filter->area->getId(), 'ulid');
         }
 
         if (null !== $filter->projectType) {
@@ -147,7 +147,7 @@ public function findForExport(ProjectFilter $filter): array
             return [];
         }
 
-        foreach (['organizationalAnchoring', 'strategies', 'tags', 'contacts', 'partners'] as $association) {
+        foreach (['areas', 'organizationalAnchoring', 'strategies', 'tags', 'contacts', 'partners'] as $association) {
             $this->createQueryBuilder('i')
                 ->addSelect('rel')
                 ->leftJoin('i.'.$association, 'rel')
@@ -263,45 +263,55 @@ public function findRecent(int $limit = 5): array
     /**
      * Lightweight per-project rows for the dashboard numbers: just the
      * columns the aggregates need, so it stays cheap to recompute on every live
-     * broadcast. `organizationalAnchoring` is the list of department ids (as
-     * strings); the other keys are plain columns.
+     * broadcast. `areas` and `organizationalAnchoring` are lists of area and
+     * department ids (as strings); the other keys are plain columns.
      *
      * @return list<array<string, mixed>>
      */
     public function dashboardRows(): array
     {
-        // Join and select the related ids (rather than IDENTITY()) so Doctrine
-        // applies the ULID type: IDENTITY() returns the raw binary FK, which would
-        // not match the canonical ULID strings the rest of build() keys on.
         $rows = $this->createQueryBuilder('i')
-            ->select(
-                'i.id',
-                'ar.id AS area',
-                'i.status',
-                'i.budget',
-            )
-            ->leftJoin('i.area', 'ar')
+            ->select('i.id', 'i.status', 'i.budget')
             ->getQuery()
             ->getArrayResult();
 
-        // Departments are many-to-many, so they are fetched separately and folded
-        // in: joining them above would repeat every project once per department.
-        $departmentsByProject = [];
+        // Areas and departments are many-to-many, so each is fetched separately
+        // and folded in: joining them above would repeat every project once per
+        // area times department.
+        $areasByProject = $this->relatedIdsByProject('areas');
+        $departmentsByProject = $this->relatedIdsByProject('organizationalAnchoring');
+
+        foreach ($rows as &$row) {
+            $id = (string) $row['id'];
+            $row['areas'] = $areasByProject[$id] ?? [];
+            $row['organizationalAnchoring'] = $departmentsByProject[$id] ?? [];
+            unset($row['id']);
+        }
+
+        return $rows;
+    }
+
+    /**
+     * The ids of a to-many association, as strings, keyed by project id.
+     *
+     * @return array<string, list<string>>
+     */
+    private function relatedIdsByProject(string $association): array
+    {
+        // Join and select the related id (rather than IDENTITY()) so Doctrine
+        // applies the ULID type: IDENTITY() returns the raw binary FK, which would
+        // not match the canonical ULID strings DashboardData keys on.
         $pairs = $this->createQueryBuilder('i')
-            ->select('i.id AS project', 'd.id AS department')
-            ->join('i.organizationalAnchoring', 'd')
+            ->select('i.id AS project', 'rel.id AS related')
+            ->join('i.'.$association, 'rel')
             ->getQuery()
             ->getArrayResult();
 
+        $byProject = [];
         foreach ($pairs as $pair) {
-            $departmentsByProject[(string) $pair['project']][] = (string) $pair['department'];
+            $byProject[(string) $pair['project']][] = (string) $pair['related'];
         }
 
-        foreach ($rows as &$row) {
-            $row['organizationalAnchoring'] = $departmentsByProject[(string) $row['id']] ?? [];
-            unset($row['id']);
-        }
-
-        return $rows;
+        return $byProject;
     }
 }
diff --git a/src/Service/DashboardData.php b/src/Service/DashboardData.php
index c4ee3e1..1557cd4 100644
--- a/src/Service/DashboardData.php
+++ b/src/Service/DashboardData.php
@@ -53,10 +53,18 @@ public function build(): array
 
         foreach ($this->projects->dashboardRows() as $row) {
             ++$total;
-            $area = $this->enumValue($row['area'] ?? null);
             $status = $this->enumValue($row['status'] ?? null);
             $si = null !== $status ? ($statusIndex[$status] ?? null) : null;
 
+            // A project belongs to any number of areas, keyed by id.
+            $areas = [];
+            foreach (($row['areas'] ?? []) as $areaId) {
+                $area = $this->enumValue($areaId);
+                if (null !== $area) {
+                    $areas[$area] = true;
+                }
+            }
+
             // A project is anchored in any number of departments; keep only the
             // ids that resolve to a known department, as department indexes.
             $depts = [];
@@ -73,10 +81,11 @@ public function build(): array
 
             // Every per-department aggregate counts a shared project once under
             // each of its departments: the budget shows what each department is
-            // involved in, so the bars sum to more than the plain total.
+            // involved in, so the bars sum to more than the plain total. Each of
+            // the project's areas is marked as worked on in each department.
             foreach ($depts as $di) {
                 $deptsSeen[$di] = true;
-                if (null !== $area) {
+                foreach (array_keys($areas) as $area) {
                     $deptsByArea[$area][$di] = true;
                 }
                 if (null !== ($row['budget'] ?? null)) {
diff --git a/templates/project/_form.html.twig b/templates/project/_form.html.twig
index 495f8bb..7113bb8 100644
--- a/templates/project/_form.html.twig
+++ b/templates/project/_form.html.twig
@@ -48,7 +48,7 @@
         {{ form_row(form.title, {attr: title_attr}) }}
         {{ form_row(form.topic) }}
         <div class="form-grid">
-            {{ form_row(form.area) }}
+            {{ form_row(form.areas) }}
             {{ form_row(form.projectType) }}
         </div>
         {{ form_row(form.summary) }}
diff --git a/templates/project/show.html.twig b/templates/project/show.html.twig
index 8b56a0c..2d2eba9 100644
--- a/templates/project/show.html.twig
+++ b/templates/project/show.html.twig
@@ -95,7 +95,7 @@
                 <div class="card__body">
                     <dl class="detail-list">
                         <dt>{{ 'project.area'|trans }}</dt>
-                        <dd>{{ project.area ? project.area.name : '—' }}</dd>
+                        <dd>{{ h.term_list(project.areas) }}</dd>
 
                         <dt>{{ 'project.project_type'|trans }}</dt>
                         <dd>{{ project.projectType ? project.projectType.labelKey|trans : '—' }}</dd>
diff --git a/tests/Controller/ProjectControllerTest.php b/tests/Controller/ProjectControllerTest.php
index 1a2556e..9c8a124 100644
--- a/tests/Controller/ProjectControllerTest.php
+++ b/tests/Controller/ProjectControllerTest.php
@@ -4,6 +4,7 @@
 
 namespace App\Tests\Controller;
 
+use App\Entity\Area;
 use App\Entity\Contact;
 use App\Entity\Department;
 use App\Entity\Project;
@@ -243,6 +244,64 @@ public function testDepartmentsAreSavedShownFilteredAndExported(): void
         $em->flush();
     }
 
+    public function testAreasAreSavedShownFilteredAndExported(): void
+    {
+        $this->loginAsAdmin();
+        $em = $this->entityManager();
+        $first = (new Area())->setName('Area first '.uniqid());
+        $second = (new Area())->setName('Area second '.uniqid());
+        $em->persist($first);
+        $em->persist($second);
+        $em->flush();
+        $elsewhere = $this->createProject('Project elsewhere '.uniqid());
+        $title = 'Two-area project '.uniqid();
+
+        $crawler = $this->client->request('GET', '/projects/new');
+        self::assertCount(1, $crawler->filter('select[name="project[areas][]"][multiple]'));
+        $token = (string) $crawler->filter('input[name="project[_token]"]')->attr('value');
+        $this->client->request('POST', '/projects/new', [
+            'project' => [
+                'title' => $title,
+                'areas' => [(string) $first->getId(), (string) $second->getId()],
+                '_token' => $token,
+            ],
+        ]);
+        $this->assertResponseRedirects();
+
+        $project = $this->projects()->findOneBy(['title' => $title]);
+        self::assertInstanceOf(Project::class, $project);
+        self::assertCount(2, $project->getAreas());
+        $id = (string) $project->getId();
+
+        // Both areas are listed on the project page …
+        $crawler = $this->client->request('GET', '/projects/'.$id);
+        $details = $crawler->filter('.detail-list')->text();
+        self::assertStringContainsString((string) $first->getName(), $details);
+        self::assertStringContainsString((string) $second->getName(), $details);
+
+        // … the area filter narrows the list to projects in that area …
+        $crawler = $this->client->request('GET', '/projects?area='.$first->getId());
+        $results = $crawler->filter('#project-results')->text();
+        self::assertStringContainsString($title, $results);
+        self::assertStringNotContainsString((string) $elsewhere->getTitle(), $results);
+
+        // … and the export lists every area of the project.
+        $this->client->request('GET', '/projects/export?area='.$second->getId());
+        $csv = (string) $this->client->getInternalResponse()->getContent();
+        self::assertStringContainsString($first->getName().', '.$second->getName(), $csv);
+
+        $this->removeProject($id);
+        $this->removeProject((string) $elsewhere->getId());
+        $em = $this->entityManager();
+        foreach ([$first->getId(), $second->getId()] as $areaId) {
+            $area = $this->areas()->find($areaId);
+            if (null !== $area) {
+                $em->remove($area);
+            }
+        }
+        $em->flush();
+    }
+
     public function testSummaryAndDescriptionAreSavedShownAndSearchable(): void
     {
         $this->loginAsAdmin();
diff --git a/tests/Repository/AreaRepositoryTest.php b/tests/Repository/AreaRepositoryTest.php
index c9615eb..bf08f9e 100644
--- a/tests/Repository/AreaRepositoryTest.php
+++ b/tests/Repository/AreaRepositoryTest.php
@@ -6,6 +6,7 @@
 
 use App\Repository\AreaRepository;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Uid\Ulid;
 
 final class AreaRepositoryTest extends KernelTestCase
 {
@@ -20,6 +21,6 @@ public function testFindAllOrderedReturnsAreas(): void
         // Ordering is delegated to the database collation, so we only assert the
         // method returns the persisted areas.
         self::assertNotEmpty($areas);
-        self::assertNotNull($areas[0]->getId());
+        self::assertInstanceOf(Ulid::class, $areas[0]->getId());
     }
 }
diff --git a/tests/Repository/DepartmentRepositoryTest.php b/tests/Repository/DepartmentRepositoryTest.php
index af77590..2c153bb 100644
--- a/tests/Repository/DepartmentRepositoryTest.php
+++ b/tests/Repository/DepartmentRepositoryTest.php
@@ -6,6 +6,7 @@
 
 use App\Repository\DepartmentRepository;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Uid\Ulid;
 
 final class DepartmentRepositoryTest extends KernelTestCase
 {
@@ -20,6 +21,6 @@ public function testFindAllOrderedReturnsDepartments(): void
         // Ordering is delegated to the database collation, so we only assert the
         // method returns the persisted departments.
         self::assertNotEmpty($departments);
-        self::assertNotNull($departments[0]->getId());
+        self::assertInstanceOf(Ulid::class, $departments[0]->getId());
     }
 }
diff --git a/tests/Repository/ProjectRepositoryTest.php b/tests/Repository/ProjectRepositoryTest.php
index a5f24f0..9fca760 100644
--- a/tests/Repository/ProjectRepositoryTest.php
+++ b/tests/Repository/ProjectRepositoryTest.php
@@ -58,7 +58,7 @@ public function testSearchByDepartmentOrAreaMatchesOnlyProjectsWithThem(): void
         $anchored = (new Project())
             ->setTitle('Anchored '.uniqid())
             ->addOrganizationalAnchoring($department)
-            ->setArea($area);
+            ->addArea($area);
         $loose = (new Project())->setTitle('Loose '.uniqid());
         foreach ([$department, $area, $anchored, $loose] as $entity) {
             $em->persist($entity);
@@ -83,6 +83,46 @@ public function testSearchByDepartmentOrAreaMatchesOnlyProjectsWithThem(): void
         $em->flush();
     }
 
+    public function testDashboardRowsListAProjectOnceWithAllItsAreasAndDepartments(): void
+    {
+        $em = static::getContainer()->get(EntityManagerInterface::class);
+        \assert($em instanceof EntityManagerInterface);
+
+        $areas = [(new Area())->setName('Row area A '.uniqid()), (new Area())->setName('Row area B '.uniqid())];
+        $departments = [(new Department())->setName('Row dept A '.uniqid()), (new Department())->setName('Row dept B '.uniqid())];
+        $project = (new Project())->setTitle('Dashboard rows '.uniqid());
+        foreach ($areas as $area) {
+            $project->addArea($area);
+        }
+        foreach ($departments as $department) {
+            $project->addOrganizationalAnchoring($department);
+        }
+        foreach ([...$areas, ...$departments, $project] as $entity) {
+            $em->persist($entity);
+        }
+        $em->flush();
+
+        $areaIds = array_map(static fn (Area $area): string => (string) $area->getId(), $areas);
+        $departmentIds = array_map(static fn (Department $department): string => (string) $department->getId(), $departments);
+
+        // The rows carry no project id, but these areas are unique to this project,
+        // so exactly one row lists both — and it must list both departments too,
+        // rather than being repeated once per area × department.
+        $rows = $this->repository->dashboardRows();
+        self::assertCount($this->repository->countAll(), $rows);
+        $matching = array_values(array_filter(
+            $rows,
+            static fn (array $row): bool => [] === array_diff($areaIds, $row['areas']),
+        ));
+        self::assertCount(1, $matching);
+        self::assertSame([], array_diff($departmentIds, $matching[0]['organizationalAnchoring']));
+
+        foreach ([$project, ...$areas, ...$departments] as $entity) {
+            $em->remove($entity);
+        }
+        $em->flush();
+    }
+
     /** @return list<string> */
     private function titles(ProjectFilter $filter): array
     {
diff --git a/tests/Service/DashboardDataTest.php b/tests/Service/DashboardDataTest.php
index 0c9f854..6895ac7 100644
--- a/tests/Service/DashboardDataTest.php
+++ b/tests/Service/DashboardDataTest.php
@@ -42,8 +42,9 @@ public function testBuildFromControlledRows(): void
     {
         $deptA = (new Department())->setName('A');
         $deptB = (new Department())->setName('B');
-        $shared = (new Area())->setName('Shared');
-        $solo = (new Area())->setName('Solo');
+        $shared = (string) (new Area())->setName('Shared')->getId();
+        $solo = (string) (new Area())->setName('Solo')->getId();
+        $third = (string) (new Area())->setName('Third')->getId();
 
         $departments = $this->createStub(DepartmentRepository::class);
         $departments->method('findAllOrdered')->willReturn([$deptA, $deptB]);
@@ -53,16 +54,19 @@ public function testBuildFromControlledRows(): void
         $projects = $this->createStub(ProjectRepository::class);
         $projects->method('dashboardRows')->willReturn([
             // "Shared" worked on in two departments -> counts as a collaboration.
-            ['area' => (string) $shared->getId(), 'status' => Status::Granted, 'organizationalAnchoring' => [$a], 'budget' => 1000],
-            ['area' => (string) $shared->getId(), 'status' => Status::Granted, 'organizationalAnchoring' => [$b], 'budget' => 2000],
+            ['areas' => [$shared], 'status' => Status::Granted, 'organizationalAnchoring' => [$a], 'budget' => 1000],
+            ['areas' => [$shared], 'status' => Status::Granted, 'organizationalAnchoring' => [$b], 'budget' => 2000],
             // "Solo" only in one department, and without a budget.
-            ['area' => (string) $solo->getId(), 'status' => Status::Granted, 'organizationalAnchoring' => [$a], 'budget' => null],
+            ['areas' => [$solo], 'status' => Status::Granted, 'organizationalAnchoring' => [$a], 'budget' => null],
             // Anchored in both departments (plus an id no department has, which is
             // dropped) but without an area: its budget counts under each department,
             // and it is no collaboration on its own since it has no area.
-            ['area' => null, 'status' => Status::Granted, 'organizationalAnchoring' => [$a, $b, 'unknown'], 'budget' => 500],
+            ['areas' => [], 'status' => Status::Granted, 'organizationalAnchoring' => [$a, $b, 'unknown'], 'budget' => 500],
+            // Two areas in one department: each area is marked as worked on in B,
+            // which puts "Solo" in both departments too, while "Third" stays in one.
+            ['areas' => [$solo, $third], 'status' => Status::Granted, 'organizationalAnchoring' => [$b], 'budget' => null],
             // No area/department/status -> exercises the null guards.
-            ['area' => null, 'status' => null, 'organizationalAnchoring' => [], 'budget' => null],
+            ['areas' => [], 'status' => null, 'organizationalAnchoring' => [], 'budget' => null],
         ]);
 
         $translator = $this->createStub(TranslatorInterface::class);
@@ -70,16 +74,16 @@ public function testBuildFromControlledRows(): void
 
         $data = (new DashboardData($projects, $departments, $translator))->build();
 
-        self::assertSame(5, $data['kpis']['total']);
-        self::assertSame(4, $data['kpis']['inProgress']);
+        self::assertSame(6, $data['kpis']['total']);
+        self::assertSame(5, $data['kpis']['inProgress']);
         self::assertSame(2, $data['kpis']['departments']);
         self::assertSame(2, $data['kpis']['departmentsTotal']);
-        // Only "Shared" spans >= 2 departments; "Solo" does not count.
-        self::assertSame(1, $data['kpis']['collaboration']);
+        // "Shared" and "Solo" span >= 2 departments; "Third" does not count.
+        self::assertSame(2, $data['kpis']['collaboration']);
         self::assertSame(['A', 'B'], array_column($data['departments'], 'label'));
         // A shared project's budget counts in full under each of its departments.
         self::assertSame([1500, 2500], $data['budgetByDept']);
-        self::assertSame(4, array_sum($data['statusDistribution']));
+        self::assertSame(5, array_sum($data['statusDistribution']));
         // The stubbed translator echoes the key, so labels are the enum label keys.
         self::assertContains(['key' => Status::Granted->value, 'label' => Status::Granted->labelKey()], $data['statuses']);
     }
diff --git a/tests/Unit/Entity/ProjectTest.php b/tests/Unit/Entity/ProjectTest.php
index 2a80fce..255032d 100644
--- a/tests/Unit/Entity/ProjectTest.php
+++ b/tests/Unit/Entity/ProjectTest.php
@@ -27,6 +27,7 @@ public function testDefaults(): void
         self::assertFalse($project->isEndorsement());
         self::assertSame([], $project->getFunding());
         self::assertSame([], $project->getLinks());
+        self::assertCount(0, $project->getAreas());
         self::assertCount(0, $project->getOrganizationalAnchoring());
         self::assertCount(0, $project->getStrategies());
         self::assertCount(0, $project->getTags());
@@ -41,12 +42,10 @@ public function testScalarAccessors(): void
     {
         $start = new \DateTimeImmutable('2025-01-01');
         $end = new \DateTimeImmutable('2025-12-31');
-        $area = (new Area())->setName('Klima og miljø');
 
         $project = (new Project())
             ->setTitle('Grøn omstilling')
             ->setTopic('Digital Europe Blueprint for Data Space')
-            ->setArea($area)
             ->setSummary('Opsummering')
             ->setDescription('Beskrivelse')
             ->setProjectType(ProjectType::Project)
@@ -60,7 +59,6 @@ public function testScalarAccessors(): void
 
         self::assertSame('Grøn omstilling', $project->getTitle());
         self::assertSame('Digital Europe Blueprint for Data Space', $project->getTopic());
-        self::assertSame($area, $project->getArea());
         self::assertSame('Opsummering', $project->getSummary());
         self::assertSame('Beskrivelse', $project->getDescription());
         self::assertSame(ProjectType::Project, $project->getProjectType());
@@ -80,7 +78,7 @@ public function testCompletionPercentage(): void
 
         $full = (new Project())
             ->setTitle('T')
-            ->setArea((new Area())->setName('Klima og miljø'))
+            ->addArea((new Area())->setName('Klima og miljø'))
             ->setSummary('S')
             ->setDescription('D')
             ->setProjectType(ProjectType::Project)
@@ -157,6 +155,27 @@ public function testOrganizationalAnchoringCollection(): void
         self::assertCount(0, $project->getOrganizationalAnchoring());
     }
 
+    public function testAreaCollection(): void
+    {
+        $project = new Project();
+        $area = (new Area())->setName('Klima og miljø');
+
+        $project->addArea($area);
+        $project->addArea($area);
+        self::assertCount(1, $project->getAreas());
+
+        $project->removeArea($area);
+        self::assertCount(0, $project->getAreas());
+
+        $project->setAreas([
+            (new Area())->setName('Mobilitet'),
+            (new Area())->setName('Velfærd'),
+        ]);
+        self::assertCount(2, $project->getAreas());
+        $project->setAreas([]);
+        self::assertCount(0, $project->getAreas());
+    }
+
     public function testStrategyCollection(): void
     {
         $project = new Project();
diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml
index ab9483b..45dc0a0 100644
--- a/translations/messages.da.yaml
+++ b/translations/messages.da.yaml
@@ -167,7 +167,7 @@ project:
     topic: Emne
     topic_help: Det overordnede program, projektet er en del af.
     area: Område
-    area_help: Det tematiske område projektet hører under.
+    area_help: Vælg et eller flere tematiske områder.
     summary: Opsummering
     summary_help: Kort opsummering af formål og indhold.
     description: Beskrivelse
@@ -180,7 +180,7 @@ project:
     status_additional: Status – supplerende tekst
     status_additional_help: Uddyb status, hvis der er behov.
     organizational_anchoring: Afdeling
-    organizational_anchoring_help: De afdelinger projektet er forankret i. Vælg flere, hvis projektet går på tværs.
+    organizational_anchoring_help: Vælg en eller flere afdelinger.
     endorsement: Er projektet vedtaget
     endorsement_author: Hvor er det vedtaget
     endorsement_author_help: Hvor projektet er vedtaget.
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index dade48e..d3394fd 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -167,7 +167,7 @@ project:
     topic: Topic
     topic_help: The wider programme this project is part of.
     area: Area
-    area_help: The thematic area the project belongs to.
+    area_help: Pick one or more thematic areas.
     summary: Summary
     summary_help: A brief summary of the purpose and content.
     description: Description
@@ -180,7 +180,7 @@ project:
     status_additional: Status – additional text
     status_additional_help: Add detail to the status if needed.
     organizational_anchoring: Department
-    organizational_anchoring_help: The departments the project is anchored in. Pick several for a cross-cutting project.
+    organizational_anchoring_help: Pick one or more departments.
     endorsement: Has the project been endorsed
     endorsement_author: Where it was endorsed
     endorsement_author_help: Where the project was endorsed.

From a283aeefae6acec845657ae89a3382e48ec91739 Mon Sep 17 00:00:00 2001
From: jekuaitk <jekua@aarhus.dk>
Date: Tue, 29 Sep 2026 17:25:59 +0200
Subject: [PATCH 2/2] 8383: Updated CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d397b7c..7a13c8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-40](https://github.com/itk-dev/itk-projects/pull/40)
+  Let a project belong to several areas, picked with a searchable multiselect.
 * [PR-33](https://github.com/itk-dev/itk-projects/pull/33)
   Let a project be anchored in several departments, picked with a searchable
   multiselect.