Review fixes

TheRestartProject · Jul 10, 2023 · e3e7db1 · e3e7db1
1 parent c36e953
commit e3e7db1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/app/Http/Controllers/API/GroupController.php b/app/Http/Controllers/API/GroupController.php
@@ -86,8 +86,6 @@ public static function getGroupsByUsersNetworks(Request $request)
         // New Collection Instance
         $collection = collect([]);
 
-        $countries = array_flip(\App\Helpers\Fixometer::getAllCountries());
-
         foreach ($groups as $group) {
             // If we have a bounding box, check that the group is within it.
             if (! $bbox || (
@@ -102,7 +100,8 @@ public static function getGroupsByUsersNetworks(Request $request)
                                       'timezone' => $group->timezone,
                                       'location' => [
                                           'value' => $group->location,
-                                          'country' => Fixometer::translateCountry($group->country_code, $countries),
+                                          'country' => Fixometer::getCountryFromCountryCode($group->country_code),
+                                          'country_code' => $group->country_code,
                                           'latitude' => $group->latitude,
                                           'longitude' => $group->longitude,
                                           'area' => $group->area,

diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
@@ -483,8 +483,6 @@ public static function expandGroups($groups, $your_groupids, $nearby_groupids)
         $user = Auth::user();
 
         if ($groups) {
-            $countries = array_flip(Fixometer::getAllCountries('en'));
-
             foreach ($groups as $group) {
                 $group_image = $group->groupImage;
 
@@ -513,7 +511,8 @@ public static function expandGroups($groups, $your_groupids, $nearby_groupids)
                         asset('uploads/mid_'.$group_image->image->path) : null,
                     'location' => [
                         'location' => rtrim($group->location),
-                        'country' => Fixometer::translateCountry($group->country_code, $countries),
+                        'country' => Fixometer::getCountryFromCountryCode($group->country_code),
+                        'country_code' => $group->country_code,
                         'distance' => $distance,
                     ],
                     'next_event' => $event ? $event->event_date_local : null,

diff --git a/database/migrations/2023_06_12_153317_country_codes.php b/database/migrations/2023_06_12_153317_country_codes.php
@@ -51,6 +51,14 @@ public function up()
      */
     public function down()
     {
-        //
+        Schema::table('groups', function (Blueprint $table) {
+            $table->dropColumn('country_code');
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->renameColumn('country_code', 'country');
+        });
+
+        DB::update(DB::raw("UPDATE users SET country = 'GBR' WHERE country = 'GB'"));
     }
 };
diff --git a/tests/Feature/Networks/NetworkTest.php b/tests/Feature/Networks/NetworkTest.php
@@ -93,6 +93,8 @@ public function admins_can_associate_group_to_network()
         $group = Group::factory()->create([
                                                    'latitude' => 51.5074,
                                                    'longitude' => -0.1278,
+                                                   'country_code' => 'GB',
+                                                   'country' => 'United Kingdom',
                                                ]);
 
         $network = Network::factory()->create();
@@ -131,6 +133,8 @@ public function admins_can_associate_group_to_network()
         $this->assertEquals(1, count($groups));
         $this->assertEquals($group->idgroups, $groups[0]['id']);
         $this->assertEquals($group->name, $groups[0]['name']);
+        $this->assertEquals($group->country, $groups[0]['location']['country']);
+        $this->assertEquals($group->country_code, $groups[0]['location']['country_code']);
 
         // Check that the event is listed.
         $this->assertEquals(1, count($groups[0]['past_parties']));