@fleetbase/fleetops-engine 0.3.5 → 0.3.7

package/server/src/Http/Controllers/Api/v1/PayloadController.php

@@ -7,10 +7,9 @@ use Fleetbase\FleetOps\Http\Requests\UpdatePayloadRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Payload as PayloadResource;
 use Fleetbase\FleetOps\Models\Payload;
-use Fleetbase\FleetOps\Models\Place;
-use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 // use Fleetbase\FleetOps\Support\Utils;
 
@@ -25,41 +24,42 @@ class PayloadController extends Controller
      */
     public function create(CreatePayloadRequest $request)
     {
-        // get request input
-        $input = $request->only(['pickup', 'dropoff', 'type', 'return', 'waypoints', 'customer', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']);
+        $input     = $request->all();
+        $entities  = data_get($input, 'entities', []);
+        $waypoints = data_get($input, 'waypoints', []);
+        $pickup    = data_get($input, 'pickup');
+        $dropoff   = data_get($input, 'dropoff');
+        $return    = data_get($input, 'return');
 
         // make sure company is set
         $input['company_uuid'] = session('company');
 
         // create the payload
-        $payload = new Payload($input);
+        $payload = new Payload(Arr::only($input, ['type', 'provider', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']));
+
+        // if no pickup and dropoff extract from waypoints
+        if (empty($pickup) && empty($dropoff) && count($waypoints)) {
+            $pickup  = array_shift($waypoints);
+            $dropoff = array_pop($waypoints);
+        }
 
         // set pickup point
-        $payload->setPickup($request->input('pickup'));
+        $payload->setPickup($pickup);
 
         // set dropoff point
-        $payload->setDropoff($request->input('dropoff'));
+        $payload->setDropoff($dropoff);
 
         // set return point
-        $payload->setReturn($request->input('return'));
+        $payload->setReturn($return);
 
         // save payload
         $payload->save();
 
         // set waypoints
-        if ($request->has('waypoints') && is_array($request->input('waypoints'))) {
-            foreach ($request->input('waypoints') as $index => $place) {
-                // get place
-                $id = Place::createFromMixed($place);
-
-                // create waypoint
-                Waypoint::create([
-                    'place_uuid'   => $id,
-                    'payload_uuid' => $payload->uuid,
-                    'order'        => $index,
-                ]);
-            }
-        }
+        $payload->setWaypoints($waypoints);
+
+        // set entities
+        $payload->setEntities($entities);
 
         // response the driver resource
         return new PayloadResource($payload);
@@ -88,42 +88,40 @@ class PayloadController extends Controller
         }
 
         // get request input
-        $input = $request->only(['pickup', 'dropoff', 'type', 'return', 'waypoints', 'customer', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method']);
+        $input     = $request->all();
+        $entities  = data_get($input, 'entities', []);
+        $waypoints = data_get($input, 'waypoints', []);
+        $pickup    = data_get($input, 'pickup');
+        $dropoff   = data_get($input, 'dropoff');
+        $return    = data_get($input, 'return');
 
         // pickup assignment
-        if ($request->has('pickup')) {
-            $payload->setPickup($request->input('pickup'));
+        if ($pickup) {
+            $payload->setPickup($pickup);
         }
 
         // dropoff assignment
-        if ($request->has('dropoff')) {
-            $payload->setDropoff($request->input('dropoff'));
+        if ($dropoff) {
+            $payload->setDropoff($dropoff);
         }
 
         // return assignment
-        if ($request->has('return')) {
-            $payload->setReturn($request->input('return'));
+        if ($return) {
+            $payload->setReturn($return);
         }
 
         // set waypoints
-        if ($request->has('waypoints') && is_array($request->input('waypoints'))) {
-            $waypointCount = $payload->waypoints->count() ?? 0;
-
-            foreach ($request->input('waypoints') as $index => $place) {
-                // get place
-                $id = Place::createFromMixed($place);
-
-                // create waypoint
-                Waypoint::create([
-                    'place_uuid'   => $id,
-                    'payload_uuid' => $payload->uuid,
-                    'order'        => $index + $waypointCount,
-                ]);
-            }
+        if ($waypoints) {
+            $payload->setWaypoints($waypoints);
+        }
+
+        // set entities
+        if ($entities) {
+            $payload->setEntities($entities);
         }
 
         // update the payload
-        $payload->fill($input);
+        $payload->fill(array_filter(Arr::only($input, ['type', 'provider', 'meta', 'cod_amount', 'cod_currency', 'cod_payment_method'])));
 
         // save the payload
         $payload->save();

package/server/src/Http/Controllers/Api/v1/TrackingStatusController.php

@@ -6,9 +6,11 @@ use Fleetbase\FleetOps\Http\Requests\CreateTrackingStatusRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateTrackingStatusRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\TrackingStatus as TrackingStatusResource;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\TrackingStatus;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
+use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 
 class TrackingStatusController extends Controller
@@ -23,7 +25,24 @@ class TrackingStatusController extends Controller
     public function create(CreateTrackingStatusRequest $request)
     {
         // get request input
-        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'latitude', 'longitude']);
+        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'location', 'latitude', 'longitude']);
+
+        // if no location provided but latitude/longitude
+        if (empty($input['location']) && isset($input['latitude']) && isset($input['longitude'])) {
+            $latitude  = data_get($input, 'latitude');
+            $longitude = data_get($input, 'longitude');
+
+            // unset latitude and longitude
+            unset($input['latitude'], $input['longitude']);
+
+            // create location
+            $input['location'] = new Point($latitude, $longitude);
+        }
+
+        // if no code set create a code from the status
+        if (empty($input['code'])) {
+            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        }
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -36,6 +55,11 @@ class TrackingStatusController extends Controller
             ]);
         }
 
+        // tracking number assignment
+        if ($request->has('order')) {
+            $input['tracking_number_uuid'] = Order::where('public_id', $request->input('order'))->value('tracking_number_uuid');
+        }
+
         // create the trackingStatus
         $trackingStatus = TrackingStatus::create($input);
 
@@ -66,7 +90,24 @@ class TrackingStatusController extends Controller
         }
 
         // get request input
-        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'latitude', 'longitude']);
+        $input = $request->only(['status', 'details', 'code', 'city', 'province', 'postal_code', 'country', 'location', 'latitude', 'longitude']);
+
+        // if no location provided but latitude/longitude
+        if (empty($input['location']) && isset($input['latitude']) && isset($input['longitude'])) {
+            $latitude  = data_get($input, 'latitude');
+            $longitude = data_get($input, 'longitude');
+
+            // unset latitude and longitude
+            unset($input['latitude'], $input['longitude']);
+
+            // create location
+            $input['location'] = new Point($latitude, $longitude);
+        }
+
+        // if no code set create a code from the status
+        if (empty($input['code'])) {
+            $input['code'] = TrackingStatus::prepareCode($input['status']);
+        }
 
         // update the trackingStatus
         $trackingStatus->update($input);

package/server/src/Http/Controllers/Internal/v1/DriverController.php

@@ -4,14 +4,18 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\Exceptions\FleetbaseRequestValidationException;
 use Fleetbase\FleetOps\Exports\DriverExport;
+use Fleetbase\FleetOps\Http\Controllers\Api\v1\DriverController as ApiDriverController;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Requests\Internal\AssignOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\CreateDriverRequest;
 use Fleetbase\FleetOps\Http\Requests\Internal\UpdateDriverRequest;
 use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
+use Fleetbase\Models\VerificationCode;
 use Fleetbase\Notifications\UserInvited;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -267,4 +271,148 @@ class DriverController extends FleetOpsController
 
         return Excel::download(new DriverExport(), $fileName);
     }
+
+    /**
+     * Assigns a driver to a specified order.
+     *
+     * @param Fleetbase\FleetOps\Http\Requests\Internal\AssignOrderRequest $request
+     *
+     * @return \Illuminate\Http\Response $response
+     */
+    public function assignOrder(AssignOrderRequest $request)
+    {
+        $driver = Driver::where('public_id', $request->driver)->first();
+        $order  = Order::where('public_id', $request->order)->first();
+
+        if ($order->hasDriverAssigned) {
+            return response()->error('A driver is already assigned to this order.');
+        }
+
+        if ($order->isDriver($driver)) {
+            return response()->error('The driver is already assigned to this order.');
+        }
+
+        $order->assignDriver($driver);
+
+        return response()->json([
+            'status'  => 'ok',
+            'message' => 'Driver assigned',
+        ]);
+    }
+
+    /**
+     * Update drivers geolocation data.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function track(string $id, Request $request)
+    {
+        return app(ApiDriverController::class)->track($id, $request);
+    }
+
+    /**
+     * Query for Storefront Customer orders.
+     *
+     * @return \Fleetbase\Http\Resources\Storefront\Customer
+     */
+    public function registerDevice(Request $request)
+    {
+        return app(ApiDriverController::class)->registerDevice($request);
+    }
+
+    /**
+     * Authenticates customer using login credentials and returns with auth token.
+     *
+     * @return \Fleetbase\Http\Resources\Storefront\Customer
+     */
+    public function login(Request $request)
+    {
+        return app(ApiDriverController::class)->login($request);
+    }
+
+    /**
+     * Attempts authentication with phone number via SMS verification.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function loginWithPhone()
+    {
+        $phone = static::phone();
+
+        // Check if user exists
+        $user = User::where('phone', $phone)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+
+        if (!$user) {
+            return response()->error('No driver with this phone # found.');
+        }
+
+        // Generate verification token
+        VerificationCode::generateSmsVerificationFor($user, 'driver_login', function ($verification) {
+            return 'Your ' . config('app.name') . ' verification code is ' . $verification->code;
+        });
+
+        return response()->json(['status' => 'OK']);
+    }
+
+    /**
+     * Verifys SMS code and sends auth token with driver resource.
+     *
+     * @return \Fleetbase\Http\Resources\FleetOps\Driver
+     */
+    public function verifyCode(Request $request)
+    {
+        $identity = Utils::isEmail($request->identity) ? $request->identity : static::phone($request->identity);
+        $code     = $request->input('code');
+        $for      = $request->input('for', 'driver_login');
+        $attrs    = $request->input(['name', 'phone', 'email']);
+
+        if ($for === 'create_driver') {
+            return app(ApiDriverController::class)->create($request);
+        }
+
+        // Check if user exists
+        $user = User::where('phone', $identity)->orWhere('email', $identity)->first();
+        if (!$user) {
+            return response()->error('Unable to verify code.');
+        }
+
+        // Find and verify code
+        $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
+        if (!$verificationCode && $code !== config('fleetops.navigator.bypass_verification_code')) {
+            return response()->error('Invalid verification code!');
+        }
+
+        // Get driver record
+        $driver = Driver::where('user_uuid', $user->uuid)->whereNull('deleted_at')->withoutGlobalScopes()->first();
+        if (!$driver) {
+            return response()->error('No driver/agent record found for login.');
+        }
+
+        // Generate auth token
+        try {
+            $token = $user->createToken($driver->uuid);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        }
+
+        $driver->token = $token->plainTextToken;
+
+        return new $this->resource($driver);
+    }
+
+    /**
+     * Patches phone number with international code.
+     */
+    public static function phone(string $phone = null): string
+    {
+        if ($phone === null) {
+            $phone = request()->input('phone');
+        }
+
+        if (!Str::startsWith($phone, '+')) {
+            $phone = '+' . $phone;
+        }
+
+        return $phone;
+    }
 }

