fix: Removal URL encoding from MetarRetrievalService

VATSIM-UK · Feb 17, 2025 · 2ec654c · 2ec654c
1 parent 7d32fc3
commit 2ec654c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/Services/Metar/MetarRetrievalService.php b/app/Services/Metar/MetarRetrievalService.php
@@ -11,7 +11,7 @@ class MetarRetrievalService
 {
     public function retrieveMetars(Collection $airfields): Collection
     {
-        $metarResponse = Http::get(config('metar.vatsim_url'), ['id' => $this->getMetarQueryString($airfields)]);
+        $metarResponse = Http::get($this->getMetarUrl($airfields));
         if (!$metarResponse->ok()) {
             Log::error(
                 sprintf(
@@ -35,6 +35,15 @@ public function retrieveMetars(Collection $airfields): Collection
             })->filter();
     }
 
+    private function getMetarUrl(Collection $airfields)
+    {
+        return sprintf('%s%s%s',
+            config('metar.vatsim_url'),
+            "?id=",
+            $this->getMetarQueryString($airfields)
+        );
+    }
+
     private function getMetarQueryString(Collection $airfields): string
     {
         return $airfields->concat([Carbon::now()->timestamp])->implode(',');

diff --git a/tests/app/Services/Metar/MetarRetrievalServiceTest.php b/tests/app/Services/Metar/MetarRetrievalServiceTest.php
@@ -31,7 +31,7 @@ public function testItThrowsExceptionOnBadResponse()
                 sprintf(
                     '%s?id=%s',
                     config(self::URL_CONFIG_KEY),
-                    urlencode('EGLL,EGBB,EGKR,' . $this->expectedTimestamp)
+                    'EGLL,EGBB,EGKR,' . $this->expectedTimestamp
                 ) => Http::response('', 500),
             ]
         );
@@ -54,7 +54,7 @@ public function testItReturnsMetars()
                 sprintf(
                     '%s?id=%s',
                     config(self::URL_CONFIG_KEY),
-                    urlencode('EGLL,EGBB,EGKR,' . $this->expectedTimestamp)
+                    'EGLL,EGBB,EGKR,' . $this->expectedTimestamp
                 ) => Http::response(
                     implode("\n", $dataResponse)
                 ),