Revize f7eb37b3

Refactor + logging config modification

Server/ServerApp/App.config

@@ -25 +25 @@
         <root>
             <level value="ALL" />
             <appender-ref ref="LogFileAppender" />
-            <appender-ref ref="ConsoleAppender" />
         </root>
     </log4net>
 </configuration>

Server/ServerApp/Connection/ConnectionListener.cs

@@ -65 +65 @@
 
 			//Console.WriteLine("Listening...");
 			logger.Info("Started listening at ip: " + ip + ", port: " + PORT);
-
+			Console.WriteLine("Server ready to receive requests.");
 
 			var result = listener.BeginGetContext(ListenerCallback, listener);
 			// result.AsyncWaitHandle.WaitOne(); // ????
@@ -80 +80 @@
 		}
 
 
-		private void HandleRequest(HttpListenerContext context)
-		{
+		//private void HandleRequest(HttpListenerContext context)
+		//{
 
-			//Console.WriteLine("Handling request.");
-			logger.Debug("Handling request.");
-			// Obtain a request object.
-			HttpListenerRequest request = context.Request;
-			// Obtain a response object.
-			HttpListenerResponse response = context.Response;
+		//	//Console.WriteLine("Handling request.");
+		//	logger.Debug("Handling request.");
+		//	// Obtain a request object.
+		//	HttpListenerRequest request = context.Request;
+		//	// Obtain a response object.
+		//	HttpListenerResponse response = context.Response;
 
 
 
-			// add the headers and everything:
-			response.AddHeader("Access-Control-Allow-Credentials", "true");
-			response.AddHeader("Access-Control-Expose-Headers", "ETag");
-			response.AddHeader("Access-Control-Allow-Headers", "Accept, X-Access-Token, X-Application-Name, X-Request-Sent-Time");
-			response.AddHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-			response.AddHeader("Access-Control-Allow-Origin", "*");
+		//	// add the headers and everything:
+		//	response.AddHeader("Access-Control-Allow-Credentials", "true");
+		//	response.AddHeader("Access-Control-Expose-Headers", "ETag");
+		//	response.AddHeader("Access-Control-Allow-Headers", "Accept, X-Access-Token, X-Application-Name, X-Request-Sent-Time");
+		//	response.AddHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+		//	response.AddHeader("Access-Control-Allow-Origin", "*");
 
-			string responseString = "";
-			// Construct a response.
-			if (context.Request.HttpMethod == "GET") // when client says download
-			{
-				logger.Info("received GET request");
+		//	string responseString = "";
+		//	// Construct a response.
+		//	if (context.Request.HttpMethod == "GET") // when client says download
+		//	{
+		//		logger.Info("received GET request");
 
-				string text;
-				using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
-					text = reader.ReadToEnd();
-				string requestString = HttpUtility.UrlDecode(text);
+		//		string text;
+		//		using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
+		//			text = reader.ReadToEnd();
+		//		string requestString = HttpUtility.UrlDecode(text);
 
-				responseString = ConstructGETResponse(requestString);
+		//		responseString = ConstructGETResponse(requestString);
 
-			}
-			else if (context.Request.HttpMethod == "POST") // when client says upload
-			{
-				logger.Info("received POST request");
-				string text;
-				using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
-					text = reader.ReadToEnd();
-				string requestString = HttpUtility.UrlDecode(text);
+		//	}
+		//	else if (context.Request.HttpMethod == "POST") // when client says upload
+		//	{
+		//		logger.Info("received POST request");
+		//		string text;
+		//		using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
+		//			text = reader.ReadToEnd();
+		//		string requestString = HttpUtility.UrlDecode(text);
 
-				responseString = ConstructPOSTResponse(requestString);
+		//		responseString = ConstructPOSTResponse(requestString);
 
 
-			}
-			else
-			{
-				logger.Warn("received request other than GET or POST");
+		//	}
+		//	else
+		//	{
+		//		logger.Warn("received request other than GET or POST");
 
-			}
+		//	}
 
 
-			System.IO.Stream output = response.OutputStream;
-			if (!string.IsNullOrEmpty(responseString))
-			{
-				logger.Debug("Response is not null or empty, sending it to the client.");
-				byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
+		//	System.IO.Stream output = response.OutputStream;
+		//	if (!string.IsNullOrEmpty(responseString))
+		//	{
+		//		logger.Debug("Response is not null or empty, sending it to the client.");
+		//		byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
 
-				// Get a response stream and write the response to it.
-				response.ContentLength64 = buffer.Length;
-				output.Write(buffer, 0, buffer.Length);
-			}
-			else
-			{
-				logger.Debug("Response was null or empty, not sending anything.");
-			}
+		//		// Get a response stream and write the response to it.
+		//		response.ContentLength64 = buffer.Length;
+		//		output.Write(buffer, 0, buffer.Length);
+		//	}
+		//	else
+		//	{
+		//		logger.Debug("Response was null or empty, not sending anything.");
+		//	}
 
 
-			// Close the output stream.
-			//output.Close();
-			response.Close();
+		//	// Close the output stream.
+		//	//output.Close();
+		//	response.Close();
 
-			logger.Debug("At the end of HandleRequest");
-		}
+		//	logger.Debug("At the end of HandleRequest");
+		//}
 
 		/// <summary>
 		/// The callnack method triggered when client request received
