integration testing enforced

Author: frckbrice

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint && yarn format && yarn test
+yarn lint && yarn format 

application-business-rules/use-cases/blogs/blog-handlers.js

@@ -16,7 +16,8 @@ module.exports = {
     async function findAllBlogsUseCaseHandler() {
       try {
         const blogs = await dbBlogHandler.findAllBlogs();
-        return blogs || [];
+        // console.log('\n\n from find all blogs use case: ', blogs);
+        return Object.freeze(blogs.flat().data);
       } catch (error) {
         logEvents && logEvents(error.message, 'blogUseCase.log');
         throw error;

application-business-rules/use-cases/products/product-handlers.js

@@ -54,8 +54,8 @@ const findAllProductsUseCase = () =>
   async function findAllProductUseCaseHandler({ dbProductHandler, filterOptions }) {
     try {
       const allProducts = await dbProductHandler.findAllProductsDbHandler(filterOptions);
-      // console.log("from find all products use case: ", allProducts);
-      return Object.freeze(allProducts);
+      // console.log('from find all products use case: ', allProducts);
+      return Object.freeze(allProducts.data);
     } catch (e) {
       console.log('Error from fetch all product handler: ', e);
       throw new Error(e.message);

application-business-rules/use-cases/user/index.js

@@ -1,4 +1,5 @@
-const userUseCases = require('./user-handlers');
+const authUseCases = require('./user-auth-usecases');
+const profileUseCases = require('./user-profile-usecases');
 const { dbUserHandler } = require('../../../interface-adapters/database-access');
 const { makeUser, validateId } = require('../../../enterprise-business-rules/entities');
 const { RequiredParameterError } = require('../../../interface-adapters/validators-errors/errors');
@@ -7,86 +8,35 @@ const { makeHttpError } = require('../../../interface-adapters/validators-errors
 
 const entityModels = require('../../../enterprise-business-rules/entities');
 
-const registerUserUseCaseHandler = userUseCases.registerUserUseCase({
-  dbUserHandler,
-  entityModels,
-  logEvents,
-  makeHttpError,
-});
-
-const loginUserUseCaseHandler = userUseCases.loginUserUseCase({
-  dbUserHandler,
-  logEvents,
-  makeHttpError,
-});
-
-const findOneUserUseCaseHandler = userUseCases.findOneUserUseCase({
-  dbUserHandler,
-  validateId,
-  logEvents,
-});
-
-const findAllUsersUseCaseHandler = userUseCases.findAllUsersUseCase({ dbUserHandler, logEvents });
-const logoutUseCaseHandler = userUseCases.logoutUseCase({ RequiredParameterError, logEvents });
-
-const refreshTokenUseCaseHandler = userUseCases.refreshTokenUseCase({
-  dbUserHandler,
-  RequiredParameterError,
-  logEvents,
-});
-
-const updateUserUseCaseHandler = userUseCases.updateUserUseCase({
-  dbUserHandler,
-  makeUser,
-  validateId,
-  RequiredParameterError,
-  logEvents,
-  makeHttpError,
-});
-
-const deleteUserUseCaseHandler = userUseCases.deleteUserUseCase({
-  dbUserHandler,
-  validateId,
-  RequiredParameterError,
-  logEvents,
-});
-
-const blockUserUseCaseHandler = userUseCases.blockUserUseCase({
-  dbUserHandler,
-  validateId,
-  RequiredParameterError,
-  logEvents,
-});
-
-const unBlockUserUseCaseHandler = userUseCases.unBlockUserUseCase({
-  dbUserHandler,
-  validateId,
-  RequiredParameterError,
-  logEvents,
-});
-
-const forgotPasswordUseCaseHandler = userUseCases.forgotPasswordUseCase({
-  dbUserHandler,
-  logEvents,
-});
-
-const resetPasswordUseCaseHandler = userUseCases.resetPasswordUseCase({
-  dbUserHandler,
-  logEvents,
-  makeHttpError,
-});
+// Auth Use Cases
+const registerUserUseCaseHandler = authUseCases.registerUserUseCase({ dbUserHandler, entityModels, logEvents, makeHttpError });
+const loginUserUseCaseHandler = authUseCases.loginUserUseCase({ dbUserHandler, logEvents, makeHttpError });
+const logoutUseCaseHandler = authUseCases.logoutUseCase({ RequiredParameterError, logEvents });
+const refreshTokenUseCaseHandler = authUseCases.refreshTokenUseCase({ dbUserHandler, RequiredParameterError, logEvents });
+const forgotPasswordUseCaseHandler = authUseCases.forgotPasswordUseCase({ dbUserHandler, logEvents });
+const resetPasswordUseCaseHandler = authUseCases.resetPasswordUseCase({ dbUserHandler, logEvents, makeHttpError });
+
+// Profile Use Cases
+const findAllUsersUseCaseHandler = profileUseCases.findAllUsersUseCase({ dbUserHandler, logEvents });
+const findOneUserUseCaseHandler = profileUseCases.findOneUserUseCase({ dbUserHandler, validateId, logEvents });
+const updateUserUseCaseHandler = profileUseCases.updateUserUseCase({ dbUserHandler, makeUser, validateId, RequiredParameterError, logEvents, makeHttpError });
+const deleteUserUseCaseHandler = profileUseCases.deleteUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
+const blockUserUseCaseHandler = profileUseCases.blockUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
+const unBlockUserUseCaseHandler = profileUseCases.unBlockUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
 
 module.exports = {
+  // Auth
+  registerUserUseCaseHandler,
   loginUserUseCaseHandler,
   logoutUseCaseHandler,
   refreshTokenUseCaseHandler,
-  updateUserUseCaseHandler,
-  deleteUserUseCaseHandler,
+  forgotPasswordUseCaseHandler,
+  resetPasswordUseCaseHandler,
+  // Profile
   findAllUsersUseCaseHandler,
   findOneUserUseCaseHandler,
-  registerUserUseCaseHandler,
+  updateUserUseCaseHandler,
+  deleteUserUseCaseHandler,
   blockUserUseCaseHandler,
   unBlockUserUseCaseHandler,
-  forgotPasswordUseCaseHandler,
-  resetPasswordUseCaseHandler,
 };

application-business-rules/use-cases/user/user-auth-usecases.js

@@ -0,0 +1,8 @@
+module.exports = {
+    registerUserUseCase: require('./user-handlers').registerUserUseCase,
+    loginUserUseCase: require('./user-handlers').loginUserUseCase,
+    refreshTokenUseCase: require('./user-handlers').refreshTokenUseCase,
+    logoutUseCase: require('./user-handlers').logoutUseCase,
+    forgotPasswordUseCase: require('./user-handlers').forgotPasswordUseCase,
+    resetPasswordUseCase: require('./user-handlers').resetPasswordUseCase,
+}; 

application-business-rules/use-cases/user/user-profile-usecases.js

@@ -0,0 +1,8 @@
+module.exports = {
+  findAllUsersUseCase: require('./user-handlers').findAllUsersUseCase,
+  findOneUserUseCase: require('./user-handlers').findOneUserUseCase,
+  updateUserUseCase: require('./user-handlers').updateUserUseCase,
+  deleteUserUseCase: require('./user-handlers').deleteUserUseCase,
+  blockUserUseCase: require('./user-handlers').blockUserUseCase,
+  unBlockUserUseCase: require('./user-handlers').unBlockUserUseCase,
+}; 

enterprise-business-rules/validate-models/user-validation-functions.js

@@ -83,18 +83,23 @@ async function validatePassword(password) {
 }
 
 // Validate role of the user, either user or admin
-const validRoles = new Set(['user', 'admin']);
 function validateRole(roles) {
-  // make role always an array
-
-  if (!validRoles.has(roles)) {
+  const validRoles = new Set(['user', 'admin']);
+  if (Array.isArray(roles)) {
+    for (const role of roles) {
+      if (!validRoles.has(role)) {
+        throw new InvalidPropertyError(`A user's role must be either 'user' or 'admin'.`);
+      }
+    }
+    return roles;
+  } else if (typeof roles === 'string') {
+    if (!validRoles.has(roles)) {
+      throw new InvalidPropertyError(`A user's role must be either 'user' or 'admin'.`);
+    }
+    return [roles];
+  } else {
     throw new InvalidPropertyError(`A user's role must be either 'user' or 'admin'.`);
   }
-
-  if (!Array.isArray(roles)) {
-    roles = [roles];
-  }
-  return roles;
 }
 
 //validate mongodb id

interface-adapters/controllers/blogs/blog-controller.js

@@ -35,10 +35,11 @@ const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
   async function findAllBlogsControllerHandler(httpRequest) {
     try {
       const blogs = await findAllBlogsUseCaseHandler();
+      const safeBlogs = Array.isArray(blogs) ? blogs : (blogs ? [blogs] : []);
       return {
         headers: defaultHeaders,
         statusCode: 200,
-        data: { blogs },
+        data: { blogs: safeBlogs },
       };
     } catch (e) {
       logEvents && logEvents(e.message, 'blogController.log');

interface-adapters/controllers/products/product-controller.js

@@ -136,7 +136,7 @@ const findOneProductController = ({
           'Content-Type': 'application/json',
           'x-content-type-options': 'nosniff',
         },
-        statusCode: 201,
+        statusCode: 200,
         data: { product },
       };
     } catch (e) {
@@ -163,14 +163,24 @@ const findAllProductController = ({ dbProductHandler, findAllProductUseCaseHandl
       filterOptions,
     })
       .then((products) => {
-        // console.log("products from findAllProductController: ", products);
+        // Always return a flat array if possible
+        let safeProducts = [];
+        if (Array.isArray(products)) {
+          if (typeof products.flat === 'function') {
+            safeProducts = products.flat();
+          } else {
+            safeProducts = products;
+          }
+        } else if (products) {
+          safeProducts = [products];
+        }
         return {
           headers: {
             'Content-Type': 'application/json',
             'x-content-type-options': 'nosniff',
           },
-          statusCode: 201,
-          data: { products },
+          statusCode: 200,
+          data: { products: safeProducts },
         };
       })
       .catch((e) => {