Further refactoring

Author: reloni

RequestTests.paw

@@ -1,8 +1,26 @@
 using System;
+using SimpleToDoService.Entities;
+
 namespace SimpleToDoService
 {
 	public class ServiceError
 	{
 		public string Message { get; set; }
 	}
 }
+
+static class Extensions 
+{
+	public static DateTime? CheckedTargetDate(this Task task)
+	{
+		if (!task.TargetDate.HasValue)
+			return null;
+
+		var notificationDate = task.TargetDate.Value.ToUniversalTime();
+
+		if (!task.TargetDateIncludeTime)
+			return new DateTime(notificationDate.Year, notificationDate.Month, notificationDate.Day, 0, 0, 0, notificationDate.Kind);
+
+		return task.TargetDate;
+	}
+}

src/SimpleToDoService/Common/Common.cs

@@ -9,18 +9,22 @@
 
 namespace SimpleToDoService.Common
 {
-	public class PushNotificationHelper
+	public class PushNotificationScheduler
 	{
 		private readonly IToDoRepository repository;
 
-		public PushNotificationHelper(IToDoRepository repository)
+		public PushNotificationScheduler(IToDoRepository repository)
 		{
 			this.repository = repository;
 		}
 
 		public async System.Threading.Tasks.Task SchedulePushNotification(Task task)
 		{
-			var currentNotification = task.PushNotifications.FirstOrDefault();//repository.PushNotifications(task).FirstOrDefault();
+			var currentNotification = task.PushNotifications.FirstOrDefault();
+
+			if (currentNotification?.DueDate == task.CheckedTargetDate())
+				return;
+
 			DeletePushNotification(currentNotification);
 			await CreatePushNotification(task);
 		}
@@ -33,7 +37,7 @@ void DeletePushNotification(PushNotification notification)
 
 		async System.Threading.Tasks.Task CreatePushNotification(Task task)
 		{
-			var notificationDate = TaskDate(task);
+			var notificationDate = task.CheckedTargetDate();
 			if (!notificationDate.HasValue)
 				return;
 
@@ -90,18 +94,5 @@ async System.Threading.Tasks.Task CreatePushNotification(Task task)
 			catch { }
 #endif
 		}
-
-		private static DateTime? TaskDate(Task task)
-		{
-			if (!task.TargetDate.HasValue)
-				return null;
-
-			var notificationDate = task.TargetDate.Value.ToUniversalTime();
-
-			if (!task.TargetDateIncludeTime)
-				return new DateTime(notificationDate.Year, notificationDate.Month, notificationDate.Day, 0, 0, 0, notificationDate.Kind);
-
-			return task.TargetDate;
-		}
 	}
 }

…Service/Common/PushNotificationHelper.cs …vice/Common/PushNotificationScheduler.cssrc/SimpleToDoService/Common/PushNotificationHelper.cs renamed to src/SimpleToDoService/Common/PushNotificationScheduler.cs src/SimpleToDoService/Common/PushNotificationHelper.cs renamed to src/SimpleToDoService/Common/PushNotificationScheduler.cs

@@ -71,7 +71,7 @@ public async System.Threading.Tasks.Task<IActionResult> Post([FromBody] Task ent
 
 			var created = repository.CreateTask(entry);
 
-			await new PushNotificationHelper(repository).SchedulePushNotification(created); ;
+			await new PushNotificationScheduler(repository).SchedulePushNotification(created); ;
 
 			return CreatedAtRoute("GetTask", new { Uuid = created.Uuid }, created);
 		}

src/SimpleToDoService/Controllers/TasksController.cs

@@ -46,7 +46,6 @@ public IEnumerable<User> Users()
 		public Task Task(Guid userUuid, Guid entryUuid)
 		{
 			return context.Tasks.Where(o => o.User.Uuid == userUuid && o.Uuid == entryUuid)
-				          .Include(o => o.User)
 				          .Include(o => o.PushNotifications)
 				          .FirstOrDefault();
 		}