nullable lat/lon and delete in correct order (#101)

Author: mlapaglia

OpenAlprWebhookProcessor/CameraUpdateService/CameraScheduling.cs

@@ -63,20 +63,20 @@ public static void ScheduleDayNightTask(
             var sunsetOffset = camera.SunsetOffset ?? agent.SunsetOffset;
 
             var nextSunrise = Celestial.Get_Next_SunRise(
-                latitude,
-                longitude,
+                latitude.Value,
+                longitude.Value,
                 DateTime.Now,
                 timeZoneOffset);
 
             var nextSunset = Celestial.Get_Next_SunSet(
-                latitude,
-                longitude,
+                latitude.Value,
+                longitude.Value,
                 DateTime.Now,
                 timeZoneOffset);
 
             var isSunUp = Celestial.CalculateCelestialTimes(
-                latitude,
-                longitude,
+                latitude.Value,
+                longitude.Value,
                 DateTime.Now,
                 timeZoneOffset).IsSunUp;
 

OpenAlprWebhookProcessor/CameraUpdateService/CameraUpdateService.cs

@@ -48,11 +48,14 @@ public async Task ForceSunriseSunsetAsync()
 
                 foreach (var camera in camerasToUpdate)
                 {
+                    var latitude = camera.Latitude ?? agent.Latitude;
+                    var longitude = camera.Longitude ?? agent.Longitude;
+
                     _backgroundJobClient.Enqueue(() => ProcessSunriseSunsetJobAsync(
                         camera.Id,
                         CameraScheduling.IsSunUp(
-                            agent.Latitude,
-                            agent.Longitude) ? SunriseSunset.Sunrise : SunriseSunset.Sunset,
+                            latitude.Value,
+                            longitude.Value) ? SunriseSunset.Sunrise : SunriseSunset.Sunset,
                         false));
                 }
             }

OpenAlprWebhookProcessor/Cameras/DeleteCamera/DeleteCameraHandler.cs

@@ -23,10 +23,10 @@ public async Task HandleAsync(Guid cameraId)
         {
             var camera = await _processorContext.Cameras.FirstOrDefaultAsync(x => x.Id == cameraId);
 
+            await _cameraUpdateService.DeleteSunriseSunsetAsync(camera.Id);
+
             _processorContext.Remove(camera);
             await _processorContext.SaveChangesAsync();
-
-            await _cameraUpdateService.DeleteSunriseSunsetAsync(camera.Id);
         }
     }
 }

OpenAlprWebhookProcessor/Cameras/GetCameras/GetCameraRequestHandler.cs

@@ -48,8 +48,8 @@ public async Task<List<Camera>> HandleAsync()
                     DayNightModeEnabled = camera.UpdateDayNightModeEnabled,
                     DayNightNextScheduledCommand = GetNextScheduledExecutionDate(agent, camera, nextDayNightCommand),
                     IpAddress = camera.IpAddress,
-                    Latitude = camera.Latitude ?? agent.Latitude,
-                    Longitude = camera.Longitude ?? agent.Longitude,
+                    Latitude = camera.Latitude ?? agent?.Latitude ?? null,
+                    Longitude = camera.Longitude ?? agent?.Longitude ?? null,
                     Manufacturer = camera.Manufacturer,
                     ModelNumber = camera.ModelNumber,
                     DayFocus = camera.DayFocus,

OpenAlprWebhookProcessor/Data/Agent.cs

@@ -18,9 +18,9 @@ public class Agent
 
         public string Version { get; set; }
 
-        public double Longitude { get; set; }
+        public double? Longitude { get; set; }
 
-        public double Latitude { get; set; }
+        public double? Latitude { get; set; }
 
         public int SunriseOffset { get; set; }