@@ -250 +250 @@
 		/// <returns>The response string, empty if client's request doesn't follow protocol</returns>
 		private string ConstructGETResponse(string requestString)
 		{
-			//Console.WriteLine("Constructiing a response for GET request.");
-
-			//int rand = new Random().Next(1, 10);
-			//string msg = "This is a response from the server :) " + rand;
-
-			//Response xmlResp = Response.Randomize();
-			//var xml = XmlCommunication.Serialize(xmlResp);
-
-			//return xml;
-
 
 			logger.Info("Constructing a response for GET request.");
-			logger.Info("Request string: ");
-			logger.Info(requestString);
+			//logger.Info("Request string: ");
+			//logger.Info(requestString);
 
 
 
@@ -288 +278 @@
 			logger.Info("Getting the prediction from the predictor.");
 			logger.Debug("Deserialized request is null? : " + requestDeserialized == null);
 			Response responsePrediction = predictionController.Predict(requestDeserialized);
+			
 
 			string constructedXml = XmlCommunication.Serialize(responsePrediction);
-			logger.Info("Constructed response:");
-			logger.Info(constructedXml);
+			//logger.Info("Constructed response:");
+			//logger.Info(constructedXml);
 
 			// build the xml from the prediction: - TODO mbe an exception can happen here as well? - it shouldnt
 			return constructedXml;//XmlCommunication.Serialize(responsePrediction);
@@ -307 +298 @@
 		private string ConstructPOSTResponse(string requestString)
 		{
 			logger.Info("Constructing a response for POST request.");
-			logger.Info("Request string: ");
-			logger.Info(requestString);
+			//logger.Info("Request string: ");
+			//logger.Info(requestString);
 
 
 
@@ -322 +313 @@
 			}
 			catch
 			{
-				logger.Warn("wrong format of request!");
+				logger.Warn("Wrong format of request!");
 
 				// don't bother to send anything:
 				return string.Empty;
@@ -336 +327 @@
 
 
 			string constructedXml = XmlCommunication.Serialize(responsePrediction);
-			logger.Info("Constructed response:");
-			logger.Info(constructedXml);
+			//logger.Info("Constructed response:");
+			//logger.Info(constructedXml);
 
 			// build the xml from the prediction: - TODO mbe an exception can happen here as well? - it shouldnt
 			return constructedXml;//XmlCommunication.Serialize(responsePrediction);
@@ -346 +337 @@
 
 		}
 
+
+		public XMLProtocolHandler.Date CheckTimeSpanModifyEnd(Date startDate, Date endDate, int maxTimeSpan)
+		{
+			int comp = startDate.CompareTo(endDate); // -1 if start date lower
+
+			if (comp >= 0)
+				return endDate;
+
+			// now we're in a situation where startDate is before endDate - check if span too much:
+
+
+			DateTime start = new DateTime(); 
+			DateTime end = new DateTime();
+			try
+			{
+				start = new DateTime(startDate.year, startDate.month, startDate.day);
+				end = new DateTime(endDate.year, endDate.month, endDate.day);
+			}
+			catch(ArgumentOutOfRangeException aore)
+			{
+				// hopefully the predictor will know what to do
+				return endDate;
+			}
+
+
+			int diff = (end - start).Days;
+
+			if(diff > maxTimeSpan)
+			{
+				DateTime newEnd = start.AddDays(maxTimeSpan);
+				endDate.year = newEnd.Year;
+				endDate.month = newEnd.Month;
+				endDate.day = newEnd.Day;
+
+				return endDate;
+			}
+
+
+			return endDate;
+		}
+
 		/// <summary>
 		/// Gets the IPv4 IP of the machine
 		/// </summary>

Server/ServerApp/Program.cs

@@ -1 @@
-using log4net.Config;
+using log4net;
+using log4net.Config;
 using ServerApp.Connection;
 using ServerApp.Connection.XMLProtocolHandler;
 using ServerApp.DataDownload;
@@ -27 +28 @@
 
     public class Program
     {
+		// logger class instance
+		private static readonly ILog logger = LogManager.GetLogger(typeof(Program));
 
-        static void Main(string[] args)
+		static void Main(string[] args)
         {
+			Console.WriteLine("Server start.");
+
             // setup logging service
             XmlConfigurator.Configure();
 
@@ -41 +46 @@
 				Console.ReadLine();
 				return;
 			}
+			Console.WriteLine("Config parsing successful.");
+
+			//logger.Debug("ahoj");
+			//logger.Warn("ahoj2");
+			//Console.ReadLine();
 
-			// data download test
-			DataDownloader dd = DataDownloadAndRetrievalTest(config);
+			// data download init
+			Console.WriteLine("Downloading open data...");
+			DataDownloader dd = DataDownloaderInit(config);
+			Console.WriteLine("Data downloaded and saved.");
 
 			//WeatherAsStringTest(dd);
 			//Console.ReadLine();
@@ -51 +63 @@
 			// xml building test
 			//XMLTest();
 
-			// PARSE DATA
-			//DataParser parser = new DataParser(dd);
-			//parser.Parse(new DateTime())
 
 			// json parser test
 			//JSONParserTest();
 
-			// model test
-			IPredictionController controller = PredictionTest(dd);
+			// model init
+			Console.WriteLine("Training the predictor...");
+			IPredictionController controller = PredictionControllerInit(dd);
+			Console.WriteLine("Predictor training finished.");
 
-			//parse(new DateTime(2019, 10, 5), , interval = 1, wholeDay = true)
 
 			// commands accepting test
 			// create a thread for commands accepting:
@@ -70 +80 @@
 			inputThread.Start();
 
 
-			// connection test
-			ConnectionTest(controller, config);
+			// connection init
+			ConnectionInit(controller, config);
 
-			//Console.ReadLine();
         }
 
 
-		private static DataDownloader DataDownloadAndRetrievalTest(Config config)
+		private static DataDownloader DataDownloaderInit(Config config)
 		{
 			//test scenario -data download:
 			DataDownloader dd = new DataDownloader(config.DataRootDir, config.DataWebsite, config.DownloadedFilesNaming, config.WeatherSite);
@@ -91 +100 @@
 
 
 
-			Console.WriteLine("Saved files: ");
-			foreach (string s in savedFiles)
-			{
-				Console.WriteLine(s);
-			}
+			//Console.WriteLine("Saved files: ");
+			//foreach (string s in savedFiles)
+			//{
+			//	Console.WriteLine(s);
+			//}
 
-			Console.WriteLine("subdirectories: ");
-			foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
-			{
-				Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
-			}
+			//Console.WriteLine("subdirectories: ");
+			//foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
+			//{
+			//	Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
+			//}
 
-			List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
-			Console.WriteLine("Retrieved data: ");
-			foreach (string s in retrievedData)
-			{
-				Console.WriteLine(s);
-			}
-			Console.WriteLine("all from directory:");
-			retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], null, null);
-			foreach (string s in retrievedData)
-			{
-				Console.WriteLine(s);
-			}
+			//List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
+			//Console.WriteLine("Retrieved data: ");
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
+			//Console.WriteLine("all from directory:");
+			//retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], null, null);
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
 
 
 			return dd;
