@fleetbase/fleetops-engine 0.6.55 → 0.6.56

package/server/src/Models/Order.php

@@ -1208,7 +1208,8 @@ class Order extends Model
                 'description'            => 'Dispatch order',
                 'type'                   => 'dispatch',
                 'direction'              => Transaction::DIRECTION_CREDIT,
-                'status'                 => 'success',
+                'status'                 => Transaction::STATUS_SUCCESS,
+                'settlement_status'      => Transaction::SETTLEMENT_STATUS_UNPAID,
             ]);
 
             $this->updateQuietly(['transaction_uuid' => $transaction->uuid]);

package/server/src/Observers/PurchaseRateObserver.php

@@ -49,7 +49,8 @@ class PurchaseRateObserver
             'description'            => 'Dispatch order',
             'type'                   => 'dispatch',
             'direction'              => Transaction::DIRECTION_CREDIT,
-            'status'                 => 'success',
+            'status'                 => Transaction::STATUS_SUCCESS,
+            'settlement_status'      => Transaction::SETTLEMENT_STATUS_UNPAID,
         ]);
 
         if (isset($purchaseRate->serviceQuote)) {

package/server/src/Support/Analytics/RevenueTrend.php

@@ -2,7 +2,7 @@
 
 namespace Fleetbase\FleetOps\Support\Analytics;
 
-use Fleetbase\Models\Transaction;
+use Fleetbase\FleetOps\Support\Metrics\ActiveRevenueQuery;
 use Illuminate\Support\Carbon;
 
 /**
@@ -32,9 +32,7 @@ class RevenueTrend extends AbstractAnalytics
             default => '%Y-%m-%d',
         };
 
-        $rows = Transaction::where('company_uuid', $this->company->uuid)
-            ->where('currency', $currency)
-            ->whereBetween('created_at', [$start, $end])
+        $rows = ActiveRevenueQuery::forCompany($this->company, $currency, $start, $end)
             ->selectRaw('DATE_FORMAT(created_at, ?) as bucket, SUM(amount) as total', [$format])
             ->groupBy('bucket')
             ->orderBy('bucket')
@@ -47,10 +45,7 @@ class RevenueTrend extends AbstractAnalytics
         $duration       = $end->getTimestamp() - $start->getTimestamp();
         $compareStart   = (clone $start);
         $compareStart   = (new \DateTime())->setTimestamp($start->getTimestamp() - $duration);
-        $previousTotal  = (float) Transaction::where('company_uuid', $this->company->uuid)
-            ->where('currency', $currency)
-            ->whereBetween('created_at', [$compareStart, $start])
-            ->sum('amount');
+        $previousTotal  = (float) ActiveRevenueQuery::forCompany($this->company, $currency, $compareStart, $start)->sum('amount');
 
         $deltaPct = $previousTotal > 0
             ? round((($total - $previousTotal) / $previousTotal) * 100, 1)

package/server/src/Support/Metrics/ActiveRevenueQuery.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace Fleetbase\FleetOps\Support\Metrics;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\Transaction;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Schema;
+
+class ActiveRevenueQuery
+{
+    public const ACTIVE_STATUSES               = [Transaction::STATUS_SUCCESS];
+    public const INACTIVE_TRANSACTION_STATUSES = ['pending', 'failed', 'cancelled', 'canceled', 'void', 'voided', 'expired', 'reversed', 'refunded', 'ignored'];
+    public const INACTIVE_ORDER_STATUSES       = ['canceled', 'cancelled', 'order_canceled'];
+    public const INACTIVE_INVOICE_STATUSES     = ['void', 'voided', 'cancelled', 'canceled'];
+
+    public static function forCompany(Company $company, string $currency, ?\DateTimeInterface $start = null, ?\DateTimeInterface $end = null): Builder
+    {
+        $query = Transaction::query()
+            ->where('company_uuid', $company->uuid)
+            ->where('currency', $currency)
+            ->where('direction', Transaction::DIRECTION_CREDIT)
+            ->whereIn('status', self::ACTIVE_STATUSES)
+            ->whereNotIn('status', self::INACTIVE_TRANSACTION_STATUSES)
+            ->whereNull('deleted_at')
+            ->whereNull('voided_at')
+            ->whereNull('reversed_at')
+            ->whereNull('parent_transaction_uuid');
+
+        if ($start && $end) {
+            $query->whereBetween('created_at', [$start, $end]);
+        }
+
+        static::excludeInactiveOrders($query);
+        static::excludeInactiveInvoices($query);
+
+        return $query;
+    }
+
+    protected static function excludeInactiveOrders(Builder $query): void
+    {
+        if (!Schema::hasTable('orders')) {
+            return;
+        }
+
+        foreach (['subject_uuid' => 'subject_type', 'context_uuid' => 'context_type'] as $uuidColumn => $typeColumn) {
+            $query->whereNotExists(function ($subQuery) use ($uuidColumn, $typeColumn) {
+                $subQuery->selectRaw('1')
+                    ->from('orders')
+                    ->whereColumn('orders.uuid', "transactions.{$uuidColumn}")
+                    ->where("transactions.{$typeColumn}", Order::class)
+                    ->where(function ($orderQuery) {
+                        static::inactiveOrderConstraint($orderQuery);
+                    });
+            });
+        }
+
+        $query->whereNotExists(function ($subQuery) {
+            $subQuery->selectRaw('1')
+                ->from('orders')
+                ->whereColumn('orders.transaction_uuid', 'transactions.uuid')
+                ->where(function ($orderQuery) {
+                    static::inactiveOrderConstraint($orderQuery);
+                });
+        });
+    }
+
+    protected static function excludeInactiveInvoices(Builder $query): void
+    {
+        $invoiceClass = 'Fleetbase\\Ledger\\Models\\Invoice';
+
+        if (!class_exists($invoiceClass) || !Schema::hasTable('ledger_invoices')) {
+            return;
+        }
+
+        foreach (['subject_uuid' => 'subject_type', 'context_uuid' => 'context_type'] as $uuidColumn => $typeColumn) {
+            $query->whereNotExists(function ($subQuery) use ($uuidColumn, $typeColumn, $invoiceClass) {
+                $subQuery->selectRaw('1')
+                    ->from('ledger_invoices')
+                    ->whereColumn('ledger_invoices.uuid', "transactions.{$uuidColumn}")
+                    ->where("transactions.{$typeColumn}", $invoiceClass)
+                    ->where(function ($invoiceQuery) {
+                        static::inactiveInvoiceConstraint($invoiceQuery);
+                    });
+            });
+        }
+
+        $query->whereNotExists(function ($subQuery) {
+            $subQuery->selectRaw('1')
+                ->from('ledger_invoices')
+                ->whereColumn('ledger_invoices.transaction_uuid', 'transactions.uuid')
+                ->where(function ($invoiceQuery) {
+                    static::inactiveInvoiceConstraint($invoiceQuery);
+                });
+        });
+    }
+
+    protected static function inactiveOrderConstraint($query): void
+    {
+        $query->whereNotNull('orders.deleted_at')
+            ->orWhereIn('orders.status', self::INACTIVE_ORDER_STATUSES);
+    }
+
+    protected static function inactiveInvoiceConstraint($query): void
+    {
+        $query->whereNotNull('ledger_invoices.deleted_at')
+            ->orWhereIn('ledger_invoices.status', self::INACTIVE_INVOICE_STATUSES);
+
+        if (Schema::hasTable('orders')) {
+            $query->orWhereExists(function ($orderQuery) {
+                $orderQuery->selectRaw('1')
+                    ->from('orders')
+                    ->whereColumn('orders.uuid', 'ledger_invoices.order_uuid')
+                    ->where(function ($inactiveOrderQuery) {
+                        static::inactiveOrderConstraint($inactiveOrderQuery);
+                    });
+            });
+        }
+    }
+}

package/server/src/Support/Metrics/AvgOrderValueMetric.php

@@ -3,7 +3,6 @@
 namespace Fleetbase\FleetOps\Support\Metrics;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Models\Transaction;
 
 /**
  * Average revenue per completed order in the period. Computed as
@@ -39,12 +38,7 @@ class AvgOrderValueMetric extends MoneyMetric
             return 0.0;
         }
 
-        $revenueQuery = Transaction::where('company_uuid', $this->company->uuid)
-            ->where('currency', $this->currency());
-
-        if ($this->currentStart && $this->currentEnd) {
-            $revenueQuery->whereBetween('created_at', [$this->currentStart, $this->currentEnd]);
-        }
+        $revenueQuery = ActiveRevenueQuery::forCompany($this->company, $this->currency(), $this->currentStart, $this->currentEnd);
 
         $totalRevenue = (float) $revenueQuery->sum('amount');
 

package/server/src/Support/Metrics/EarningsMetric.php

@@ -2,8 +2,6 @@
 
 namespace Fleetbase\FleetOps\Support\Metrics;
 
-use Fleetbase\Models\Transaction;
-
 class EarningsMetric extends MoneyMetric
 {
     public static function slug(): string
@@ -13,14 +11,7 @@ class EarningsMetric extends MoneyMetric
 
     protected function query(?\DateTimeInterface $start, ?\DateTimeInterface $end)
     {
-        $query = Transaction::where('company_uuid', $this->company->uuid)
-            ->where('currency', $this->currency());
-
-        if ($start && $end) {
-            $query->whereBetween('created_at', [$start, $end]);
-        }
-
-        return $query;
+        return ActiveRevenueQuery::forCompany($this->company, $this->currency(), $start, $end);
     }
 
     protected function aggregate($query): float

package/server/src/Support/Telematics/Providers/AfaqyProvider.php

@@ -211,12 +211,35 @@ class AfaqyProvider extends AbstractProvider
 
     public function normalizeSensor(array $payload): array
     {
+        $unitId         = $payload['device_id'] ?? $payload['unit_id'] ?? $payload['vehicle_id'] ?? null;
+        $sensorIdentity = $this->resolveSensorIdentity($payload);
+        $sensorName     = $this->resolveSensorName($payload, $sensorIdentity);
+        $value          = $this->resolveSensorValue($payload);
+
+        if (!$unitId || !$sensorIdentity || !$sensorName || !$this->isSensorValue($value)) {
+            throw new \InvalidArgumentException('AFAQY sensor payload does not contain a stable identity and scalar latest value.');
+        }
+
+        $type       = $this->normalizeSensorType($payload, $sensorName);
+        $internalId = implode(':', ['afaqy', $unitId, $this->sensorIdentityPart($sensorIdentity)]);
+
         return [
-            'sensor_type' => $payload['type'] ?? $payload['name'] ?? $payload['param'] ?? 'generic',
-            'value'       => $payload['value'] ?? $payload['last_val']['value'] ?? $payload['last_update'] ?? null,
-            'unit'        => $payload['units'] ?? null,
-            'recorded_at' => $this->parseTimestamp($payload['updated_at'] ?? $payload['created_at'] ?? null),
-            'meta'        => $payload,
+            'internal_id' => $internalId,
+            'external_id' => $internalId,
+            'name'        => $sensorName,
+            'type'        => $type,
+            'sensor_type' => $type,
+            'value'       => $value,
+            'unit'        => $payload['unit'] ?? $payload['units'] ?? data_get($payload, 'last_val.unit'),
+            'recorded_at' => $this->parseTimestamp(data_get($payload, 'last_val.dtt') ?? data_get($payload, 'last_update.dtt') ?? $payload['updated_at'] ?? $payload['created_at'] ?? null),
+            'status'      => 'active',
+            'meta'        => array_filter([
+                'provider'           => 'afaqy',
+                'unit_id'            => $unitId,
+                'provider_sensor_id' => $sensorIdentity,
+                'sensor_key'         => $payload['sensor_key'] ?? null,
+                'raw'                => $payload,
+            ], fn ($value) => $value !== null),
         ];
     }
 
@@ -477,4 +500,80 @@ class AfaqyProvider extends AbstractProvider
             ?? data_get($payload, 'fc.level')
             ?? null;
     }
+
+    protected function resolveSensorIdentity(array $payload): ?string
+    {
+        $value = $payload['_id']
+            ?? $payload['id']
+            ?? $payload['sensor_id']
+            ?? $payload['ident']
+            ?? $payload['param']
+            ?? $payload['sensor_key']
+            ?? $payload['name']
+            ?? data_get($payload, 'sensor.name');
+
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        return (string) $value;
+    }
+
+    protected function resolveSensorName(array $payload, ?string $fallback = null): ?string
+    {
+        $value = $payload['name']
+            ?? data_get($payload, 'sensor.name')
+            ?? $payload['param']
+            ?? $payload['sensor_key']
+            ?? $fallback;
+
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        return (string) $value;
+    }
+
+    protected function resolveSensorValue(array $payload): mixed
+    {
+        if (array_key_exists('value', $payload)) {
+            return $payload['value'];
+        }
+
+        return data_get($payload, 'last_val.value')
+            ?? data_get($payload, 'last_update.value')
+            ?? data_get($payload, 'last_update.val')
+            ?? data_get($payload, 'last_update.state');
+    }
+
+    protected function isSensorValue(mixed $value): bool
+    {
+        return $value !== null && is_scalar($value);
+    }
+
+    protected function normalizeSensorType(array $payload, string $sensorName): string
+    {
+        $providerType = (string) ($payload['sensor_type'] ?? $payload['type'] ?? $payload['param'] ?? '');
+        $type         = strtolower(trim($providerType . ' ' . $sensorName));
+
+        return match (true) {
+            str_contains($type, 'door')                                      => 'door',
+            str_contains($type, 'temp')                                      => 'temperature',
+            str_contains($type, 'humid')                                     => 'humidity',
+            str_contains($type, 'fuel')                                      => 'fuel',
+            str_starts_with($type, 'di') || str_contains($type, 'digital')   => 'digital',
+            str_starts_with($type, 'ai') || str_contains($type, 'analog')    => 'analog',
+            str_contains($type, 'battery') || str_contains($type, 'voltage') => 'voltage',
+            default                                                          => $this->sensorIdentityPart($type) ?: 'generic',
+        };
+    }
+
+    protected function sensorIdentityPart(string $value): string
+    {
+        $normalized = strtolower(trim($value));
+        $normalized = preg_replace('/[^a-z0-9]+/i', '_', $normalized) ?? '';
+        $normalized = trim($normalized, '_');
+
+        return $normalized !== '' ? $normalized : 'sensor';
+    }
 }