refactor: improve phone number validation and database storage

Author: frooooooo7

app/Http/Requests/CourseRegistration/GuestCourseRegistrationRequest.php

@@ -27,7 +27,8 @@ public function rules(): array
             'name' => 'required|string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'last_name' => 'required|string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'email' => 'required|email|unique:users,email',
-            'phone' => 'required|regex:/^\+?\d{9,15}$/',
+            'phone' => 'phone:PL,INTERNATIONAL',
+            'phone_country' => 'required_with:phone_number|string|size:2',
         ];
     }
 
@@ -39,6 +40,7 @@ public function getGuestCourseRegistration(Course $course): StoreGuestCourseRegi
             $this->get('last_name'),
             $this->get('email'),
             $this->get('phone'),
+            $this->get('phone_country')
         );
     }
 }

app/Http/Requests/UpdateUserRequest.php

@@ -25,7 +25,8 @@ public function rules(): array
             'name' => 'string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'last_name' => 'string|min:2|max:30|regex:/^[a-zA-ZÀ-ž\s\'-]+$/',
             'email' => 'email|max:255|unique:users,email,'.$this->user->id,
-            'phone_number' => 'string|regex:/^\+?\d{9,15}$/',
+            'phone_number' => 'phone:PL,INTERNATIONAL',
+            'phone_country' => 'required_with:phone_number|string|size:2',
             'voivodship' => 'string|min:1|max:30',
             'city' => 'string|min:1|max:30',
             'zip_code' => 'string|regex:/^\d{2}-\d{3}$/',

app/Http/Resources/CourseRegistration/CourseRegistrationResource.php

@@ -21,6 +21,7 @@ public function toArray(Request $request): array
             'last_name' => $this->last_name,
             'email' => $this->email,
             'phone' => $this->phone,
+            'phone_country' => $this->phone_country,
             'status' => $this->status,
             'created_at' => $this->created_at?->toDateTimeString(),
             'updated_at' => $this->updated_at?->toDateTimeString(),

app/Http/Resources/UserResource.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class UserResource extends JsonResource
 {
@@ -19,7 +20,8 @@ public function toArray(Request $request): array
             'name' => $this->name,
             'last_name' => $this->last_name,
             'email' => $this->email,
-            'phone_number' => $this->phone_number,
+            'phone_number' => $this->formatPhoneNumber(),
+            'phone_country' => $this->phone_country,
             'voivodship' => $this->voivodship,
             'city' => $this->city,
             'zip_code' => $this->zip_code,
@@ -30,4 +32,18 @@ public function toArray(Request $request): array
             'updated_at' => $this->updated_at,
         ];
     }
+
+    private function formatPhoneNumber(): ?string
+    {
+        if (empty($this->phone_number)) {
+            return null;
+        }
+        try {
+            $phone = new PhoneNumber($this->phone_number, $this->phone_country);
+            return $phone->formatNational();
+        } catch (\Throwable $e) {
+            return $this->phone_number;
+        }
+    }
+
 }

app/Models/CourseRegistration.php

@@ -18,6 +18,7 @@ class CourseRegistration extends Model
         'last_name',
         'email',
         'phone',
+        'phone_country',
         'status',
     ];
 

app/Models/User.php

@@ -28,6 +28,7 @@ class User extends Authenticatable
         'email',
         'password',
         'phone_number',
+        'phone_country',
         'voivodship',
         'city',
         'zip_code',

app/Services/CourseRegistrationService.php

@@ -39,6 +39,7 @@ public function accept(CourseRegistration $courseRegistration): CourseRegistrati
             'last_name' => $courseRegistration->last_name,
             'email' => $courseRegistration->email,
             'phone_number' => $courseRegistration->phone,
+            'phone_country' => $courseRegistration->phone_country,
             'password' => Hash::make(Str::random(12)),
         ]);
 

app/Services/GuestCourseRegistrationService.php

@@ -4,11 +4,15 @@
 
 use App\Models\CourseRegistration;
 use App\ValueObjects\StoreGuestCourseRegistration;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class GuestCourseRegistrationService
 {
     public function store(StoreGuestCourseRegistration $data): CourseRegistration
     {
-        return CourseRegistration::create($data->toArray());
+        $phone = new PhoneNumber($data->getPhone(), $data->getPhoneCountry());
+        $dataArray = $data->toArray();
+        $dataArray['phone'] = $phone->formatE164();
+        return CourseRegistration::create($dataArray);
     }
 }

app/Services/UserService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Models\User;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class UserService
 {
@@ -13,6 +14,8 @@ public function show(User $user): User
 
     public function update(array $data, User $user): User
     {
+        $phone = new PhoneNumber($data['phone_number'], $data['phone_country']);
+        $data['phone_number'] = $phone->formatE164();
         $user->update($data);
 
         return $user;

app/ValueObjects/StoreGuestCourseRegistration.php

@@ -13,6 +13,7 @@ public function __construct(
         private string $last_name,
         private string $email,
         private string $phone,
+        private string $phone_country
     ) {}
 
     public function getCourseId(): int
@@ -40,6 +41,11 @@ public function getPhone(): string
         return $this->phone;
     }
 
+    public function getPhoneCountry(): string
+    {
+        return $this->phone_country;
+    }
+
     public function toArray(): array
     {
         return [
@@ -48,6 +54,7 @@ public function toArray(): array
             'last_name' => $this->getLast_Name(),
             'email' => $this->getEmail(),
             'phone' => $this->getPhone(),
+            'phone_country' => $this->getPhoneCountry(),
             'status' => RegistrationStatus::PENDING->value,
         ];
     }