@fleetbase/fleetops-engine 0.4.16 → 0.4.18

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

@@ -0,0 +1,132 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
+
+use Fleetbase\FleetOps\Http\Requests\CreateIssueRequest;
+use Fleetbase\FleetOps\Http\Requests\UpdateIssueRequest;
+use Fleetbase\FleetOps\Http\Resources\v1\Issue as DeletedIssue;
+use Fleetbase\FleetOps\Http\Resources\v1\Issue as IssueResource;
+use Fleetbase\FleetOps\Models\Driver;
+use Fleetbase\FleetOps\Models\Issue;
+use Fleetbase\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class IssueController extends Controller
+{
+    /**
+     * Creates a new Fleetbase Issue resource.
+     *
+     * @param \Fleetbase\Http\Requests\CreateIssueRequest $request
+     *
+     * @return \Fleetbase\Http\Resources\Entity
+     */
+    public function createRecord(CreateIssueRequest $request)
+    {
+        // get request input
+        $input = $request->only([
+            'driver',
+            'location',
+            'category',
+            'type',
+            'report',
+            'priority',
+        ]);
+
+        // Find driver who is reporting
+        try {
+            $driver = Driver::findRecordOrFail($request->input('driver'));
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Driver reporting issue not found.',
+                ],
+                404
+            );
+        }
+
+        // get the user uuid
+        $input['driver_uuid']      = $driver->uuid;
+        $input['reported_by_uuid'] = $driver->user_uuid;
+        $input['vehicle_uuid']     = $driver->vehicle_uuid;
+
+        // create the entity
+        $entity = Issue::create($input);
+
+        // response the driver resource
+        return new IssueResource($entity);
+    }
+
+    /**
+     * Updates new Fleetbase Issue resource.
+     *
+     * @param string                                      $id
+     * @param \Fleetbase\Http\Requests\UpdateIssueRequest $request
+     *
+     * @return \Fleetbase\Http\Resources\Issue
+     */
+    public function updateRecord($id, UpdateIssueRequest $request)
+    {
+        // find for the issue
+        try {
+            $issue = Issue::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Issue resource not found.',
+                ],
+                404
+            );
+        }
+
+        $input = $request->only([
+                'category',
+                'type',
+                'report',
+                'priority',
+            ]);
+
+        // update the issue
+        $issue->update($input);
+
+        // response the issue resource
+        return new IssueResource($issue);
+    }
+
+    /**
+     * Query for Fleetbase Issue resources.
+     *
+     * @return \Fleetbase\Http\Resources\FleetCollection
+     */
+    public function queryRecord(Request $request)
+    {
+        $results = Issue::queryWithRequest($request);
+
+        return IssueResource::collection($results);
+    }
+
+    /**
+     * Deletes a Fleetbase Issue resources.
+     *
+     * @return \Fleetbase\Http\Resources\FleetCollection
+     */
+    public function deleteRecord($id)
+    {
+        // find for the driver
+        try {
+            $issue = Issue::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Issue resource not found.',
+                ],
+                404
+            );
+        }
+
+        // delete the issue
+        $issue->delete();
+
+        // response the issue resource
+        return new DeletedIssue($issue);
+    }
+}

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

@@ -5,6 +5,7 @@ namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
 use Fleetbase\FleetOps\Events\OrderDispatchFailed;
 use Fleetbase\FleetOps\Events\OrderReady;
 use Fleetbase\FleetOps\Events\OrderStarted;
+use Fleetbase\FleetOps\Flow\Activity;
 use Fleetbase\FleetOps\Http\Requests\CreateOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\ScheduleOrderRequest;
 use Fleetbase\FleetOps\Http\Requests\UpdateOrderRequest;
