@adaptivestone/framework 3.4.1 → 3.4.3

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 3.4.2
+
+[UPDATE] updated deps
+[FIX] fix documentation generation
+
 ### 3.4.1
 
 [FIX] fix documentation generation

package/commands/GetOpenApiJson.js

@@ -81,6 +81,7 @@ class GetOpenApiJson extends AbstractCommand {
 
     openApi.paths = {};
 
+    const permissionWithRoutes = {};
     for (const controller of baseDocumentation) {
       for (const route of controller.routesInfo) {
         const routeInfo = route[Object.keys(route)?.[0]];
@@ -90,7 +91,9 @@ class GetOpenApiJson extends AbstractCommand {
         ];
 
         const securitySchemaNames = [];
-        let permissionString = '';
+
+        permissionWithRoutes[Object.keys(route)?.[0]] = [];
+
         if (middlewares?.length) {
           for (const middleware of middlewares) {
             if (middleware?.authParams?.length) {
@@ -98,7 +101,9 @@ class GetOpenApiJson extends AbstractCommand {
                 const { permissions, ...mainFields } = authParam;
                 const fullName = authParam.name;
                 if (permissions) {
-                  permissionString = permissions;
+                  permissionWithRoutes[Object.keys(route)?.[0]].push(
+                    permissions,
+                  );
                 }
 
                 if (!openApi.components.securitySchemes[fullName]) {
@@ -114,7 +119,6 @@ class GetOpenApiJson extends AbstractCommand {
         }
 
         let routeName = Object.keys(route)[0];
-
         if (routeName === '/') {
           // eslint-disable-next-line no-continue
           continue;
@@ -150,7 +154,13 @@ class GetOpenApiJson extends AbstractCommand {
 
         const routeDescription =
           route[Object.keys(route)[0]]?.description || 'empty description';
-        const routeDescriptionWithPermissions = `${permissionString} ${routeDescription}`;
+        const permissions =
+          permissionWithRoutes[Object.keys(route)[0]][
+            permissionWithRoutes[Object.keys(route)[0]].length - 1
+          ];
+        const routeDescriptionWithPermissions = `${
+          permissions || ''
+        } ${routeDescription}`;
         const methodName = route[Object.keys(route)[0]].method.toLowerCase();
         const routeTitle = route[Object.keys(route)[0]].name;
 
@@ -232,6 +242,19 @@ class GetOpenApiJson extends AbstractCommand {
                   type: field.innerType,
                 };
               }
+
+              if (field.type === 'lazy') {
+                groupBodyFields[field.name] = {
+                  oneOf: [
+                    {
+                      type: 'object',
+                    },
+                    {
+                      type: 'string',
+                    },
+                  ],
+                };
+              }
             }
           }
 

package/modules/AbstractController.js

@@ -364,13 +364,11 @@ class AbstractController extends Base {
               .map((middleware) => {
                 const routeFullPath = route.fullPath.toUpperCase();
                 const middlewareFullPath = middleware.fullPath.toUpperCase();
-                const middlewareFullPathWithSliced = middleware.fullPath
-                  .toUpperCase()
-                  .slice(0, -1);
                 if (
-                  middlewareFullPath === routeFullPath ||
-                  middlewareFullPath === `${routeFullPath}*` ||
-                  routeFullPath?.indexOf(middlewareFullPathWithSliced) !== -1
+                  route.method.toLowerCase() ===
+                    middleware.method.toLowerCase() &&
+                  (middlewareFullPath === routeFullPath ||
+                    middlewareFullPath === `${routeFullPath}*`)
                 ) {
                   return {
                     name: middleware.name,
@@ -390,6 +388,7 @@ class AbstractController extends Base {
                     const middlewareFullPathWithSliced = middleware.fullPath
                       .toUpperCase()
                       .slice(0, -1);
+
                     return (
                       middlewareFullPath === routeFullPath ||
                       middlewareFullPath === `${routeFullPath}*` ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Adaptive stone node js framework",
   "main": "src/index.js",
   "engines": {

package/tests/setup.js

@@ -1,13 +1,14 @@
+const path = require('node:path');
 /* eslint-disable jest/require-top-level-describe */
 const { MongoMemoryReplSet } = require('mongodb-memory-server');
 const mongoose = require('mongoose');
 
 let mongoMemoryServerInstance;
-const path = require('path');
+
 const redis = require('redis');
 const Server = require('../server');
 
-const clearRadisNamespace = require('../helpers/redis/clearNamespace');
+const clearRedisNamespace = require('../helpers/redis/clearNamespace');
 
 jest.setTimeout(1000000);
 beforeAll(async () => {
@@ -29,6 +30,7 @@ beforeAll(async () => {
       models: process.env.TEST_FOLDER_MODELS || path.resolve('./models'),
       emails:
         process.env.TEST_FOLDER_EMAIL ||
+        process.env.TEST_FOLDER_EMAILS ||
         path.resolve('./services/messaging/email/templates'),
       locales: process.env.TEST_FOLDER_LOCALES || path.resolve('./locales'),
       commands: process.env.TEST_FOLDER_COMMANDS || path.resolve('./commands'),
@@ -81,9 +83,13 @@ afterEach(async () => {
     const { url, namespace } = global.server.getConfig('redis');
     const redisClient = redis.createClient({ url });
 
-    await redisClient.connect();
-    await clearRadisNamespace(redisClient, namespace);
-    await redisClient.disconnect();
+    try {
+      await redisClient.connect();
+      await clearRedisNamespace(redisClient, namespace);
+      await redisClient.disconnect();
+    } catch (err) {
+      // that ok. No redis connection
+    }
   }
 });