From 10bc4d0f275f5183da672ece1d7dfa5da8375b3f Mon Sep 17 00:00:00 2001
From: marcinzelent <zelent.marcin@gmail.com>
Date: Mon, 27 Nov 2017 12:41:19 +0100
Subject: Refactored code and added method in controller for getting readings
 from last week.

---
 AirPollutionWebApi/SqlOperator.cs | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

(limited to 'AirPollutionWebApi/SqlOperator.cs')

diff --git a/AirPollutionWebApi/SqlOperator.cs b/AirPollutionWebApi/SqlOperator.cs
index 74ad2e8..bde60f8 100644
--- a/AirPollutionWebApi/SqlOperator.cs
+++ b/AirPollutionWebApi/SqlOperator.cs
@@ -7,7 +7,8 @@ namespace AirPollutionWebApi.Singletons
 {
 	public static class SqlOperator
 	{
-		const string ConnectionString = "Server=tcp:forschool.database.windows.net,1433;" +
+		const string ConnectionString = 
+            "Server=tcp:forschool.database.windows.net,1433;" +
             "Initial Catalog=schooldb;" +
             "Persist Security Info=False;" +
             "User ID=***REMOVED***;" +
@@ -17,13 +18,12 @@ namespace AirPollutionWebApi.Singletons
             "TrustServerCertificate=False;" +
             "Connection Timeout=30;";
 
-        public static List<Reading> GetAllReadings()
+        public static List<Reading> GetReadings(string command)
 		{
 			var readings = new List<Reading>();
 
 			using (SqlConnection databaseConnection = new SqlConnection(ConnectionString))
 			{
-                string command = "SELECT * FROM Readings;";
 				databaseConnection.Open();
 				SqlCommand selectCommand = new SqlCommand(command, databaseConnection);
 				var reader = selectCommand.ExecuteReader();
@@ -43,32 +43,6 @@ namespace AirPollutionWebApi.Singletons
             return readings;
 		}
 
-        public static Reading GetReadingById(int id)
-		{
-            Reading reading = new Reading();
-
-			using (SqlConnection databaseConnection = new SqlConnection(ConnectionString))
-			{
-                string command = $"SELECT * FROM Readings WHERE Id={id};";
-				databaseConnection.Open();
-				SqlCommand selectCommand = new SqlCommand(command, databaseConnection);
-				var reader = selectCommand.ExecuteReader();
-				while (reader.Read())
-				{
-					reading = new Reading
-					{
-						Id = reader.GetInt32(0),
-						TimeStamp = reader.GetInt32(1),
-						Co = reader.GetInt32(2),
-						No = reader.GetInt32(3),
-						So = reader.GetInt32(4)
-					};
-				}
-			}
-
-            return reading;
-		}
-
         public static void PutReading(int id, Reading reading)
 		{
 			using (SqlConnection dbCon = new SqlConnection(ConnectionString))
-- 
cgit v1.2.3