@tiledesk/tiledesk-server 2.9.26 → 2.9.27

package/test/quoteManager.js

@@ -25,7 +25,7 @@ const emailMock = require('./mock/emailMock');
 const { MockTdCache } = require('./mock/MockTdCache');
 const mockTdCache = new MockTdCache();
 
-let log = true;
+let log = false;
 
 // CONNECT REDIS - CHECK IT
 const { TdCache } = require('../utils/TdCache');
@@ -60,6 +60,41 @@ const dateList = [
     "2023-10-29T08:45:54.058Z"
 ]
 
+const dateListStress = [
+    "2024-02-05T10:30:00.058Z",
+    "2024-03-05T10:30:00.058Z",
+    "2024-04-05T10:30:00.058Z",
+    "2024-05-05T10:30:00.058Z",
+    "2024-06-05T10:30:00.058Z",
+    "2024-07-05T10:30:00.058Z",
+    "2024-08-05T10:30:00.058Z",
+    "2024-09-05T10:30:00.058Z",
+    "2024-10-05T10:30:00.058Z",
+    "2024-11-05T10:30:00.058Z",
+    "2024-12-05T10:30:00.058Z",
+    "2025-01-05T10:30:00.058Z",
+    "2025-02-05T10:30:00.058Z",
+    "2025-03-05T10:30:00.058Z"
+]
+
+const expectedSlotStarts = [
+    "31/01/2024",
+    "29/02/2024",
+    "31/03/2024",
+    "30/04/2024",
+    "31/05/2024",
+    "30/06/2024",
+    "31/07/2024",
+    "31/08/2024",
+    "30/09/2024",
+    "31/10/2024",
+    "30/11/2024",
+    "31/12/2024",
+    "31/01/2025",
+    "28/02/2025",
+    "31/03/2025",
+
+]
 // connectRedis();
 
 // function connectRedis() {
@@ -104,12 +139,44 @@ quoteManager.start();
 describe('QuoteManager', function () {
 
 
+    it('incrementRequestsCountStress',  (done) => {
+        /**
+         * For this test the subscription starts on 31 Genuary.
+         * Slots must start on 31 Gen, 28/29 Feb, 31 Mar, 30 Apr, ...
+         */
+        let mockProject = projectMock.mockProjectPremiumPlan2;
+        let mockRequest = requestMock.requestMock;
+
+        console.log("Starting stress test with one year long cycle of renewals")
+
+        let i = 0;
+        async function test(date) {
+            
+            mockRequest.createdAt = new Date(date);
+            let key_incremented = await quoteManager.incrementRequestsCount(mockProject, mockRequest);
+            if (log) { console.log("request_date: ", mockRequest.createdAt, "key_incremented: ", key_incremented); }
+            
+            let slot_start = key_incremented.substring(key_incremented.lastIndexOf(':') + 1)
+            expect(slot_start).to.equal(expectedSlotStarts[i]);
+
+            i += 1;
+            if (i < dateListStress.length) {
+                setTimeout(() => {
+                    test(dateListStress[i])
+                }, 250);
+            } else {
+                console.log("All dates tested successfully.")
+                done();
+            }
+        }
+        test(dateListStress[0]);
+
+    }).timeout(5000)
 
     it('incrementRequestsCount', async function () {
-        let mockProject = projectMock.mockProjectSandboxPlan;
+        let mockProject = projectMock.mockProjectBasicPlan;
         let mockRequest = requestMock.requestMock;
 
-
         mockRequest.createdAt = new Date(dateList[0]);
 
         let initial_quote = await quoteManager.getCurrentQuote(mockProject, mockRequest, 'requests');
@@ -207,8 +274,13 @@ describe('QuoteManager', function () {
                         res.should.have.status(200);
                         res.body.should.be.a('object');
 
-                        let date = new Date().toLocaleDateString();
-
+                        const options = {
+                            day: '2-digit',
+                            month: '2-digit',
+                            year: 'numeric',
+                        };                          
+                        let date = new Date().toLocaleDateString(undefined, options);
+                    
                         let key = "quotes:tokens:" + savedProject._id + ":" + date;
                         let message_resp = "value incremented for key " + key;
                         expect(res.body.message).to.equal(message_resp);

package/test/requestRoute.js

@@ -1226,6 +1226,48 @@ describe('RequestRoute', () => {
 
     })
 
+    it('countConversations', function (done) {
+      // this.timeout(10000);
+  
+      var email = "test-request-create-" + Date.now() + "@email.com";
+      var pwd = "pwd";
+  
+      userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+        projectService.create("request-create", savedUser._id, { email: { template: { assignedRequest: "123" } } }).then(function (savedProject) {
+  
+          chai.request(server)
+            .post('/' + savedProject._id + '/requests/')
+            .auth(email, pwd)
+            .set('content-type', 'application/json')
+            .send({ "first_text": "first_text" })
+            .end(function (err, res) {
+
+              if (err) { console.log("err: ", err) };
+              if (log) { console.log("res.body: ", res.body) };
+
+              res.should.have.status(200);
+              res.body.should.be.a('object');
+              
+              console.log("request created")
+              chai.request(server)
+                  .get('/' + savedProject._id + '/requests/count?conversation_quota=true')
+                  .auth(email, pwd)
+                  .end((err, res) => {
+
+                    if (err) { console.log("err: ", err) };
+                    if (log) { console.log("res.body: ", res.body) };
+                    console.log("res.body: ", res.body)
+
+                    res.should.have.status(200);
+
+                    done();
+                  })
+          
+            });
+        });
+      });
+    });
+
     // it('assign', (done) => {
 
 

package/websocket/webSocketServer.js

@@ -197,6 +197,27 @@ class WebSocketServer {
 
         var projectId = urlSub[1];
         winston.debug('projectId: ' + projectId);
+        
+        // sponz support 65203e12f8c0cf002cf4110b
+        // johnny support 62c3f10152dc7400352bab0d
+        // sponz collaudo 66acec0cf7ebf80013d67974
+        // johnny collaudo 6613ff078890fc0013ad3c3a
+        // sponz prod 6565047fdd64fd001323f37c
+        // mweb prod 656054000410fa00132e5dcc
+
+        if (projectId === "65203e12f8c0cf002cf4110b"
+            || projectId === "62c3f10152dc7400352bab0d"
+            || projectId === "66acec0cf7ebf80013d67974"
+            || projectId === "6613ff078890fc0013ad3c3a"
+            || projectId === "6565047fdd64fd001323f37c"
+            || projectId === "656054000410fa00132e5dcc") {
+
+              console.log('WSS onSubscribeCallback - ProjectID ' + projectId);
+              console.log("x-forwarded-for: ", req.headers['x-forwarded-for'], "remote port: ", req.socket.remotePort);
+              console.log("remoteAddress: ",  req.socket.remoteAddress)
+            }
+
+
 
         let q = Project.findOne({ _id: projectId, status: 100 })