Merge branch 'PR' into develop

myems-api/core/webmessage.py

@@ -245,6 +245,118 @@ class WebMessageStatusNewCollection:
 
         resp.text = json.dumps(result)
 
+    @staticmethod
+    @user_logger
+    def on_put(req, resp):
+        """Handles PUT requests"""
+        try:
+            raw_json = req.stream.read().decode('utf-8')
+        except Exception as ex:
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.EXCEPTION', description=ex)
+
+        new_values = json.loads(raw_json)
+
+        if 'status' not in new_values['data'].keys() or \
+                not isinstance(new_values['data']['status'], str) or \
+                len(str.strip(new_values['data']['status'])) == 0 or \
+                str.strip(new_values['data']['status']) not in ('new', 'acknowledged', 'read'):
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.INVALID_STATUS')
+        status = str.strip(new_values['data']['status'])
+
+        # reply is required for 'acknowledged' status
+        if status == 'acknowledged' and \
+                ('reply' not in new_values['data'].keys() or
+                 not isinstance(new_values['data']['reply'], str) or
+                 len(str.strip(new_values['data']['reply'])) == 0):
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.INVALID_REPLY')
+            reply = str.strip(new_values['data']['reply'])
+        else:
+            reply = None
+
+        # Verify User Session
+        token = req.headers.get('TOKEN')
+        user_uuid = req.headers.get('USER-UUID')
+        if token is None:
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN')
+        if user_uuid is None:
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN')
+
+        cnx = mysql.connector.connect(**config.myems_user_db)
+        cursor = cnx.cursor(dictionary=True)
+
+        query = (" SELECT utc_expires "
+                 " FROM tbl_sessions "
+                 " WHERE user_uuid = %s AND token = %s")
+        cursor.execute(query, (user_uuid, token,))
+        row = cursor.fetchone()
+
+        if row is None:
+            if cursor:
+                cursor.close()
+            if cnx:
+                cnx.disconnect()
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.INVALID_SESSION_PLEASE_RE_LOGIN')
+        else:
+            utc_expires = row['utc_expires']
+            if datetime.utcnow() > utc_expires:
+                if cursor:
+                    cursor.close()
+                if cnx:
+                    cnx.disconnect()
+                raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                       description='API.USER_SESSION_TIMEOUT')
+
+        cursor.execute(" SELECT id "
+                       " FROM tbl_users "
+                       " WHERE uuid = %s ",
+                       (user_uuid,))
+        row = cursor.fetchone()
+        if row is None:
+            if cursor:
+                cursor.close()
+            if cnx:
+                cnx.disconnect()
+            raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+                                   description='API.INVALID_USER_PLEASE_RE_LOGIN')
+        else:
+            user_id = row['id']
+
+        if cursor:
+            cursor.close()
+        if cnx:
+            cnx.disconnect()
+
+        cnx = mysql.connector.connect(**config.myems_fdd_db)
+        cursor = cnx.cursor()
+
+        cursor.execute(" SELECT user_id "
+                       " FROM tbl_web_messages "
+                       " WHERE status = %s AND user_id = %s ", ('new', user_id))
+        if cursor.fetchall() is None:
+            cursor.close()
+            cnx.disconnect()
+            raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
+                                   description='API.WEB_MESSAGE_NOT_FOUND')
+
+        update_row = (" UPDATE tbl_web_messages "
+                      " SET status = %s, reply = %s "
+                      " WHERE status = %s AND user_id = %s ")
+        cursor.execute(update_row, (status,
+                                    reply,
+                                    'new',
+                                    user_id,))
+        cnx.commit()
+
+        cursor.close()
+        cnx.disconnect()
+
+        resp.status = falcon.HTTP_200
+
 
 class WebMessageItem:
     @staticmethod

web/src/components/MyEMS/Notification/Notification.js

