Merge pull request #777 from OneCommunityGlobal/development

Backend Release to Main [1.50]

src/controllers/bmdashboard/bmIssueController.js

@@ -0,0 +1,29 @@
+const mongoose = require('mongoose');
+
+const bmIssueController = function (BuildingIssue) {
+    const bmGetIssue = async (req, res) => {
+        try {
+            BuildingIssue
+            .find()
+            .populate()
+            .then(result => res.status(200).send(result))
+            .catch(error => res.status(500).send(error));
+        } catch (err) {
+            res.json(err);
+        }
+    };
+
+    const bmPostIssue = async (req, res) => {
+        try {
+            const newIssue = BuildingIssue.create(req.body)
+            .then(result => res.status(201).send(result))
+            .catch(error => res.status(500).send(error));
+        } catch (err) {
+            res.json(err);
+        }
+    };
+
+    return { bmGetIssue, bmPostIssue };
+};
+
+module.exports = bmIssueController;

src/controllers/userProfileController.js

@@ -246,6 +246,7 @@ const userProfileController = function (UserProfile) {
     up.bioPosted = req.body.bioPosted || 'default';
     up.isFirstTimelog = true;
     up.actualEmail = req.body.actualEmail;
+    up.isVisible = !['Administrator', 'Mentor', 'Owner'].includes(req.body.role);
 
     up.save()
       .then(() => {

src/models/bmdashboard/buildingIssue.js

@@ -0,0 +1,17 @@
+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+
+const buildingIssue = new Schema({
+    createdDate: { type: Date, required: true, default: Date.now() },
+    issueDate: { type: String, required: true },
+    createdBy: { type: mongoose.SchemaTypes.ObjectId, ref: 'userProfile', required: true },
+    staffInvolved: [{ type: mongoose.SchemaTypes.ObjectId, ref: 'userProfile' }],
+    issueTitle: [{ type: String, required: true, maxLength: 50 }],
+    issueText: [{ type: String, required: true, maxLength: 500 }],
+    imageUrl: [{ type: String }],
+    // not sure if we still need related lesson here:
+    // relatedLesson: { type: mongoose.SchemaTypes.ObjectId, ref: 'buildingNewLesson', required: true },
+});
+
+module.exports = mongoose.model('buildingIssue', buildingIssue, 'buildingIssues');

src/routes/bmdashboard/bmIssueRouter.js

@@ -0,0 +1,13 @@
+const express = require('express');
+
+const routes = function (buildingIssue) {
+    const IssueRouter = express.Router();
+    const controller = require('../../controllers/bmdashboard/bmIssueController')(buildingIssue);
+
+    IssueRouter.route('/issues')
+        .get(controller.bmGetIssue);
+    IssueRouter.route('/issue/add')
+        .post(controller.bmPostIssue);
+    return IssueRouter;
+};
+module.exports = routes;

src/startup/routes.js

@@ -25,6 +25,7 @@ const permissionChangeLog = require('../models/permissionChangeLog');
 const mapLocations = require('../models/mapLocation');
 const buildingProject = require('../models/bmdashboard/buildingProject');
 const buildingNewLesson = require('../models/bmdashboard/buildingNewLesson');
+const buildingIssue = require('../models/bmdashboard/buildingIssue');
 const {
   invTypeBase,
   materialType,
@@ -123,6 +124,9 @@ const bmInventoryTypeRouter = require('../routes/bmdashboard/bmInventoryTypeRout
 const bmToolRouter = require('../routes/bmdashboard/bmToolRouter')(
   buildingTool,
 );
+const bmIssueRouter = require('../routes/bmdashboard/bmIssueRouter')(
+  buildingIssue,
+);
 
 module.exports = function (app) {
   app.use('/api', forgotPwdRouter);
@@ -165,4 +169,5 @@ module.exports = function (app) {
   app.use('/api/bm', bmToolRouter);
   app.use('/api/bm', bmConsumablesRouter);
   app.use('/api', timeOffRequestRouter);
+  app.use('api', bmIssueRouter);
 };

src/websockets/TimerService/clientsHandler.js

@@ -44,6 +44,7 @@ export const action = {
   FORCED_PAUSE: 'FORCED_PAUSE',
   ACK_FORCED: 'ACK_FORCED',
   START_CHIME: 'START_CHIME',
+  HEARTBEAT: 'ping',
 };
 
 const MAX_HOURS = 5;
@@ -170,22 +171,21 @@ export const handleMessage = async (msg, clients, userId) => {
   const client = clients.get(userId);
   let resp = null;
 
-  const req = msg.toString();
-  switch (req) {
+  switch (msg) {
     case action.START_TIMER:
       startTimer(client);
       break;
-    case req.match(/SET_GOAL=/i)?.input:
-      setGoal(client, req);
+    case msg.match(/SET_GOAL=/i)?.input:
+      setGoal(client, msg);
       break;
-    case req.match(/ADD_TO_GOAL=/i)?.input:
-      addGoal(client, req);
+    case msg.match(/ADD_TO_GOAL=/i)?.input:
+      addGoal(client, msg);
       break;
-    case req.match(/REMOVE_FROM_GOAL=/i)?.input:
-      removeGoal(client, req);
+    case msg.match(/REMOVE_FROM_GOAL=/i)?.input:
+      removeGoal(client, msg);
       break;
-    case req.match(/START_CHIME=/i)?.input:
-      startChime(client, req);
+    case msg.match(/START_CHIME=/i)?.input:
+      startChime(client, msg);
       break;
     case action.PAUSE_TIMER:
       pauseTimer(client);
@@ -202,11 +202,10 @@ export const handleMessage = async (msg, clients, userId) => {
     case action.STOP_TIMER:
       stopTimer(client);
       break;
-
     default:
       resp = {
         ...client,
-        error: `Unknown operation ${req}, please use one of ${action}`,
+        error: `Unknown operation ${msg}, please use one from { ${Object.values(action).join(', ')} }`,
       };
       break;
   }

src/websockets/index.js

@@ -97,7 +97,12 @@ export default async (expServer) => {
     * And we broadcast the response to all the clients that are connected to the same user.
     */
     ws.on("message", async (data) => {
-      const resp = await handleMessage(data, clients, userId);
+      const msg = data.toString();
+      if (msg === action.HEARTBEAT) {
+        ws.send(JSON.stringify({ heartbeat: "pong" }));
+        return;
+      }
+      const resp = await handleMessage(msg, clients, userId);
       broadcastToSameUser(connections, userId, resp);
     });
 
@@ -121,7 +126,6 @@ export default async (expServer) => {
   });
 
   // For each new connection we start a time interval of 1min to check if the connection is alive.
-  // change to 1min before push
   const interval = setInterval(() => {
     wss.clients.forEach((ws) => {
       if (ws.isAlive === false) {
@@ -130,7 +134,7 @@ export default async (expServer) => {
       ws.isAlive = false;
       ws.ping();
     });
-  }, 10000);
+  }, 60000);
 
   wss.on('close', () => {
     clearInterval(interval);