Polishing

Delete scheduled notifications on deletion and completion of task

Author: reloni

RequestTests.paw

@@ -32,15 +32,17 @@ bool HasEqualDueDatest(Task task, PushNotification notification)
 				return false;
 		}
 
-		public async System.Threading.Tasks.Task SchedulePushNotification(Task task)
+		public async System.Threading.Tasks.Task SchedulePushNotifications(Task task)
 		{
 			var currentNotification = task.PushNotifications.FirstOrDefault();
 
-			if (HasEqualDueDatest(task, currentNotification))
+			if (!task.Completed && HasEqualDueDatest(task, currentNotification))
 				return;
 
 			await DeletePushNotification(currentNotification);
-			await CreatePushNotification(task);
+
+			if (!task.Completed)
+				await CreatePushNotification(task);
 		}
 
 		async System.Threading.Tasks.Task DeletePushNotification(PushNotification notification)

src/SimpleToDoService/Common/PushNotificationScheduler.cs

@@ -28,127 +28,5 @@ public IActionResult Get()
 		{
 			return Ok();
 		}
-
-		[HttpPost("push2")]
-		public async Task<IActionResult> Push2() 
-		{
-			var request = WebRequest.Create("https://onesignal.com/api/v1/notifications") as HttpWebRequest;
-
-			request.Method = "POST";
-			request.ContentType = "application/json; charset=utf-8";
-			request.Headers["authorization"] = "Basic NTNmZWI0MjktOWI2My00M2FiLTk1ZDQtMDljYjBhMjhhM2Vh";
-
-			var sendJson = JObject.FromObject(new {
-				app_id = "ffe9789a-e9bc-4789-9cbb-4552664ba3fe",
-				contents = new { en = "Test message" },
-				filters = new [] { new { field = "tag", key = "custom", relation = "=", value = "tag" } },
-				send_after = "2018-04-23 17:58:00 GMT+0300"
-			});
-
-			var byteArray = Encoding.UTF8.GetBytes(sendJson.ToString());
-
-			try
-			{
-				using (var writer = await request.GetRequestStreamAsync())
-				{
-					writer.Write(byteArray, 0, byteArray.Length);
-				}
-
-				using (var response = await request.GetResponseAsync())
-				using (var reader = new StreamReader(response.GetResponseStream()))
-				{
-					var json = JObject.Parse(reader.ReadToEnd());
-					System.Diagnostics.Debug.WriteLine(String.Format("id = {0}", json["id"]));
-				}
-			}
-			catch (WebException ex)
-			{
-				System.Diagnostics.Debug.WriteLine(ex.Message);
-				System.Diagnostics.Debug.WriteLine(new StreamReader(ex.Response.GetResponseStream()).ReadToEnd());
-			}
-
-			return Ok();
-		}
-
-		[HttpGet("push")]
-		public async Task<IActionResult> Push()
-		{
-			var deviceId = "LySqbodo7WMqWO24vEULM1x4na/sm43fYuNs9/eZHCs=";
-			int port = 2195;
-			string hostname = "gateway.sandbox.push.apple.com";
-			//var hostname = "gateway.push.apple.com";
-
-			//I have removed certificate. Keep your certificate in wwwroot/certificate location. This location is not mandatory
-			string certificatePath = "/Users/AntonEfimenko/Documents/Programming/todo-cert/cert-prod.pfx";
-			//var clientCertificate = new X509Certificate2(certificatePath, "11", X509KeyStorageFlags.PersistKeySet);
-			X509Certificate2 clientCertificate = new X509Certificate2(System.IO.File.ReadAllBytes(certificatePath), "");
-			X509Certificate2Collection certificatesCollection = new X509Certificate2Collection(clientCertificate);
-
-			TcpClient client = new TcpClient(AddressFamily.InterNetwork);
-			await client.ConnectAsync(hostname, port);
-
-
-			//SslStream sslStream = new SslStream(client.GetStream(), false);
-			SslStream sslStream = new SslStream(
-				client.GetStream(), false,
-				new RemoteCertificateValidationCallback(ValidateServerCertificate),
-				null);
-
-			try
-			{
-				await sslStream.AuthenticateAsClientAsync(hostname, certificatesCollection, SslProtocols.Tls, false);
-				MemoryStream memoryStream = new MemoryStream();
-				BinaryWriter writer = new BinaryWriter(memoryStream);
-				writer.Write((byte)0);
-				writer.Write((byte)0);
-				writer.Write((byte)32);
-
-				writer.Write(Convert.FromBase64String(deviceId));
-				string payload = "{\"aps\":{\"alert\":\"" + "Test message" + "\",\"badge\":0,\"sound\":\"default\"}}";
-				writer.Write((byte)0);
-				writer.Write((byte)payload.Length);
-				byte[] b1 = System.Text.Encoding.UTF8.GetBytes(payload);
-				writer.Write(b1);
-				writer.Flush();
-				byte[] array = memoryStream.ToArray();
-				sslStream.Write(array);
-				sslStream.Flush();
-				client.Dispose();
-			}
-			catch (Exception ex)
-			{
-				var m = ex.Message;
-				throw ex;
-			}
-			finally 
-			{
-				client.Dispose();	
-			}
-			//catch// (AuthenticationException ex)
-			//{
-			//	client.Dispose();
-			//}
-			//catch// (Exception e)
-			//{
-			//	client.Dispose();
-			//}
-
-			return Content("Notification sent. Check your device.");
-		}
-
-		private static bool ValidateServerCertificate(
-			  object sender,
-			  X509Certificate certificate,
-			  X509Chain chain,
-			  SslPolicyErrors sslPolicyErrors)
-		{
-			if (sslPolicyErrors == SslPolicyErrors.None)
-				return true;
-
-			Console.WriteLine("Certificate error: {0}", sslPolicyErrors);
-
-			// Do not allow this client to communicate with unauthenticated servers.
-			return false;
-		}
 	}
 }