package/server/src/Http/Controllers/Internal/v1/MorphController.php

@@ -2,12 +2,16 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
+use Fleetbase\FleetOps\Http\Filter\ContactFilter;
+use Fleetbase\FleetOps\Http\Filter\VendorFilter;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
 use Fleetbase\FleetOps\Models\Vendor;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
 
 class MorphController extends Controller
@@ -21,18 +25,26 @@ class MorphController extends Controller
     {
         $query        = $request->input('query');
         $limit        = $request->input('limit', 12);
+        $page         = $request->input('page', 1);
         $type         = Str::lower($request->segment(4));
         $resourceType = Str::lower(Utils::singularize($type));
 
-        $contacts = Contact::searchWhere('name', $query)
+        $contactsQuery = Contact::searchWhere('name', $query)
             ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+            ->filter(new ContactFilter($request));
 
-        $vendors = Vendor::searchWhere('name', $query)
+        $vendorsQuery = Vendor::searchWhere('name', $query)
             ->where('company_uuid', session('company'))
-            ->limit($limit)
-            ->get();
+            ->filter(new VendorFilter($request));
+
+        // Get total count for pagination
+        $totalContacts = $contactsQuery->count();
+        $totalVendors  = $vendorsQuery->count();
+        $total         = $totalContacts + $totalVendors;
+
+        // Get paginated items
+        $contacts = $contactsQuery->limit($limit)->get();
+        $vendors  = $vendorsQuery->limit($limit)->get();
 
         $results = collect([...$contacts, ...$vendors])
             ->sortBy('name')
@@ -59,19 +71,39 @@ class MorphController extends Controller
             }
         }
 