@@ -166 +175 @@
 			Console.WriteLine(dd.DownloadWeatherPrediction());
 		}
 
-		private static IPredictionController PredictionTest(DataDownloader dd)
+		private static IPredictionController PredictionControllerInit(DataDownloader dd)
 		{
-			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
             // FIXME pass the right references to the JsonParser constructor
             IJsonParser jsonP = new JsonParser(dd, new CsvDataLoader());
             IPredictionController predictionController = new PredictionController(jsonP, p);
             predictionController.Train();
-            //var results = predictionController.Predict()
 			
 
 			return predictionController;
 		}
 
-		private static void ConnectionTest(IPredictionController predictionController, Config config)
+		private static void ConnectionInit(IPredictionController predictionController, Config config)
 		{
 			ConnectionListenerAsync cl = new ConnectionListenerAsync(int.Parse(config.Port), predictionController);
 			cl.StartListening();
@@ -195 +202 @@
 
 			Config extractedConfigInfo = new Config();
 
-			Console.WriteLine(Directory.GetCurrentDirectory());
 			Console.WriteLine("Parsing configuration file...");
 			
 			if (args.Length != 1)

Server/ServerAppFunctionalTests/XMLComTests/XMLDateTesting.cs

@@ +1 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ServerApp.Connection;
+using ServerApp.Connection.XMLProtocolHandler;
+using ServerApp.Predictor;
+using ServerApp.DataDownload;
+using Date = ServerApp.Connection.XMLProtocolHandler.Date;
+using ServerApp.WeatherPredictionParser;
+using ServerApp.Parser.InputData;
+using ServerApp.Parser.Parsers;
+
+namespace ServerAppFunctionalTests.XMLComTests
+{
+	[TestClass]
+	public class XMLDateTesting
+	{
+
+
+		[TestMethod]
+		public void ModifyTimeSpanShort()
+		{
+			ConnectionListenerAsync conn = new ConnectionListenerAsync(0, null);
+
+			Date startDate = new Date();
+			startDate.year = 2019;
+			startDate.month = 1;
+			startDate.day = 1;
+
+
+			Date endDate = new Date();
+			endDate.year = 2019;
+			endDate.month = 1;
+			endDate.day = 2;
+
+			Date res = conn.CheckTimeSpanModifyEnd(startDate, endDate, 15);
+
+			Assert.IsNotNull(res);
+			Assert.AreEqual(endDate.year, res.year);
+			Assert.AreEqual(endDate.month, res.month);
+			Assert.AreEqual(endDate.day, res.day);
+
+		}
+
+
+		[TestMethod]
+		public void ModifyTimeSpanLong()
+		{
+			ConnectionListenerAsync conn = new ConnectionListenerAsync(0, null);
+
+			Date startDate = new Date();
+			startDate.year = 2019;
+			startDate.month = 1;
+			startDate.day = 1;
+
+
+			Date endDate = new Date();
+			endDate.year = 2019;
+			endDate.month = 1;
+			endDate.day = 30;
+
+			Date res = conn.CheckTimeSpanModifyEnd(startDate, endDate, 15);
+
+			Assert.IsNotNull(res);
+			Assert.AreEqual(endDate.year, res.year);
+			Assert.AreEqual(endDate.month, res.month);
+			Assert.AreEqual(endDate.day, 16);
+
+		}
+	}
+}