src/SimpleToDoService/Controllers/RootController.cs

@@ -71,7 +71,7 @@ public async System.Threading.Tasks.Task<IActionResult> Post([FromBody] Task ent
 
 			var created = repository.CreateTask(entry);
 
-			await new PushNotificationScheduler(repository).SchedulePushNotification(created);
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(created);
 
 			return CreatedAtRoute("GetTask", new { Uuid = created.Uuid }, created);
 		}
@@ -95,27 +95,30 @@ public async System.Threading.Tasks.Task<IActionResult> Put(Guid? uuid, [FromBod
 
 			var reloaded = repository.Task(CurrentUserUuid, entry.Uuid);
 
-			await new PushNotificationScheduler(repository).SchedulePushNotification(reloaded);
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(reloaded);
 
 			return Ok(updated);
 		}
 
 		[HttpDelete("{uuid:Guid?}")]
-		public IActionResult Delete(Guid? uuid)
+		public async System.Threading.Tasks.Task<IActionResult> Delete(Guid? uuid)
 		{
 			if (!uuid.HasValue)
 				return BadRequest(new ServiceError() { Message = "Object Uuid not specified" });
 
-			var deleted = repository.DeleteTask(uuid.Value);
+			var toDelete = repository.Task(CurrentUserUuid, uuid.Value);
+			if(toDelete == null)
+				return new NotFoundResult();
 
-			if (deleted)
-				return new StatusCodeResult(204);
+			toDelete.TargetDate = null;
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(toDelete);
 
-			return new NotFoundResult();
+			repository.DeleteTask(toDelete);
+			return new StatusCodeResult(204);
 		}
 
 		[HttpPost("{uuid:Guid}/ChangeCompletionStatus/")]
-		public IActionResult ChangeCompletionStatus(Guid uuid, [FromQuery] bool completed)
+		public async System.Threading.Tasks.Task<IActionResult> ChangeCompletionStatus(Guid uuid, [FromQuery] bool completed)
 		{
 			var entry = repository.Task(CurrentUserUuid, uuid);
 
@@ -125,6 +128,8 @@ public IActionResult ChangeCompletionStatus(Guid uuid, [FromQuery] bool complete
 			entry.Completed = completed;
 			repository.UpdateTask(entry);
 
+			await new PushNotificationScheduler(repository).SchedulePushNotifications(entry);
+
 			return Ok(entry);
 		}
 	}

src/SimpleToDoService/Controllers/TasksController.cs

@@ -93,6 +93,9 @@ public class Task
 		[ForeignKey("UserUuid")]
 		public User User { get; set; }
 
+		[XmlIgnore]
+		[JsonIgnore]
+		[IgnoreDataMember]
 		public IEnumerable<PushNotification> PushNotifications { get; set; }
 	}
 

src/SimpleToDoService/Database/Entities.cs

@@ -16,6 +16,7 @@ public interface IToDoRepository
 		Task CreateTask(Task task);
 		Task UpdateTask(Task task);
 		bool DeleteTask(Guid uuid);
+		bool DeleteTask(Task task);
 		User CreateUser(User user);
 		bool DeleteUser(User user);
 		User UpdateUser(User user);
@@ -96,6 +97,21 @@ public bool DeleteTask(Guid uuid)
 			return true;
 		}
 
+		public bool DeleteTask(Task task)
+		{
+			context.Tasks.Remove(task);
+			try
+			{
+				context.SaveChanges();
+			}
+			catch (DbUpdateConcurrencyException)
+			{
+				// entity doesn't exists in this case
+				return false;
+			}
+			return true;
+		}
+
 		public User CreateUser(User user)
 		{
 			user.Uuid = new Guid();