Merge pull request #665 from TheRestartProject/RES-1908_country_codes

RES-1908 country codes
TheRestartProject · Aug 2, 2023 · 1abc978 · 1abc978
2 parents fd9e597 + b81db47
commit 1abc978
Show file tree

Hide file tree

Showing 42 changed files with 216 additions and 112 deletions.
diff --git a/app/Console/Commands/CheckGroupLocations.php b/app/Console/Commands/CheckGroupLocations.php
@@ -19,7 +19,7 @@ class CheckGroupLocations extends Command
      *
      * @var string
      */
-    protected $description = 'Check that all gtroup locations are geocodeable';
+    protected $description = 'Check that all group locations are geocodeable';
 
     /**
      * Create a new command instance.

diff --git a/app/Console/Commands/FixLatitudeLongitude.php b/app/Console/Commands/FixLatitudeLongitude.php
diff --git a/app/Console/Commands/GroupCountryField.php b/app/Console/Commands/GroupCountryField.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Group;
+use App\Helpers\Fixometer;
+use Illuminate\Console\Command;
+
+class GroupCountryField extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'groups:country';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Set the group country field from the country_code field';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $groups = Group::all();
+
+        foreach ($groups as $group) {
+            $group->country = Fixometer::getCountryFromCountryCode($group->country_code);
+            $group->save();
+        }
+    }
+}
diff --git a/app/Console/Commands/ImportGroups.php b/app/Console/Commands/ImportGroups.php
@@ -61,7 +61,7 @@ public function handle()
                     return iconv( "iso-8859-15", "UTF-8", $str );
                 }, $fields);
 
-                // Format is  'Name', 'Location', 'Postcode', 'Area', 'Country', 'Latitude', 'Longitude', 'Website', 'Phone', 'Networks', 'Description'.
+                // Format is  'Name', 'Location', 'Postcode', 'Area', 'CountryCode', 'Latitude', 'Longitude', 'Website', 'Phone', 'Networks', 'Description'.
 
                 $groupname = $fields[0];
                 $location = $fields[1];
@@ -122,7 +122,7 @@ public function handle()
                     $group->area = $area;
                     $group->latitude = $lat;
                     $group->longitude = $lng;
-                    $group->country = $country;
+                    $group->country_code = $country;
                     $group->website = $website;
                     $group->phone = $phone;
                     $group->free_text = $description;

diff --git a/app/Console/Commands/SyncEvents.php b/app/Console/Commands/SyncEvents.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Group;
+use App\Helpers\Fixometer;
 use App\Party;
 use DateTime;
 use Illuminate\Console\Command;
@@ -77,7 +78,7 @@ public function handle()
 
                 $custom_fields = [
                     ['key' => 'party_grouphash', 'value' => $event->group],
-                    ['key' => 'party_groupcountry', 'value' => $group->country],
+                    ['key' => 'party_groupcountry', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                     ['key' => 'party_groupcity', 'value' => $group->area],
                     ['key' => 'party_venue', 'value' => $event->venue],
                     ['key' => 'party_location', 'value' => $event->location],

diff --git a/app/Console/Commands/SyncGroups.php b/app/Console/Commands/SyncGroups.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Group;
+use App\Helpers\Fixometer;
 use Illuminate\Console\Command;
 
 class SyncGroups extends Command
@@ -54,7 +55,7 @@ public function handle()
             try {
                 $custom_fields = [
                     ['key' => 'group_city', 'value' => $group->area],
-                    ['key' => 'group_country', 'value' => $group->country],
+                    ['key' => 'group_country', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                     ['key' => 'group_website', 'value' => $group->website],
                     ['key' => 'group_hash', 'value' => $group->idgroups],
                     ['key' => 'group_latitude', 'value' => $group->latitude],

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -41,6 +41,8 @@ protected function schedule(Schedule $schedule)
             ->daily()
             ->sendOutputTo(storage_path().'/logs/discourse_usernames.log')
             ->emailOutputTo(env('SEND_COMMAND_LOGS_TO'), 'tech@therestartproject.org');
+
+        $schedule->command('groups:country')->hourly();
     }
 
     /**

diff --git a/app/Group.php b/app/Group.php
@@ -34,7 +34,7 @@ class Group extends Model implements Auditable
         'postcode',
         'latitude',
         'longitude',
-        'country',
+        'country_code',
         'free_text',
         'facebook',
         'wordpress_post_id',

diff --git a/app/Helpers/Geocoder.php b/app/Helpers/Geocoder.php
@@ -30,14 +30,14 @@ public function geocode($location)
 
                     foreach ($decoded->{'address_components'} as $component) {
                         if ($component->types && count($component->types) && $component->types[0] === 'country') {
-                            $country = $component->long_name;
+                            $country_code = $component->short_name;
                         }
                     }
 
                     return [
                         'latitude' => $latitude,
                         'longitude' => $longitude,
-                        'country' => $country,
+                        'country_code' => $country_code,
                     ];
                 }
             }

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, $countries),
+                                          'country' => Fixometer::getCountryFromCountryCode($group->country_code),
+                                          'country_code' => $group->country_code,
                                           'latitude' => $group->latitude,
                                           'longitude' => $group->longitude,
                                           'area' => $group->area,
@@ -606,7 +605,7 @@ public function createGroupv2(Request $request) {
             'postcode' => $postcode,
             'latitude' => $latitude,
             'longitude' => $longitude,
-            'country' => $country,
+            'country_code' => $country,
             'free_text' => $description,
             'shareable_code' => Fixometer::generateUniqueShareableCode(\App\Group::class, 'shareable_code'),
             'timezone' => $timezone,
@@ -750,7 +749,7 @@ public function updateGroupv2(Request $request, $idGroup) {
             'location' => $location,
             'latitude' => $latitude,
             'longitude' => $longitude,
-            'country' => $country,
+            'country_code' => $country,
             'free_text' => $description,
             'timezone' => $timezone,
             'phone' => $phone,
@@ -875,7 +874,7 @@ private function validateGroupParams(Request $request, $create): array {
 
         $latitude = null;
         $longitude = null;
-        $country = null;
+        $country_code = null;
 
         if ($timezone && !in_array($timezone, \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC))) {
             throw ValidationException::withMessages(['location ' => __('partials.validate_timezone')]);
@@ -895,7 +894,7 @@ private function validateGroupParams(Request $request, $create): array {
 
             // Note that the country returned by the geocoder is already in English, which is what we need for the
             // value in the database.
-            $country = $geocoded['country'];
+            $country_code = $geocoded['country_code'];
         }
 
         return array(
@@ -909,7 +908,7 @@ private function validateGroupParams(Request $request, $create): array {
             $timezone,
             $latitude,
             $longitude,
-            $country,
+            $country_code,
             $network_data,
         );
     }

diff --git a/app/Http/Controllers/API/UserGroupsController.php b/app/Http/Controllers/API/UserGroupsController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API;
 
 use App\Group;
+use App\Helpers\Fixometer;
 use App\Http\Controllers\Controller;
 use App\Role;
 use App\User;
@@ -83,7 +84,7 @@ protected static function mapDetailsAndAuditToChange($userGroupAssociation, $aud
         $group = Group::find($userGroupAssociation->group);
         $userGroupChange['group_name'] = $group->name;
         $userGroupChange['group_area'] = $group->area;
-        $userGroupChange['group_country'] = $group->country;
+        $userGroupChange['group_country'] = Fixometer::getCountryFromCountryCode($group->country_code);
 
         return $userGroupChange;
     }

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, $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/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -157,7 +157,7 @@ public function postProfileInfoEdit(Request $request, App\Helpers\Geocoder $geoc
         User::find($id)->update([
         'email'    => $request->input('email'),
         'name'     => $request->input('name'),
-        'country'  => $request->input('country'),
+        'country_code' => $request->input('country'),
         'location' => $request->input('townCity'),
         'age'      => $request->input('age'),
         'gender'   => $request->input('gender'),
@@ -171,7 +171,7 @@ public function postProfileInfoEdit(Request $request, App\Helpers\Geocoder $geoc
         }
 
         if (! empty($user->location)) {
-            $geocoded = $geocoder->geocode("{$user->location}, {$user->country}");
+            $geocoded = $geocoder->geocode("{$user->location}, " . Fixometer::getCountryFromCountryCode($user->country_code));
             if (! empty($geocoded)) {
                 $user->latitude = $geocoded['latitude'];
                 $user->longitude = $geocoded['longitude'];
@@ -536,7 +536,7 @@ public function all()
                 $user['permissions'] = $User->getRolePermissions($user->role);
                 $user['groups'] = $user->groups;
                 $user['lastLogin'] = $user->lastLogin();
-                $user['country'] = Fixometer::getCountryFromCountryCode($user->country);
+                $user['country'] = Fixometer::getCountryFromCountryCode($user->country_code);
 
                 return $user;
             });
@@ -607,7 +607,7 @@ public function search(Request $request)
                 $user['permissions'] = $User->getRolePermissions($user->role);
                 $user['groups'] = $user->groups;
                 $user['lastLogin'] = $user->lastLogin();
-                $user['country'] = Fixometer::getCountryFromCountryCode($user->country);
+                $user['country'] = Fixometer::getCountryFromCountryCode($user->country_code);
 
                 return $user;
             });
@@ -920,7 +920,7 @@ public function postRegister(Request $request, $hash = null)
 
         if (Auth::check()) { //Existing users are to update
             $user = User::find(Auth::user()->id);
-            $user->country = $request->input('country');
+            $user->country_code = $request->input('country');
             $user->location = $request->input('city');
             $user->gender = $request->input('gender');
             $user->age = $request->input('age');
@@ -935,7 +935,7 @@ public function postRegister(Request $request, $hash = null)
                 'role' => $role,
                 'recovery' => substr(bin2hex(openssl_random_pseudo_bytes(32)), 0, 24),
                 'recovery_expires' => strftime('%Y-%m-%d %X', time() + (24 * 60 * 60)),
-                'country' => $request->input('country'),
+                'country_code' => $request->input('country'),
                 'location' => $request->input('city'),
                 'gender' => $request->input('gender'),
                 'age' => $request->input('age'),

diff --git a/app/Http/Resources/GroupLocation.php b/app/Http/Resources/GroupLocation.php
@@ -30,6 +30,12 @@
  *          example="United Kingdom"
  *     ),
  *     @OA\Property(
+ *          property="country_code",
+ *          description="The two-letter ISO country code.",
+ *          format="string",
+ *          example="GB"
+ *     ),
+ *     @OA\Property(
  *          property="lat",
  *          title="lat",
  *          description="Latitude of the group.",
@@ -66,7 +72,8 @@ public function toArray($request)
             'location' => $this->location,
             'area' => $this->area,
             'postcode' => $this->postcode,
-            'country' => \App\Helpers\Fixometer::translateCountry($this->country),
+            'country' => \App\Helpers\Fixometer::getCountryFromCountryCode($this->country_code),
+            'country_code' => $this->country_code,
             'lat' => $this->latitude,
             'lng' => $this->longitude,
         ];

diff --git a/app/Listeners/CreateWordpressPostForEvent.php b/app/Listeners/CreateWordpressPostForEvent.php
@@ -80,7 +80,7 @@ public function createEventOnWordpress($theParty): void
                 ['key' => 'party_venue', 'value' => $theParty->venue],
                 ['key' => 'party_location', 'value' => $theParty->location],
                 ['key' => 'party_time', 'value' => $theParty->getEventStartEndLocal()],
-                ['key' => 'party_groupcountry', 'value' => $group->country],
+                ['key' => 'party_groupcountry', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                 ['key' => 'party_groupcity', 'value' => $group->area],
                 ['key' => 'party_date', 'value' => $theParty->event_date_local],
                 ['key' => 'party_timestamp', 'value' => $startTimestamp],

diff --git a/app/Listeners/CreateWordpressPostForGroup.php b/app/Listeners/CreateWordpressPostForGroup.php
@@ -72,7 +72,7 @@ public function createGroupOnWordpress($group): void
         if (!$group->wordpress_post_id) {
             $custom_fields = [
                 ['key' => 'group_city', 'value' => $group->area],
-                ['key' => 'group_country', 'value' => $group->country],
+                ['key' => 'group_country', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                 ['key' => 'group_website', 'value' => $group->website],
                 ['key' => 'group_hash', 'value' => $group->idgroups],
                 ['key' => 'group_avatar_url', 'value' => $group->groupImagePath()],

diff --git a/app/Listeners/EditWordpressPostForEvent.php b/app/Listeners/EditWordpressPostForEvent.php
@@ -53,7 +53,7 @@ public function handle(EditEvent $event)
 
                 $custom_fields = [
                     ['key' => 'party_grouphash', 'value' => $data['group']],
-                    ['key' => 'party_groupcountry', 'value' => $group->country],
+                    ['key' => 'party_groupcountry', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                     ['key' => 'party_groupcity', 'value' => $group->area],
                     ['key' => 'party_venue', 'value' => $data['venue']],
                     ['key' => 'party_location', 'value' => $data['location']],

diff --git a/app/Listeners/EditWordpressPostForGroup.php b/app/Listeners/EditWordpressPostForGroup.php
@@ -45,7 +45,7 @@ public function handle(EditGroup $event)
             if (is_numeric($group->wordpress_post_id)) {
                 $custom_fields = [
                     ['key' => 'group_city', 'value' => $group->area],
-                    ['key' => 'group_country', 'value' => $group->country],
+                    ['key' => 'group_country', 'value' => Fixometer::getCountryFromCountryCode($group->country_code)],
                     ['key' => 'group_website', 'value' => $data['website']],
                     ['key' => 'group_hash', 'value' => $id],
                     ['key' => 'group_avatar_url', 'value' => $data['group_avatar']],