Merge pull request #412 from CnCNet/develop

Develop

Author: Sneer-ra2

cncnet-api/app/Models/MapPool.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Log;
 
 class MapPool extends Model {
 
@@ -41,9 +42,7 @@ public function tiers()
 
     public function invalidPairs(): array
     {
-        $raw = $this->invalid_faction_pairs ?? '[]';
-        $arr = json_decode($raw, true);
-        return is_array($arr) ? $arr : [];
+        return $this->invalid_faction_pairs ?? [];
     }
 
     public function isValidPair(int $faction1, int $faction2): bool

cncnet-api/tests/Feature/Api/Duplicates/FactionPolicyServiceTest.php

@@ -87,7 +87,7 @@ public function applyPolicy1v1_no_map_candidates_keeps_sides(): void
         $pool = new MapPool();
         $pool->forced_faction_id     = 5;
         $pool->forced_faction_ratio  = 0.5;
-        $pool->invalid_faction_pairs = json_encode([]);
+        $pool->invalid_faction_pairs = [];
 
         // Map allows factions 1, 2, 3, 4, but not 5.
         $qmMap = $this->mockQmMap([1,2,3,4]);
@@ -111,7 +111,7 @@ public function applyPolicy1v1_one_candidate_applies(): void
         $pool = new MapPool();
         $pool->forced_faction_id     = 9;
         $pool->forced_faction_ratio  = 0.5;
-        $pool->invalid_faction_pairs = json_encode([[0, 6], [0, 0], [6, 6], [9, 9]]);
+        $pool->invalid_faction_pairs = [[0, 6], [0, 0], [6, 6], [9, 9]];
 
         // Map allows forced faction.
         $qmMap = $this->mockQmMap([0, 6, 9]);
@@ -163,7 +163,7 @@ public function applyPolicy1v1_test_avs_month(): void
         $pool = new MapPool();
         $pool->forced_faction_id     = 0;
         $pool->forced_faction_ratio  = 0.5;
-        $pool->invalid_faction_pairs = json_encode([[ 0, 0 ], [ 6, 6 ]]);
+        $pool->invalid_faction_pairs = [[ 0, 0 ], [ 6, 6 ]];
 
         $qmMap = $this->mockQmMap([0, 6]);