Merge branch 'feature/double-territories' into dev

* feature/double-territories: finalizes the countries bug. # Conflicts: # app/Services/GroupedSubmissionsService.php
digital-services-act · Apr 23, 2024 · fdc18e0 · fdc18e0
2 parents edc2053 + 81a143e
commit fdc18e0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/app/Services/EuropeanCountriesService.php b/app/Services/EuropeanCountriesService.php
@@ -163,7 +163,7 @@ public function getOptionsArray(): array
  public function filterSortEuropeanCountries(array $countries): array
  {
  $intersection = array_intersect($countries, self::EUROPEAN_COUNTRY_CODES) ?? [];
- $filtered = array_unique($intersection);
+ $filtered = array_unique(array_values($intersection));
  sort($filtered);
  return $filtered;
  }

diff --git a/app/Services/GroupedSubmissionsService.php b/app/Services/GroupedSubmissionsService.php
@@ -146,7 +146,7 @@ public function sanitizePayload(
 
  try {
  $payload['statements'][$index] = $validator->validated();
- $payload['statements'][$index]['territorial_scope'] = $this->european_countries_service->filterSortEuropeanCountries($statement['territorial_scope'] ?? []);
+ $payload['statements'][$index]['territorial_scope'] = $this->european_countries_service->filterSortEuropeanCountries($payload['statements'][$index]['territorial_scope'] ?? []);
  } catch (ValidationException) {
  }
  }

diff --git a/tests/Feature/Models/StatementTest.php b/tests/Feature/Models/StatementTest.php
@@ -5,6 +5,7 @@
 
 use App\Models\Statement;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class StatementTest extends TestCase
@@ -61,6 +62,25 @@ public function territorial_scope_is_always_sorted(): void
  $statement->save();
  $statement->refresh();
 
+ // Get it back in alpha order
+ $territorial_scope = $statement->territorial_scope;
+ $this->assertEquals(["AU", "BE", "SK"], $territorial_scope);
+ }
+
+ /**
+ * @return void
+ * @test
+ */
+ public function territorial_scope_is_always_unique(): void
+ {
+ $statement = Statement::all()->random()->first();
+
+ // Store in non alpha order
+ $statement->territorial_scope = ['SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'AU', 'AU', 'AU'];
+ $statement->save();
+ $statement->refresh();
+
+
  // Get it back in alpha order
  $territorial_scope = $statement->territorial_scope;
  $this->assertEquals(["AU", "BE", "SK"], $territorial_scope);

diff --git a/tests/Feature/Services/EuropeanCountriesServiceTest.php b/tests/Feature/Services/EuropeanCountriesServiceTest.php
@@ -42,6 +42,18 @@ public function it_condenses_european_union_countries(): void
  $this->assertEquals(['European Union'], $names);
  }
 
+ /**
+ * @return void
+ * @test
+ */
+ public function it_condenses_countries_uniquely(): void
+ {
+ $country_codes = ['SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'SK', 'BE', 'AU', 'AU', 'AU', 'AU'];
+ $result = $this->european_countries_service->filterSortEuropeanCountries($country_codes);
+ $this->assertEquals(["BE", "SK"], $result);
+ }
+
+
  /**
  * @return void
  * @test