Revize 4b847de5

re #8933 Testing LoginParser

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -18 +18 @@
     /// Class representing a parser for json prediction data
     /// </summary>
     /// <author>A. Konig</author>
-    class JsonParser : IJsonParser
+    public class JsonParser : IJsonParser
     {
-        /// <summary> Current weather </summary>
-        WeatherInfo current;
-        public new WeatherInfo Current { get => current; }
-        /// <summary> Prediction for today, tommorrow and day after tommorrow </summary>
-        List<WeatherInfo> predictions;
-        public new List<WeatherInfo> Predictions { get => predictions; set => predictions = value; }
-
         /// <summary> Data loader </summary>
         DataDownloader loader;
         /// <summary> Currently parsed day </summary>
@@ -55 +48 @@
             // TODO ask DataDownloader for download said file and return path to it
             
             // get file
-            string file = DownloadWeatherPrediction();
+            string file = loader.DownloadWeatherPrediction();
             DateTime now = DateTime.Now;
             Console.WriteLine(File.Exists(file));
 
-            current = new WeatherInfo();
-            predictions = new List<WeatherInfo>();
+            Current = new WeatherInfo();
+            Predictions = new List<WeatherInfo>();
 
             if (!File.Exists(file))
                 return;
@@ -84 +77 @@
                     case "current_condition":
                         {
                             ArrayEnumerator currentWeather = weatherP.Current.Value.EnumerateArray();
-                            current = ParseCurrentWeather(currentWeather);
+                            Current = ParseCurrentWeather(currentWeather);
 
                             break;
                         }
@@ -110 +103 @@
         /// </summary>
         private void TestConsoleOutput()
         {
-            Console.WriteLine(current);
-            foreach (WeatherInfo w in predictions)
+            Console.WriteLine(Current);
+            foreach (WeatherInfo w in Predictions)
                 Console.WriteLine(w);
         }
 
-        // TODO move to data loader
-        /// <summary>
-        /// Downloads json file
-        /// </summary>
-        /// <returns> Path to file </returns>
-        private string DownloadWeatherPrediction()
-        {
-            DateTime now = DateTime.Now;
-            WebClient webClient = new WebClient();
-            webClient.DownloadFile("http://wttr.in/Plzen,czechia?format=j1", $"data/{now.Year}{now.Month}{now.Day}.json");
-
-            return $"data/{now.Year}{now.Month}{now.Day}.json";
-        }
-
         /// <summary>
         /// Change data in a way that they now reflect sunrise and sunset times
         /// If current time under sunrise or over sunset -> WeatherConditions is Dark
@@ -137 +116 @@
         private void EncompassSunRiseSetTimes()
         {
             // change current weather
-            if ((current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
-                current.condition = WeatherConditions.Dark;
+            if ((Current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (Current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
+                Current.condition = WeatherConditions.Dark;
 
             // change prediction
-            for (int i = 0; i < predictions.Count - 1; i++)
+            for (int i = 0; i < Predictions.Count - 1; i++)
             {
-                WeatherInfo w = predictions[i];
-                WeatherInfo wNext = predictions[i + 1];
+                WeatherInfo w = Predictions[i];
+                WeatherInfo wNext = Predictions[i + 1];
 
                 // if wNext time < than w time then it is prediction from the next day -> add 24 to correctly calculate timespan
                 int timespan = wNext.startTime.Hour - w.startTime.Hour;
@@ -178 +157 @@
             }
 
             // last prediction
-            WeatherInfo wLast = predictions[predictions.Count - 1];
+            WeatherInfo wLast = Predictions[Predictions.Count - 1];
             TimeSpan endTimeW = new TimeSpan(24, 0, 0);
             int timespanLast = endTimeW.Hours - wLast.startTime.Hour;
             wLast.intervalLength = timespanLast;
@@ -338 +317 @@
                 }
 
                 // Console.WriteLine(weather.ToString());
-                predictions.Add(weather);
-
+                Predictions.Add(weather);
             }
 
         }