@@ -14,12 +15,12 @@ use Fleetbase\FleetOps\Http\Resources\v1\Proof as ProofResource;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Entity;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Models\Payload;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\Proof;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\Waypoint;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Company;
@@ -35,14 +36,24 @@ class OrderController extends Controller
     /**
      * Creates a new Fleetbase Order resource.
      *
-     * @param \Illuminate\Http\Request|\Fleetbase\Http\Requests\CreateOrderRequest $request
+     * @param Request|\Fleetbase\Http\Requests\CreateOrderRequest $request
      *
      * @return \Fleetbase\Http\Resources\Order
      */
     public function create(CreateOrderRequest $request)
     {
         // get request input
-        $input = $request->only(['internal_id', 'payload', 'service_quote', 'purchase_rate', 'adhoc', 'adhoc_distance', 'pod_method', 'pod_required', 'scheduled_at', 'type', 'status', 'meta', 'notes']);
+        $input = $request->only(['internal_id', 'payload', 'service_quote', 'purchase_rate', 'adhoc', 'adhoc_distance', 'pod_method', 'pod_required', 'scheduled_at', 'status', 'meta', 'notes']);
+
+        // Get order config
+        $orderConfig = OrderConfig::resolveFromIdentifier($request->only(['type', 'order_config']));
+        if (!$orderConfig) {
+            return response()->apiError('Invalid order `type` or `order_config` provided.');
+        }
+
+        // Set order config to input
+        $input['order_config_uuid'] = $orderConfig->uuid;
+        $input['type']              = $orderConfig->key;
 
         // make sure company is set
         $input['company_uuid'] = session('company');
@@ -779,23 +790,21 @@ class OrderController extends Controller
             return response()->apiError('No driver assigned to order.');
         }
 
-        // get the next order activity
-        $flow = $activity = Flow::getNextActivity($order);
+        // Get the order config
+        $orderConfig = $order->config();
+
+        // Get the order started activity
+        $activity = $orderConfig->getStartedActivity();
 
-        // order is not dispatched if next activity code is dispatch or order is not flagged as dispatched
-        $isNotDispatched = $activity['code'] === 'dispatched' || $order->isNotDispatched;
+        // Order is not dispatched if next activity code is dispatch or order is not flagged as dispatched
+        $isNotDispatched = $order->isNotDispatched;
 
-        // if order is not dispatched yet $activity['code'] === 'dispatched' || $order->dispatched === true
+        // If order is not dispatched yet $activity->is('dispatched') || $order->dispatched === true
         // and not skipping throw order not dispatched error
         if ($isNotDispatched && !$skipDispatch) {
             return response()->apiError('Order has not been dispatched yet and cannot be started.');
         }
 
-        // if we're going to skip the dispatch get the next activity status and flow and continue
-        if ($isNotDispatched && $skipDispatch) {
-            $flow = $activity = Flow::getAfterNextActivity($order);
-        }
-
         // set order to started
         $order->started    = true;
         $order->started_at = now();
@@ -816,7 +825,7 @@ class OrderController extends Controller
         $order->setRelation('payload', $payload);
 
         // update order activity
-        $updateActivityRequest = new Request(['activity' => $flow]);
+        $updateActivityRequest = new Request(['activity' => $activity->serialize()]);
 
         // update activity
         return $this->updateActivity($order, $updateActivityRequest);
@@ -869,15 +878,20 @@ class OrderController extends Controller
             return response()->apiError('Order is already completed.');
         }
 
-        $activity = $request->input('activity', Flow::getNextActivity($order));
+        // Get the order config
+        $orderConfig = $order->config();
+        $activity    = $request->array('activity');
+        if (!Utils::isActivity($activity)) {
+            $activity = new Activity($activity, $order->getConfigFlow());
+        }
 
         // if we're going to skip the dispatch get the next activity status and flow and continue
