update parkingSpace naming

agriculturedev · Jan 16, 2024 · 947024c · 947024c
1 parent fa719a8
commit 947024c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/DKSRDomain/ParkingLotResponse.cs → DKSRDomain/ParkingSpaceResponse.cs b/DKSRDomain/ParkingLotResponse.cs → DKSRDomain/ParkingSpaceResponse.cs
@@ -2,9 +2,9 @@
 
 namespace DKSRDomain;
 
-public class ParkingLotResponse
+public class ParkingSpaceResponse
 {
-    public ParkingLotSensorData[] SensorData { get; set; }
+    public ParkingSpaceSensorData[] SensorData { get; set; }
 }
 
 //   {
@@ -29,7 +29,7 @@ public class ParkingLotResponse
 //       "eventType": "ParkinglotSNEventType"
 //     }
 
-public class ParkingLotSensorData
+public class ParkingSpaceSensorData
 {
     [JsonProperty("ignored")] public bool Ignored { get; set; }
 

diff --git a/Importer/Constants/Endpoints.cs b/Importer/Constants/Endpoints.cs
@@ -8,7 +8,7 @@ public static class Endpoints
     public const string TreesenseEndpoint =
         "/UrbanPulseData/historic/sensordata?eventtype=fac3edb2-53fa-4319-a897-e3e3c02102cc";
 
-    public const string ParkingLotEndpoint =
+    public const string ParkingSpaceEndpoint =
         "/UrbanPulseData/historic/sensordata?eventtype=2a4ce3e9-92db-455e-bece-0176c62fafba";
 
     public static string GetAuthenticatedEndpointUrl(string? username, string? password, string socket)

diff --git a/Importer/Importers/ParkingLotImporter.cs → Importer/Importers/ParkingSpaceImporter.cs b/Importer/Importers/ParkingLotImporter.cs → Importer/Importers/ParkingSpaceImporter.cs
@@ -5,11 +5,11 @@
 
 namespace Importer.Importers;
 
-public class ParkingLotImporter : Importer
+public class ParkingSpaceImporter : Importer
 {
     private Timer _importerTimer;
 
-    public ParkingLotImporter(ILogger logger) : base(logger, "ParkingLot", "Occupancy")
+    public ParkingSpaceImporter(ILogger logger) : base(logger, "ParkingSpace", "Occupancy")
     {
         _importerTimer = new Timer(Import, null, 0, 60 * 1000 * 2); // every 2 minutes
     }
@@ -20,22 +20,22 @@ public ParkingLotImporter(ILogger logger) : base(logger, "ParkingLot", "Occupanc
         {
             Logger.LogInformation($"{DateTime.Now} - Updating {DataType} Data...");
             var data = await GetDksrData();
-            foreach (var dksrParkingLot in data.SensorData)
+            foreach (var parkingSpace in data.SensorData)
                 try
                 {
                     Thing thing;
-                    var frostThing = await GetFrostThingData(dksrParkingLot.Sid);
+                    var frostThing = await GetFrostThingData(parkingSpace.Sid);
                     if (frostThing.Value.Count == 0)
                     {
-                        thing = Mappers.MapDksrResponse(dksrParkingLot, DataType);
+                        thing = Mappers.MapDksrResponse(parkingSpace, DataType);
                         await CreateNewThing(thing);
-                        frostThing = await GetFrostThingData(dksrParkingLot.Sid);
+                        frostThing = await GetFrostThingData(parkingSpace.Sid);
                     }
 
                     if (frostThing.Value.Count < 1)
-                        throw new Exception($"Creating new thing with id {dksrParkingLot.Sid} seems to have failed...");
+                        throw new Exception($"Creating new thing with id {parkingSpace.Sid} seems to have failed...");
 
-                    thing = Mappers.MapDksrResponse(dksrParkingLot, DataType);
+                    thing = Mappers.MapDksrResponse(parkingSpace, DataType);
                     thing.Id = frostThing.Value.First().Id;
                     await Update(thing);
                 }
@@ -50,14 +50,14 @@ public ParkingLotImporter(ILogger logger) : base(logger, "ParkingLot", "Occupanc
         }
     }
 
-    private async Task<ParkingLotResponse> GetDksrData()
+    private async Task<ParkingSpaceResponse> GetDksrData()
     {
         try
         {
             var response =
                 await Client.GetAsync(
-                    Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingLotEndpoint));
-            var result = await response.Content.ReadAsAsync<ParkingLotResponse>();
+                    Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingSpaceEndpoint));
+            var result = await response.Content.ReadAsAsync<ParkingSpaceResponse>();
             return result;
         }
         catch (Exception e)

diff --git a/Importer/Mappers.cs b/Importer/Mappers.cs
@@ -17,17 +17,18 @@ public static Thing MapDksrResponse(TreeSenseSensorData treeData, string dataTyp
         return Thing.Create($"{dataType}-{treeData.Sid}", dataType, properties, treeData.Lat, treeData.Lng, observation);
     }
 
-    public static Thing MapDksrResponse(ParkingLotSensorData parkingLot, string dataType)
+    public static Thing MapDksrResponse(ParkingSpaceSensorData parkingSpace, string dataType)
     {
         var properties = new Dictionary<string, string>
         {
-            { "Id", parkingLot.Sid }, { "ParkingSpaceId", parkingLot.ParkingSpaceId.ToString() },
-            { "ParkingLotId", parkingLot.ParkingLotId.ToString() }
+            { "Id", parkingSpace.Sid }, 
+            { "ParkingSpaceId", parkingSpace.ParkingSpaceId.ToString() },
+            { "ParkingLotId", parkingSpace.ParkingLotId.ToString() }
         };
 
-        var observation = new Observation { Result = parkingLot.Occupied, PhenomenonTime = parkingLot.Timestamp };
+        var observation = new Observation { Result = parkingSpace.Occupied, PhenomenonTime = parkingSpace.Timestamp };
 
-        return Thing.Create($"{dataType}-{parkingLot.Sid}", dataType, properties, parkingLot.Lat, parkingLot.Lon, observation);
+        return Thing.Create($"{dataType}-{parkingSpace.Sid}", dataType, properties, parkingSpace.Lat, parkingSpace.Lon, observation);
     }
 
     public static DataStream MapFrostResponseToDataStream(DataStreamResponse? response)

diff --git a/Importer/Program.cs b/Importer/Program.cs
@@ -17,7 +17,7 @@ private static void Main(string[] args)
         _logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 
         var treeImporter = new TreeImporter(_logger);
-        var parkingLotImporter = new ParkingLotImporter(_logger);
+        var parkingSpaceImporter = new ParkingSpaceImporter(_logger);
 
         Process.GetCurrentProcess().WaitForExit();
     }