Merge pull request #1750 from pkuehnel/fix/noFleetApiLicenseErrorOnBl…

…eEnabled fix(TeslaFleetApiService): do not show not licenses error on Fleet BLE
pkuehnel · Jan 17, 2025 · 2698a24 · 2698a24
2 parents fc4bb26 + fa9f17b
commit 2698a24
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs
@@ -844,6 +844,7 @@ await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(Send
             var isCarBleEnabled = car.UseBle;
             if (isCarBleEnabled)
             {
+                await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiNotLicensed, car.Vin);
                 //When changing this condition also change it in ErrorHandlingService.DetectErrors as there the error will be set to resolved.
                 if ((car.LastNonSuccessBleCall != default) && (car.LastNonSuccessBleCall.Value >
                     (dateTimeProvider.UtcNow() - configurationWrapper.BleUsageStopAfterError())))
@@ -932,9 +933,13 @@ await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(Send
 
         if (fleetApiRequest.BleCompatible && (!await backendApiService.IsFleetApiLicensed(car.Vin, true)))
         {
-            await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Fleet API not licensed for car {car.Vin}",
-                "Can not send Fleet API commands to car as Fleet API is not licensed",
-                issueKeys.FleetApiNotLicensed, car.Vin, null).ConfigureAwait(false);
+            if (!car.UseBle)
+            {
+                await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Fleet API not licensed for car {car.Vin}",
+                    "Can not send Fleet API commands to car as Fleet API is not licensed",
+                    issueKeys.FleetApiNotLicensed, car.Vin, null).ConfigureAwait(false);
+            }
+
             logger.LogError("Can not send Fleet API commands to car {vin} as car is not licensed", car.Vin);
             return null;
         }