@@ -273,7 +273,49 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
     }).then(json => {
       console.log(isResponseOK);
       if (isResponseOK) {
+        let isResponseOK = false;
+        fetch(APIBaseURL + '/webmessages?' +
+            'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+            '&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+          method: 'GET',
+          headers: {
+            "Content-type": "application/json",
+            "User-UUID": getCookieValue('user_uuid'),
+            "Token": getCookieValue('token')
+          },
+          body: null,
 
+        }).then(response => {
+          if (response.ok) {
+            isResponseOK = true;
+          }
+          return response.json();
+        }).then(json => {
+          if (isResponseOK) {
+            console.log(json);
+            setFetchSuccess(true);
+
+            let notificationList = []
+
+            if (json.length > 0) {
+              json.forEach((currentValue, index) => {
+                let notification = {}
+                notification['id'] = json[index]['id'];
+                notification['subject'] = json[index]['subject'];
+                notification['created_datetime'] = moment(parseInt(json[index]['created_datetime']))
+                    .format("YYYY-MM-DD HH:mm:ss");
+                notification['message'] = json[index]['message'];
+                notification['status'] = json[index]['status'];
+                notification['url'] = json[index]['url'];
+
+                notificationList.push(notification);
+              });
+            }
+
+            setNotifications(notificationList);
+            setSpinnerHidden(true);
+          }
+        });
       } else {
         toast.error(json.description)
       }
@@ -308,7 +350,49 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
     }).then(json => {
       console.log(isResponseOK);
       if (isResponseOK) {
+        let isResponseOK = false;
+        fetch(APIBaseURL + '/webmessages?' +
+            'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+            '&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+          method: 'GET',
+          headers: {
+            "Content-type": "application/json",
+            "User-UUID": getCookieValue('user_uuid'),
+            "Token": getCookieValue('token')
+          },
+          body: null,
 
+        }).then(response => {
+          if (response.ok) {
+            isResponseOK = true;
+          }
+          return response.json();
+        }).then(json => {
+          if (isResponseOK) {
+            console.log(json);
+            setFetchSuccess(true);
+
+            let notificationList = []
+
+            if (json.length > 0) {
+              json.forEach((currentValue, index) => {
+                let notification = {}
+                notification['id'] = json[index]['id'];
+                notification['subject'] = json[index]['subject'];
+                notification['created_datetime'] = moment(parseInt(json[index]['created_datetime']))
+                    .format("YYYY-MM-DD HH:mm:ss");
+                notification['message'] = json[index]['message'];
+                notification['status'] = json[index]['status'];
+                notification['url'] = json[index]['url'];
+
+                notificationList.push(notification);
+              });
+            }
+
+            setNotifications(notificationList);
+            setSpinnerHidden(true);
+          }
+        });
       } else {
         toast.error(json.description)
       }
@@ -338,7 +422,49 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
     }).then(json => {
       console.log(isResponseOK);
       if (isResponseOK) {
+        let isResponseOK = false;
+        fetch(APIBaseURL + '/webmessages?' +
+            'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+            '&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+          method: 'GET',
+          headers: {
+            "Content-type": "application/json",
+            "User-UUID": getCookieValue('user_uuid'),
+            "Token": getCookieValue('token')
+          },
+          body: null,
 
+        }).then(response => {
+          if (response.ok) {
+            isResponseOK = true;
+          }
+          return response.json();
+        }).then(json => {
+          if (isResponseOK) {
+            console.log(json);
+            setFetchSuccess(true);
+
+            let notificationList = []
+
+            if (json.length > 0) {
+              json.forEach((currentValue, index) => {
+                let notification = {}
+                notification['id'] = json[index]['id'];
+                notification['subject'] = json[index]['subject'];
+                notification['created_datetime'] = moment(parseInt(json[index]['created_datetime']))
+                    .format("YYYY-MM-DD HH:mm:ss");
+                notification['message'] = json[index]['message'];
+                notification['status'] = json[index]['status'];
+                notification['url'] = json[index]['url'];
+
+                notificationList.push(notification);
+              });
+            }
+
+            setNotifications(notificationList);
+            setSpinnerHidden(true);
+          }
+        });
       } else {
         toast.error(json.description)
       }

web/src/components/navbar/NotificationDropdown.js

@@ -83,10 +83,9 @@ const NotificationDropdown = ({ t }) => {
 
   const markAsRead = e => {
     e.preventDefault();
-    rawNewNotificationschild.map((notification,index) => {
+
-      console.log('Mark As Read: ', notification["id"])
     let isResponseOK = false;
-      fetch(APIBaseURL + '/webmessages/' + notification["id"], {
+    fetch(APIBaseURL + '/webmessagesnew', {
       method: 'PUT',
       headers: {
         "Content-type": "application/json",
@@ -108,14 +107,58 @@ const NotificationDropdown = ({ t }) => {
     }).then(json => {
       console.log(isResponseOK);
       if (isResponseOK) {
+        let isResponseOK = false;
+        fetch(APIBaseURL + '/webmessagesnew', {
+          method: 'GET',
+          headers: {
+            "Content-type": "application/json",
+            "User-UUID": getCookieValue('user_uuid'),
+            "Token": getCookieValue('token')
+          },
+          body: null,
 
+        }).then(response => {
+          console.log(response);
+          if (response.ok) {
+            isResponseOK = true;
+          }
+          return response.json();
+          }).then(json => {
+            console.log(json)
+          if (isResponseOK) {
+            let NewnotificationList = []
+            if (json.length > 0) {
+                  json.forEach((currentValue, index) => {
+                    let notification = {}
+                    notification['id'] = json[index]['id'];
+                    notification['status'] = json[index]['status'];
+                    notification['subject'] = json[index]['subject']
+                    notification['message'] = json[index]['message'];
+                    notification['created_datetime'] = moment(parseInt(json[index]['created_datetime']))
+                        .format("YYYY-MM-DD HH:mm:ss");
+                    if (NewnotificationList.length > 3 ){
+                        return true
+                    }
+                    if (notification['message'].length > 40){
+                      notification['message'] = notification['message'].substring(0,30) + "...";
+                    }
+                    if (notification["status"] === "new"){
+                      NewnotificationList.push(notification);
+                    }
+
+                  });
+                }
+            setRawNewNotificationschild(NewnotificationList);
+          }
+        }).catch(err => {
+          console.log(err);
+        });
       } else {
         toast.error(json.description)
       }
     }).catch(err => {
       console.log(err);
     });
-  });
   };