-        if (is_array($activity) && $activity['code'] === 'dispatched' && $skipDispatch) {
-            $activity = Flow::getAfterNextActivity($order);
+        if (Utils::isActivity($activity) && $activity->is('dispatched') && $skipDispatch) {
+            $activity = $orderConfig->getStartedActivity();
         }
 
         // handle pickup/dropoff order activity update as normal
-        if (is_array($activity) && $activity['code'] === 'dispatched') {
+        if (Utils::isActivity($activity) && $activity->is('dispatched')) {
             // make sure driver is assigned if not trigger failed dispatch
             if (!$order->hasDriverAssigned && !$order->adhoc) {
                 event(new OrderDispatchFailed($order, 'No driver assigned for order to dispatch to.'));
@@ -898,7 +912,7 @@ class OrderController extends Controller
             $order->payload->setFirstWaypoint($activity, $location);
         }
 
-        if (is_array($activity) && $activity['code'] === 'completed' && $order->payload->isMultipleDropOrder) {
+        if (Utils::isActivity($activity) && $activity->completesOrder() && $order->payload->isMultipleDropOrder) {
             // confirm every waypoint is completed
             $isCompleted = $order->payload->waypointMarkers->every(function ($waypoint) {
                 return $waypoint->status_code === 'COMPLETED';
@@ -921,24 +935,26 @@ class OrderController extends Controller
             }
         }
 
-        if (is_array($activity) && $activity['code'] === 'completed' && $order->driverAssigned) {
-            // unset from driver current job
-            $order->driverAssigned->unassignCurrentOrder();
-            $order->notifyCompleted();
-        }
-
+        // Update activity
         $order->updateActivity($activity, $proof);
 
         // also update for each order entities if not multiple drop order
         // all entities will share the same activity status as is one drop order
         if (!$order->payload->isMultipleDropOrder) {
             foreach ($order->payload->entities as $entity) {
-                $entity->insertActivity($activity['status'], $activity['details'] ?? '', $location, $activity['code'], $proof);
+                $entity->insertActivity($activity, $location, $proof);
             }
         } else {
             $order->payload->updateWaypointActivity($activity, $location);
         }
 
+        // Handle order completion
+        if (Utils::isActivity($activity) && $activity->completesOrder()) {
+            // unset from driver current job
+            $order->driverAssigned->unassignCurrentOrder();
+            $order->complete();
+        }
+
         return new OrderResource($order);
     }
 
@@ -947,10 +963,8 @@ class OrderController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function getNextActivity(string $id, Request $request)
+    public function getNextActivity(string $id)
     {
-        $waypointId = $request->input('waypoint');
-
         try {
             $order = Order::findRecordOrFail($id, ['payload']);
         } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
@@ -962,24 +976,20 @@ class OrderController extends Controller
             );
         }
 
-        $isMultipleDropOrder = $order->payload->isMultipleDropOrder;
+        $activities = $order->config()->nextActivity();
 
-        if ($waypointId && $isMultipleDropOrder) {
-            $waypoint = Waypoint::where('payload_uuid', $order->payload_uuid)->where(function ($q) use ($waypointId) {
-                $q->whereHas('place', function ($q) use ($waypointId) {
-                    $q->where('public_id', $waypointId);
-                });
-                $q->orWhere('public_id', $waypointId);
-            })->withoutGlobalScopes()->first();
-
-            $activity = Flow::getOrderWaypointFlow($order, $waypoint);
-
-            return response()->json($activity);
-        }
+        // If activity is to complete order add proof of delivery properties if required
+        // This is a temporary fix until activity is updated to handle POD on it's own
+        $activities = $activities->map(function ($activity) use ($order) {
+            if ($activity->completesOrder() && $order->pod_required) {
+                $activity->set('require_pod', true);
+                $activity->set('pod_method', $order->pod_method);
+            }
 
-        $activity = Flow::getOrderFlow($order);
+            return $activity;
+        });
 
-        return response()->json($activity);
+        return response()->json($activities);
     }
 
     /**
@@ -1010,24 +1020,17 @@ class OrderController extends Controller
             return response()->apiError('Not all waypoints completed for order.');
         }
 
-        $activity = [
-            'status'  => 'Order completed',
-            'details' => 'Driver has completed order for all waypoints',
-            'code'    => 'completed',
-        ];
-
+        $activity = $order->config()->getCompletedActivity();
         if ($order->driverAssigned) {
             // unset from driver current job
             $order->driverAssigned->unassignCurrentOrder();
         }
 
-        $order->notifyCompleted();
-
         /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
-
-        $order->setStatus($activity['code']);
-        $order->insertActivity($activity['status'], $activity['details'] ?? '', $location, $activity['code']);
+        $order->setStatus($activity->code);
+        $order->insertActivity($activity, $location);
+        $order->notifyCompleted();
 
         return new OrderResource($order);
     }
@@ -1112,7 +1115,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureQrScan(string $id, ?string $subjectId = null, Request $request)
+    public function captureQrScan(Request $request, string $id, ?string $subjectId = null)
     {
         $code    = $request->input('code');
         $data    = $request->input('data', []);
@@ -1183,7 +1186,7 @@ class OrderController extends Controller
      *
      * @return void
      */
-    public function captureSignature(string $id, ?string $subjectId = null, Request $request)
+    public function captureSignature(Request $request, string $id, ?string $subjectId = null)
     {
         $disk         = $request->input('disk', config('filesystems.default'));
         $bucket       = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));
@@ -1269,4 +1272,96 @@ class OrderController extends Controller
 
         return new ProofResource($proof);
     }
