[News] fix visibility check (#11361)

parti-renaissance · Jan 24, 2025 · 49fe18b · 49fe18b
1 parent d949fa5
commit 49fe18b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Entity/EntityScopeVisibilityTrait.php b/src/Entity/EntityScopeVisibilityTrait.php
@@ -28,11 +28,8 @@ public function getZone(): ?Zone
 
     public function setZone(?Zone $zone): void
     {
-        $this->visibility = null !== $zone
-            ? ScopeVisibilityEnum::LOCAL
-            : ScopeVisibilityEnum::NATIONAL;
-
         $this->zone = $zone;
+        $this->visibility = $zone && !$zone->isFrance() ? ScopeVisibilityEnum::LOCAL : ScopeVisibilityEnum::NATIONAL;
     }
 
     public function getVisibility(): string

diff --git a/src/Entity/Geo/Zone.php b/src/Entity/Geo/Zone.php
@@ -345,4 +345,9 @@ public function isAssemblyZone(): bool
     {
         return $this->hasTag(ZoneTagEnum::ASSEMBLY);
     }
+
+    public function isFrance(): bool
+    {
+        return AddressInterface::FRANCE === $this->code;
+    }
 }
diff --git a/src/Entity/Jecoute/News.php b/src/Entity/Jecoute/News.php
@@ -333,7 +333,7 @@ public function setEnriched(bool $enriched): void
     public function setZone(?Zone $zone): void
     {
         $this->traitSetZone($zone);
-        $this->visibility = $this->zone || $this->committee ? ScopeVisibilityEnum::LOCAL : $this->visibility;
+        $this->updateVisibility();
     }
 
     public function getIndexOptions(): array
@@ -358,7 +358,9 @@ public function getFieldContainingDocuments(): string
 
     public function updateVisibility(): void
     {
-        $this->visibility = $this->zone || $this->committee ? ScopeVisibilityEnum::LOCAL : $this->visibility;
+        if ($this->isNationalVisibility() && $this->committee) {
+            $this->visibility = ScopeVisibilityEnum::LOCAL;
+        }
     }
 
     public function getCommittee(): ?Committee