-        // convert to array
-        $results = $results->toArray();
-
         // set resource type
-        $results = array_map(
-            function ($attributes) use ($resourceType) {
-                $attributes['type'] = $resourceType;
+        $results = $results->map(
+            function ($item) use ($resourceType) {
+                $item['type'] = $resourceType;
 
-                return $attributes;
-            },
-            $results
+                return $item;
+            }
         );
 
-        return response()->json([$type => $results]);
+        // Create a LengthAwarePaginator instance
+        $results = new LengthAwarePaginator(
+            $results->forPage($page, $limit),
+            $total,
+            $limit,
+            $page,
+            ['path' => URL::current()]
+        );
+
+        // Manually structure the response
+        $response = [
+            $type  => $results->items(),
+            'meta' => [
+                'total'         => $results->total(),
+                'per_page'      => $results->perPage(),
+                'current_page'  => $results->currentPage(),
+                'last_page'     => $results->lastPage(),
+                'next_page_url' => $results->nextPageUrl(),
+                'prev_page_url' => $results->previousPageUrl(),
+                'from'          => $results->firstItem(),
+                'to'            => $results->lastItem(),
+            ],
+        ];
+
+        return response()->json($response);
     }
 }

package/server/src/Http/Controllers/Internal/v1/NavigatorController.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Http\Resources\Organization;
+use Fleetbase\Models\ApiCredential;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+
+class NavigatorController extends Controller
+{
+    public function linkApp()
+    {
+        $adminUser = User::where('type', 'admin')->first();
+
+        if ($adminUser->company) {
+            $apiCredential = ApiCredential::firstOrCreate(
+                [
+                    'user_uuid'    => $adminUser->uuid,
+                    'company_uuid' => $adminUser->company_uuid,
+                    'name'         => 'NavigationAppLinker',
+                ],
+                [
+                    'user_uuid'    => $adminUser->uuid,
+                    'company_uuid' => $adminUser->company->uuid,
+                    'name'         => 'NavigationAppLinker',
+                ]
+            );
+
+            return redirect()->away('flbnavigator://configure?key=' . $apiCredential->key . '&host=' . url()->secure('/'));
+        }
+
+        return response()->error('Organization for linking not found.');
+    }
+
+    public function getLinkAppUrl()
+    {
+        return response()->json([
+            'linkUrl' => url('int/v1/fleet-ops/navigator/link-app'),
+        ]);
+    }
+
+    public function getCurrentOrganization(Request $request)
+    {
+        $token       = $request->bearerToken();
+        $isSecretKey = Str::startsWith($token, '$');
+
+        // Depending on API key format set the connection to find credential on
+        $connection = Str::startsWith($token, 'flb_test_') ? 'sandbox' : 'mysql';
+
+        // Find the API Credential record
+        $findApKey = ApiCredential::on($connection)
+            ->where(function ($query) use ($isSecretKey, $token) {
+                if ($isSecretKey) {
+                    $query->where('secret', $token);
+                } else {
+                    $query->where('key', $token);
+                }
+            })
+            ->with(['company.owner'])
+            ->withoutGlobalScopes();
+
+        // Get the api credential model record
+        $apiCredential = $findApKey->first();
+
+        // Handle no api credential found
+        if (!$apiCredential) {
+            return response()->error('No API key found to fetch company details with.');
+        }
+
+        // Get the organization owning the API key
+        $organization = Company::where('uuid', $apiCredential->company_uuid)->first();
+
+        return new Organization($organization);
+    }
+}

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -129,6 +129,7 @@ class OrderController extends FleetOpsController
     public function importFromFiles(Request $request)
     {
         $info    = Utils::lookupIp();
+        $disk    = $request->input('disk', config('filesystems.default'));
         $files   = $request->input('files');
         $files   = File::whereIn('uuid', $files)->get();
         $country = $request->input('country', Utils::or($info, ['country_name', 'region'], 'Singapore'));
@@ -143,7 +144,7 @@ class OrderController extends FleetOpsController
             }
 
             try {
-                $data = Excel::toArray(new OrdersImport(), $file->path, 's3');
+                $data = Excel::toArray(new OrdersImport(), $file->path, $disk);
             } catch (\Exception $e) {
                 return response()->error('Invalid file, unable to proccess.');
             }
