From 4ada97fdd8f825611cafc0f4a3653650b4f3679e Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Fri, 28 May 2021 19:35:48 -0400
Subject: [PATCH] Updates for new hardware

- New model package
- Remove battery level
- Change light level decimal scale
---
 Weather/SerialReader/SerialReader.csproj             | 2 +-
 Weather/Service/Data/Resources/CreateReading.sql     | 4 ++--
 Weather/Service/Data/Resources/GetReadingHistory.sql | 1 -
 Weather/Service/Data/Resources/GetRecentReading.sql  | 1 -
 Weather/Service/Data/Resources/Schema.sql            | 6 ++++--
 Weather/Service/Models/WeatherValueType.cs           | 1 -
 Weather/Service/Service.csproj                       | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Weather/SerialReader/SerialReader.csproj b/Weather/SerialReader/SerialReader.csproj
index 8f9e7f6..3bc775d 100644
--- a/Weather/SerialReader/SerialReader.csproj
+++ b/Weather/SerialReader/SerialReader.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.1" />
+    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.1.5" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0" />
diff --git a/Weather/Service/Data/Resources/CreateReading.sql b/Weather/Service/Data/Resources/CreateReading.sql
index 9b24f53..f5001ba 100644
--- a/Weather/Service/Data/Resources/CreateReading.sql
+++ b/Weather/Service/Data/Resources/CreateReading.sql
@@ -1,5 +1,5 @@
 INSERT INTO Reading (Timestamp, WindDirection, WindSpeed, Humidity, HumidityTemperature, Rain, Pressure,
-                     PressureTemperature, BatteryLevel, LightLevel, Latitude, Longitude, Altitude,
+                     PressureTemperature, LightLevel, Latitude, Longitude, Altitude,
                      SatelliteCount, GpsTimestamp)
 VALUES (@Timestamp, @WindDirection, @WindSpeed, @Humidity, @HumidityTemperature, @Rain, @Pressure, @PressureTemperature,
-        @BatteryLevel, @LightLevel, @Latitude, @Longitude, @Altitude, @SatelliteCount, @GpsTimestamp)
\ No newline at end of file
+        @LightLevel, @Latitude, @Longitude, @Altitude, @SatelliteCount, @GpsTimestamp)
\ No newline at end of file
diff --git a/Weather/Service/Data/Resources/GetReadingHistory.sql b/Weather/Service/Data/Resources/GetReadingHistory.sql
index 03afa36..9ff1335 100644
--- a/Weather/Service/Data/Resources/GetReadingHistory.sql
+++ b/Weather/Service/Data/Resources/GetReadingHistory.sql
@@ -5,7 +5,6 @@ SELECT Timestamp,
        Rain,
        Pressure,
        PressureTemperature AS Temperature,
-       BatteryLevel,
        LightLevel,
        Latitude,
        Longitude,
diff --git a/Weather/Service/Data/Resources/GetRecentReading.sql b/Weather/Service/Data/Resources/GetRecentReading.sql
index cb7b1c4..245d514 100644
--- a/Weather/Service/Data/Resources/GetRecentReading.sql
+++ b/Weather/Service/Data/Resources/GetRecentReading.sql
@@ -5,7 +5,6 @@ SELECT TOP 1 Timestamp,
              Rain,
              Pressure,
              PressureTemperature AS Temperature,
-             BatteryLevel,
              LightLevel,
              Latitude,
              Longitude,
diff --git a/Weather/Service/Data/Resources/Schema.sql b/Weather/Service/Data/Resources/Schema.sql
index 3f0aea0..ec105df 100644
--- a/Weather/Service/Data/Resources/Schema.sql
+++ b/Weather/Service/Data/Resources/Schema.sql
@@ -11,7 +11,6 @@
 		Rain                decimal(2, 2)  NOT NULL,
 		Pressure            decimal(8, 2)  NOT NULL,
 		PressureTemperature decimal(4, 1)  NOT NULL,
-		BatteryLevel        decimal(4, 2)  NOT NULL,
 		LightLevel          decimal(3, 2)  NOT NULL,
 		Latitude            decimal(9, 6)  NOT NULL,
 		Longitude           decimal(9, 6)  NOT NULL,
@@ -22,4 +21,7 @@
 
 ALTER TABLE Reading ALTER COLUMN Rain decimal(3, 3);
 
-ALTER TABLE Reading ALTER COLUMN BatteryLevel decimal(4, 2);
\ No newline at end of file
+IF COL_LENGTH('Reading', 'BatteryLevel') IS NOT NULL
+	ALTER TABLE Reading DROP COLUMN BatteryLevel;
+
+ALTER TABLE Reading ALTER COLUMN LightLevel decimal(8, 2);
diff --git a/Weather/Service/Models/WeatherValueType.cs b/Weather/Service/Models/WeatherValueType.cs
index abcad7a..53108c8 100644
--- a/Weather/Service/Models/WeatherValueType.cs
+++ b/Weather/Service/Models/WeatherValueType.cs
@@ -11,7 +11,6 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models
         Rain,
         Pressure,
         PressureTemperature,
-        BatteryLevel,
         LightLevel,
         Altitude,
         SatelliteCount
diff --git a/Weather/Service/Service.csproj b/Weather/Service/Service.csproj
index 7f04eae..607a195 100644
--- a/Weather/Service/Service.csproj
+++ b/Weather/Service/Service.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.1.1" />
+    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.1.5" />
     <PackageReference Include="Dapper" Version="2.0.30" />
     <PackageReference Include="DecimalMath.DecimalEx" Version="1.0.2" />
     <PackageReference Include="MathNet.Numerics" Version="4.11.0" />