From da0372e44cb4094c594449858f0af980296ae563 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Mon, 23 Jan 2023 15:18:50 +1300
Subject: [PATCH] WIP commit

---
 .../notificationAdd/notificationAdd.jsx             | 13 +++++++++----
 server/admin.api.js                                 |  1 +
 server/notifications.model.js                       |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/admin/notificationUtils/notificationAdd/notificationAdd.jsx b/client/admin/notificationUtils/notificationAdd/notificationAdd.jsx
index 51fbecfb4..a1480c0a9 100644
--- a/client/admin/notificationUtils/notificationAdd/notificationAdd.jsx
+++ b/client/admin/notificationUtils/notificationAdd/notificationAdd.jsx
@@ -38,8 +38,8 @@ const NotificationAdd = createClass({
 			dismissKey : this.state.dismissKey,
 			title      : this.state.title,
 			text       : this.state.text,
-			startAt    : this.state.startAt,
-			stopAt     : this.state.stopAt
+			startAt    : Date.parse(this.state.startAt),
+			stopAt     : Date.parse(this.state.stopAt)
 		};
 
 		const notification = await request.post('/admin/notification/add')
@@ -52,7 +52,10 @@ const NotificationAdd = createClass({
 			notificationResult : `Created notification: ${JSON.stringify(notification, null, 2)}`
 		};
 		if(notification.err) {
-			update.notificationResult = err;
+			update.notificationResult = JSON.stringify(notification.err);
+			if(notification.err.code == 11000) {
+				update.notificationResult = `Duplicate dismissKey error! ${this.state.dismissKey} already exists.`;
+			}
 		};
 		if(!notification.err) {
 			update.dismissKey = '';
@@ -62,6 +65,8 @@ const NotificationAdd = createClass({
 			update.stopAt = '';
 		}
 
+		console.log(update);
+
 		this.setState(update);
 	},
 
@@ -74,7 +79,7 @@ const NotificationAdd = createClass({
 					<input className='fieldInput' type='text' value={this.state[field]} onChange={(e)=>this.handleChange(e, field)} placeholder={field} />
 				</div>;
 			})}
-			{this.state.notificationResult}
+			<div className='notificationResult'>{this.state.notificationResult}</div>
 			{/* <label>Dismiss Key:</label>
 			<input type='text' value={this.state.dismissKey} onChange={this.handleChange} placeholder='notification key' />
 			<label>Title:</label>
diff --git a/server/admin.api.js b/server/admin.api.js
index 906bfdcae..53b08faaf 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -110,6 +110,7 @@ router.get('/admin/notification/lookup/:id', mw.adminOnly, (req, res, next)=>{
 
 /* Add new notification */
 router.post('/admin/notification/add', mw.adminOnly, async (req, res, next)=>{
+	console.log(req.body);
 	const notification = await NotificationModel.addNotification(req.body);
 	return res.json(notification);
 });
diff --git a/server/notifications.model.js b/server/notifications.model.js
index bd74ad5b7..6cf4b9c8d 100644
--- a/server/notifications.model.js
+++ b/server/notifications.model.js
@@ -43,7 +43,7 @@ NotificationSchema.statics.addNotification = async function(data){
 	const newNotification = new Notification(data);
 	const savedNotification = await newNotification.save()
 		.catch((err)=>{
-			return { err: err };
+			return { err };
 		});
 
 	return savedNotification;