From ea32633c607a63995bd424df3e62a3a66f962628 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 24 Jul 2020 21:16:36 +0000
Subject: [PATCH]

---
 .../AyaNova/Controllers/NotifyController.cs   | 24 +++++++++++++++++++
 server/AyaNova/resource/de.json               |  4 +++-
 server/AyaNova/resource/en.json               |  4 +++-
 server/AyaNova/resource/es.json               |  4 +++-
 server/AyaNova/resource/fr.json               |  4 +++-
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs
index d96220e0..de20396a 100644
--- a/server/AyaNova/Controllers/NotifyController.cs
+++ b/server/AyaNova/Controllers/NotifyController.cs
@@ -139,6 +139,30 @@ namespace AyaNova.Api.Controllers
             return Ok(ApiOkResponse.Response(ret));
         }
 
+        /// <summary>
+        /// Delete pending notification event
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>NoContent</returns>
+        [HttpDelete("notify-event/{id}")]
+        public async Task<IActionResult> DeleteNotifyEvent([FromRoute] long id)
+        {
+            if (!serverState.IsOpen)
+                return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
+            if (!ModelState.IsValid)
+                return BadRequest(new ApiErrorResponse(ModelState));
+            if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.OpsNotificationSettings))
+            {
+                return StatusCode(403, new ApiNotAuthorizedResponse());
+            }
+            var n = await ct.NotifyEvent.FirstOrDefaultAsync(z => z.Id == id);
+            if (n == null)
+                return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "id"));
+            ct.NotifyEvent.Remove(n);
+            await ct.SaveChangesAsync();
+            return NoContent();
+        }
+
 
         //------------
 
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 2eed47ea..ee88218a 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -1902,5 +1902,7 @@
   "ConnectionSecurity": "SMTP-Verbindungssicherheit",
   "SmtpServerPort": "SMTP-Server-Port",
   "NotifyFromAddress": "SMTP-Benachrichtigungsadresse",
-  "AyaNovaServerURL": "AyaNova Server URL"
+  "AyaNovaServerURL": "AyaNova Server URL",
+  "DeliverAfter":"Liefern nach",
+  "NotifyQueue":"Warteschlange für Benachrichtigungszustellung"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index ef105e94..749d71a8 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1902,5 +1902,7 @@
   "ConnectionSecurity": "SMTP connection security",
   "SmtpServerPort": "SMTP server port",
   "NotifyFromAddress": "SMTP notify from address",
-  "AyaNovaServerURL": "AyaNova server URL"
+  "AyaNovaServerURL": "AyaNova server URL",
+  "DeliverAfter":"Deliver after",
+  "NotifyQueue":"Notify event delivery queue"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index af3ef6ea..f6b6afe2 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -1902,5 +1902,7 @@
   "ConnectionSecurity": "Seguridad de conexión del servidor SMTP",
   "SmtpServerPort": "Puerto SMTP",
   "NotifyFromAddress": "Notificación SMTP desde la dirección",
-  "AyaNovaServerURL": "URL del servidor AyaNova"
+  "AyaNovaServerURL": "URL del servidor AyaNova",
+  "DeliverAfter":"Entregar después",
+  "NotifyQueue":"Notificar cola de entrega de eventos"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index bd3d16f4..9cc69515 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -1902,5 +1902,7 @@
   "ConnectionSecurity": "Sécurité de la connexion SMTP",
   "SmtpServerPort": "Port du serveur SMTP",
   "NotifyFromAddress": "Notification SMTP envoyée depuis l'adresse",
-  "AyaNovaServerURL": "URL du serveur AyaNova"
+  "AyaNovaServerURL": "URL du serveur AyaNova",
+  "DeliverAfter":"Livrer après",
+  "NotifyQueue":"Notifier file d'attente de remise des événements"
 }
\ No newline at end of file