Merge branch 'sync'

Author: reloni

RequestTests.paw

@@ -1,8 +1,20 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using SimpleToDoService.Entities;
 
 namespace SimpleToDoService
 {
+	public class BatchUpdateInstruction
+	{
+		[Required]
+		public IEnumerable<Task> ToUpdate { get; set; }
+		[Required]
+		public IEnumerable<Guid> ToDelete { get; set; }
+		[Required]
+		public IEnumerable<Task> ToCreate { get; set; }
+	}
+
 	public class ServiceError
 	{
 		public string Message { get; set; }

src/SimpleToDoService/Common/Common.cs

@@ -67,11 +67,7 @@ public async System.Threading.Tasks.Task<IActionResult> Post([FromBody] Task ent
 			if (entry == null)
 				return BadRequest();
 
-			entry.UserUuid = CurrentUserUuid;
-
-			var created = repository.CreateTask(entry);
-
-			await new PushNotificationScheduler(repository).SchedulePushNotifications(created);
+			var created = await CreateTask(entry);
 
 			return CreatedAtRoute("GetTask", new { Uuid = created.Uuid }, created);
 		}
@@ -86,17 +82,12 @@ public async System.Threading.Tasks.Task<IActionResult> Put(Guid? uuid, [FromBod
 				return BadRequest(ModelState);
 
 			entry.Uuid = uuid.Value;
-			entry.UserUuid = CurrentUserUuid;
 
-			var updated = repository.UpdateTask(entry);
+			var updated = await UpdateTask(entry);
 
 			if (updated == null)
 				return NotFound(entry);
 
-			var reloaded = repository.Task(CurrentUserUuid, entry.Uuid);
-
-			await new PushNotificationScheduler(repository).SchedulePushNotifications(reloaded);
-
 			return Ok(updated);
 		}
 
@@ -106,14 +97,11 @@ public async System.Threading.Tasks.Task<IActionResult> Delete(Guid? uuid)
 			if (!uuid.HasValue)
 				return BadRequest(new ServiceError() { Message = "Object Uuid not specified" });
 
-			var toDelete = repository.Task(CurrentUserUuid, uuid.Value);
-			if(toDelete == null)
-				return new NotFoundResult();
+			var deleted = await DeleteTask(uuid.Value);
 
-			toDelete.TargetDate = null;
-			await new PushNotificationScheduler(repository).SchedulePushNotifications(toDelete);
+			if (!deleted)
+				return new NotFoundResult();
 
-			repository.DeleteTask(toDelete);
 			return new StatusCodeResult(204);
 		}
 
@@ -132,5 +120,73 @@ public async System.Threading.Tasks.Task<IActionResult> ChangeCompletionStatus(G
 
 			return Ok(entry);
 		}
+
+		[HttpPost("BatchUpdate")]
+		public async System.Threading.Tasks.Task<IActionResult> BatchUpdate([FromBody] BatchUpdateInstruction instruction) {
+			if (!ModelState.IsValid)
+				return BadRequest(ModelState);
+
+			foreach(var task in instruction.ToCreate)
+			{
+				await CreateTask(task);
+			}
+
+			foreach(var task in instruction.ToUpdate)
+			{
+				await UpdateTask(task);
+			}
+
+			foreach(var uuid in instruction.ToDelete)
+			{
+				await DeleteTask(uuid);
+			}
+
+			return Ok(Get(null));
+		}
+
+		private async System.Threading.Tasks.Task<Task> CreateTask(Task task) 
+		{
+			task.UserUuid = CurrentUserUuid;
+
+			if (!task.TargetDate.HasValue)
+				task.TargetDateIncludeTime = false;
+			
+			var created = repository.CreateTask(task);
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(created);
+			return created;
+		}
+
+		private async System.Threading.Tasks.Task<Task> UpdateTask(Task task)
+		{
+			task.UserUuid = CurrentUserUuid;
+
+			if (!task.TargetDate.HasValue)
+				task.TargetDateIncludeTime = false;
+
+			var updated = repository.UpdateTask(task);
+
+			if (updated == null)
+				return null;
+
+			var reloaded = repository.Task(CurrentUserUuid, task.Uuid);
+
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(reloaded);
+
+			return reloaded;
+		}
+
+		private async System.Threading.Tasks.Task<bool> DeleteTask(Guid uuid)
+		{
+			var toDelete = repository.Task(CurrentUserUuid, uuid);
+			if (toDelete == null)
+				return false;
+
+			toDelete.TargetDate = null;
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(toDelete);
+
+			repository.DeleteTask(toDelete);
+
+			return true;
+		}
 	}
 }