better contact creation logic

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.5.23",
+    "version": "0.5.24",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.5.23",
+    "version": "0.5.24",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.5.23",
+    "version": "0.5.24",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

server/src/Http/Controllers/Api/v1/ContactController.php

@@ -24,7 +24,9 @@ class ContactController extends Controller
     public function create(CreateContactRequest $request)
     {
         // get request input
-        $input = $request->only(['name', 'type', 'title', 'email', 'phone', 'meta']);
+        $input          = $request->only(['name', 'type', 'title', 'email', 'phone', 'meta', 'type']);
+        $input['phone'] = is_string($input['phone']) ? Utils::formatPhoneNumber($input['phone']) : $input['phone'];
+        $input['type']  = empty($input['type']) ? 'contact' : $input['type'];
 
         try {
             // create the contact
@@ -123,7 +125,6 @@ public function find($id)
      */
     public function delete($id)
     {
-        // find for the driver
         try {
             $contact = Contact::findRecordOrFail($id);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {

server/src/Models/Contact.php

@@ -207,6 +207,11 @@ public function routeNotificationForTwilio(): ?string
         return $this->phone;
     }
 
+    public function setPhoneAttribute(?string $value)
+    {
+        $this->attributes['phone'] = is_string($value) ? Utils::formatPhoneNumber($value) : $value;
+    }
+
     /**
      * Get avatar URL attribute.
      */
@@ -279,13 +284,27 @@ public static function createUserFromContact(Contact $contact, bool $sendInvite
     {
         // Check if user already exist with email or phone number
         $existingUser = User::where(function ($query) use ($contact) {
+            $query->where('company_uuid', $contact->company_uuid);
             $query->where('email', $contact->email);
             if ($contact->phone) {
-                $query->orWhere('phone', $contact->phone);
+                $query->orWhere('phone', Utils::formatPhoneNumber($contact->phone));
             }
         })->whereNull('deleted_at')->first();
         if ($existingUser) {
-            throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $existingUser);
+            // Check if existing user belongs to another contact
+            $existingUserContact = Contact::where(['user_uuid' => $existingUser->uuid, 'company_uuid' => $contact->company_uuid])->first();
+            if ($existingUserContact) {
+                throw new UserAlreadyExistsException('User already exists, try to assigning the user to this contact.', $existingUser);
+            } else {
+                // Assign the user to this contact instead
+                $contact->setAttribute('user_uuid', $existingUser->uuid);
+                if ($update) {
+                    $contact->update(['user_uuid' => $existingUser->uuid]);
+                }
+                $contact->setRelation('user', $existingUser);
+            }
+
+            return $existingUser;
         }
 
         // Load company
@@ -296,7 +315,7 @@ public static function createUserFromContact(Contact $contact, bool $sendInvite
             'company_uuid' => $contact->company_uuid,
             'name'         => $contact->name,
             'email'        => $contact->email,
-            'phone'        => $contact->phone,
+            'phone'        => Utils::formatPhoneNumber($contact->phone),
             'username'     => Str::slug($contact->name . '_' . Str::random(4), '_'),
             'password'     => Str::random(),
             'timezone'     => $contact->company->timezone ?? date_default_timezone_get(),