+
+    /**
+     * Validate a photo.
+     *
+     * @return void
+     */
+    public function capturePhoto(Request $request, string $id, ?string $subjectId = null)
+    {
+        $disk         = $request->input('disk', config('filesystems.default'));
+        $bucket       = $request->input('bucket', config('filesystems.disks.' . $disk . '.bucket', config('filesystems.disks.s3.bucket')));
+        $photo        = $request->input('photo');
+        $data         = $request->input('data', []);
+        $remarks      = $request->input('remarks', 'Verified by Photo');
+        $type         = $subjectId ? strtok($subjectId, '_') : null;
+
+        try {
+            $order = Order::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Order resource not found.',
+                ],
+                404
+            );
+        }
+
+        if (!$photo) {
+            return response()->apiError('No photo data to capture.');
+        }
+
+        $subject = $type === null ? $order : null;
+
+        switch ($type) {
+            case 'place':
+            case 'waypoint':
+                $subject = Waypoint::where('payload_uuid', $order->payload_uuid)->where(function ($q) use ($subjectId) {
+                    $q->whereHas('place', function ($q) use ($subjectId) {
+                        $q->where('public_id', $subjectId);
+                    });
+                    $q->orWhere('public_id', $subjectId);
+                })->withoutGlobalScopes()->first();
+                break;
+
+            case 'entity':
+                $subject = Entity::where('public_id', $subjectId)->withoutGlobalScopes()->first();
+                break;
+
+            default:
+                break;
+        }
+
+        if (!$subject) {
+            return response()->apiError('Unable to capture photo');
+        }
+
+        // create proof instance
+        $proof = Proof::create([
+            'company_uuid' => session('company'),
+            'order_uuid'   => $order->uuid,
+            'subject_uuid' => $subject->uuid,
+            'subject_type' => Utils::getModelClassName($subject),
+            'remarks'      => $remarks,
+            'raw_data'     => $photo,
+            'data'         => $data,
+        ]);
+
+        // set the photo storage path
+        $path = 'uploads/' . session('company') . '/photos/' . $proof->public_id . '.png';
+
+        // upload photo
+        Storage::disk($disk)->put($path, base64_decode($photo));
+
+        // create file record for upload
+        $file = File::create([
+            'company_uuid'      => session('company'),
+            'uploader_uuid'     => session('user'),
+            'name'              => basename($path),
+            'original_filename' => basename($path),
+            'extension'         => 'png',
+            'content_type'      => 'image/png',
+            'path'              => $path,
+            'bucket'            => $bucket,
+            'type'              => 'photo',
+            'size'              => Utils::getBase64ImageSize($photo),
+        ])->setKey($proof);
+
+        // set file to proof
+        $proof->file_uuid = $file->uuid;
+        $proof->save();
+
+        return new ProofResource($proof);
+    }
 }

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers\Api\v1;
+
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Http\Resources\Organization;
+use Fleetbase\Models\Company;
+
+class OrganizationController extends Controller
+{
+    /**
+     * Return List organizations.
+     *
+     * @return Organization
+     */
+    public function listOrganizations()
+    {
+        $companies = Company::whereHas('users')->take(10)->get()->map(function ($company) {
+            return [
+                'name' => $company->name,
+                'id'   => $company->public_id,
+            ];
+        });
+
+        return response()->json($companies);
+    }
+}

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

@@ -130,9 +130,8 @@ class PlaceController extends Controller
         ]);
 
         // check if missing location
-        $isMissingLocation = empty($input['location']);
-
         // set a default location for creation
+        $isMissingLocation = empty($input['location']);
         if ($isMissingLocation) {
             $input['location'] = new Point(0, 0);
         }
@@ -141,7 +140,7 @@ class PlaceController extends Controller
         $place->fill($input);
 
         // attempt to find and set latitude and longitude
-        if ($isMissingLocation || $request->missing(['latitude', 'longitude', 'location']) || $place->isMissing('country')) {
+        if ($isMissingLocation || $request->missing(['latitude', 'longitude', 'location']) || empty($place->country)) {
             $geocoded = Geocoder::geocode($place->toAddressString(['name']))
                 ->get()
                 ->first();

package/server/src/Http/Controllers/Controller.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
+{
+}

package/server/src/Http/Controllers/FleetOpsController.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Controllers;
 
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Http\Controllers\FleetbaseController;
 
 class FleetOpsController extends FleetbaseController
@@ -10,4 +11,10 @@ class FleetOpsController extends FleetbaseController
      * The package namespace used to resolve from.
      */
     public string $namespace = '\\Fleetbase\\FleetOps';
+
+    public function test()
+    {
+        $order = Order::where('public_id', '')->first();
+        dd($order->config()->getNextActivity());
+    }
 }