@@ -177,7 +178,7 @@ class OrderController extends FleetOpsController
                     $entity = new Entity(['name' => $itemName]);
                     $entity->setAttribute('destination_uuid', $place->uuid);
                     $entity->setAttribute('_import_id', $importId);
-                    $entity->setMetas($place->getMeta());
+                    $entity->setMeta($place->getMeta());
                     $entities[] = $entity;
                 }
             }

package/server/src/Http/Controllers/Internal/v1/PlaceController.php

@@ -76,7 +76,7 @@ class PlaceController extends FleetOpsController
             }
         }
 
-        return response()->json($results);
+        return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }
 
     /**
@@ -113,7 +113,7 @@ class PlaceController extends FleetOpsController
             }
         }
 
-        return response()->json($results);
+        return response()->json($results)->withHeaders(['Cache-Control' => 'no-cache']);
     }
 
     /**

package/server/src/Http/Requests/CreateDriverRequest.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Illuminate\Validation\Rule;
 
@@ -37,6 +38,7 @@ class CreateDriverRequest extends FleetbaseRequest
             'status'   => 'nullable|string|in:active,inactive',
             'vendor'   => 'nullable|exists:vendors,public_id',
             'job'      => 'nullable|exists:orders,public_id',
+            'location' => ['nullable', new ResolvablePoint()],
         ];
     }
 

package/server/src/Http/Requests/CreateOrderRequest.php

@@ -46,8 +46,16 @@ class CreateOrderRequest extends FleetbaseRequest
 
             if ($this->isArray('payload')) {
                 $validations['payload']         = 'required';
-                $validations['payload.pickup']  = 'required';
-                $validations['payload.dropoff'] = 'required';
+
+                if ($this->missing('payload.waypoints')) {
+                    $validations['payload.pickup']  = 'required';
+                    $validations['payload.dropoff'] = 'required';
+                }
+
+                if ($this->missing(['payload.pickup', 'payload.dropoff'])) {
+                    $validations['payload.waypoints'] = 'required|array|min:2';
+                }
+
                 $validations['payload.return']  = 'nullable';
             }
 
@@ -57,8 +65,14 @@ class CreateOrderRequest extends FleetbaseRequest
         }
 
         if ($this->missing('payload') && $this->isMethod('POST')) {
-            $validations['pickup']  = 'required';
-            $validations['dropoff'] = 'required';
+            if ($this->missing('waypoints')) {
+                $validations['pickup']  = 'required';
+                $validations['dropoff'] = 'required';
+            }
+
+            if ($this->missing(['pickup', 'dropoff'])) {
+                $validations['waypoints'] = 'required|array|min:2';
+            }
         }
 
         return $validations;