[finishes #187354254] permissions and role implementation

inishes role and permission assigning functionality modified: package.json new file: src/controllers/permissionController.ts modified: src/controllers/roleControllers.ts new file: src/database/migrations/20240401004514-create-permissions-table.js modified: src/database/migrations/20240413203456-create-role.js renamed: src/database/migrations/20240425195548-create-user.js -> src/database/migrations/20240435195548-create-user.js new file: src/database/migrations/20240505075748-role_permissions.js new file: src/database/models/permission.ts modified: src/database/models/role.ts new file: src/database/models/rolePermissions.ts modified: src/database/models/user.ts modified: src/database/seeders/20240427082911-create-default-role.js new file: src/database/seeders/20240501105101-permissions.js new file: src/database/seeders/20240502080814-create-default-users.js new file: src/database/seeders/20240502093711-role_permissions.js new file: src/docs/permissions.yaml modified: src/middlewares/authMiddlewares.ts modified: src/routes/index.ts new file: src/routes/permissionRoute.ts modified: src/routes/roleRoute.ts new file: src/test/permissionController.test.ts Changes to be committed: new file: src/controllers/permissionController.ts modified: src/controllers/roleControllers.ts modified: src/controllers/userController.ts new file: src/controllers/vendorRequestController.ts modified: src/database/migrations/20240413203456-create-role.js modified: src/database/migrations/20240425195548-create-user.js new file: src/database/migrations/20240501104514-create-permissions-table.js new file: src/database/migrations/20240505075748-role_permissions.js new file: src/database/migrations/20240506142003-create_vendor_request_table.js modified: src/database/models/index.ts new file: src/database/models/order.ts new file: src/database/models/orderItem.ts new file: src/database/models/vendorRequest.ts modified: src/database/seeders/20240427082911-create-default-rol e.js deleted: src/database/seeders/20240429200629-add-seller-role.js new file: src/database/seeders/20240501105101-permissions.js modified: src/database/seeders/20240501163745-User.js new file: src/docs/permissions.yaml new file: src/docs/vendor.yaml modified: src/middlewares/authMiddlewares.ts modified: src/routes/index.ts new file: src/routes/permissionRoute.ts modified: src/routes/roleRoute.ts new file: src/routes/vendorRequestRoute.ts modified: src/server.ts
atlp-rwanda · May 14, 2024 · ee17991 · ee17991
1 parent 2117cb4
commit ee17991
Show file tree

Hide file tree

Showing 30 changed files with 1,184 additions and 111 deletions.
diff --git a/.env.example b/.env.example
@@ -42,3 +42,17 @@ CLOUDINARY_SECRET=""
 #USER ADMIN CREDENTIALS
 ADMIN_PASSWORD=""
 ADMIN_PHONE=""
+
+# DOCKER CONFIGURATION
+DEV_DB_HOST="db"
+# admin seeder
+firstName = ""
+lastName = ""
+email = ""
+password = ""
+phone = ""
+verified = "",
+status = ""
+ADMIN_ROLE=""
+gender=""
+
diff --git a/package.json b/package.json
@@ -15,8 +15,9 @@
     "prepare": "husky install && npx husky add .husky/pre-commit \"npx lint-staged\"",
     "migrate": "npx sequelize-cli db:migrate",
     "migrate:undo": "npx sequelize-cli db:migrate:undo",
+    "migrate:undo:all": "npx sequelize-cli db:migrate:undo:all",
     "seed": "npx sequelize-cli db:seed:all",
-    "seed:undo": "npx sequelize-cli db:seed:undo"
+    "seed:undo": "npx sequelize-cli db:seed:undo:all"
   },
   "keywords": [],
   "author": "",
@@ -44,7 +45,7 @@
     "pg": "^8.11.5",
     "pg-hstore": "^2.3.4",
     "randomstring": "^1.3.0",
-    "sequelize": "^6.37.2",
+    "sequelize": "^6.37.3",
     "swagger-ui-express": "^5.0.0",
     "uuid": "^9.0.1",
     "winston": "^3.13.0",

diff --git a/src/controllers/permissionController.ts b/src/controllers/permissionController.ts
@@ -0,0 +1,83 @@
+import { Request, Response } from 'express';
+import { sendInternalErrorResponse } from '../validations';
+import Permission from '../database/models/permission';
+import { validateFields } from '../validations/index';
+
+// create a permission
+export const createPermission = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const missingFields = validateFields(req, ['name']);
+    if (missingFields.length) {
+      res.status(400).json({ ok: false, errorMessage: `Missing required fields: ${missingFields.join(', ')}` });
+      return;
+    }
+    const createdPermission = await Permission.create({ name: req.body.name });
+    res.status(201).json({ ok: true, data: createdPermission });
+  } catch (error) {
+    sendInternalErrorResponse(res, error);
+    return;
+  }
+};
+// get all permissions
+export const getAllPermissions = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const permissions = await Permission.findAll({ attributes: ['id', 'name'] });
+    res.status(200).json({ ok: true, data: permissions });
+  } catch (error) {
+    sendInternalErrorResponse(res, error);
+    return;
+  }
+};
+// get a single permission
+export const getSinglePermission = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const permission = await Permission.findByPk(req.params.id);
+    if (!permission) {
+      res.status(404).json({ ok: false, errorMessage: 'Permission not found' });
+      return;
+    }
+    res.status(200).json({ ok: true, data: permission });
+  } catch (error) {
+    sendInternalErrorResponse(res, error);
+    return;
+  }
+};
+// update a permission
+export const updatePermission = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const missingFields = validateFields(req, ['name']);
+    if (missingFields.length) {
+      res.status(400).json({ ok: false, errorMessage: `Missing required fields: ${missingFields.join(', ')}` });
+      return;
+    }
+    const permissionToUpdate = await Permission.findByPk(req.params.id);
+    if (!permissionToUpdate) {
+      res.status(404).json({ ok: false, errorMessage: 'Permission not found' });
+      return;
+    }
+    if (!req.body.name) res.status(400).json({ ok: false, errorMessage: 'Name is required' });
+
+    permissionToUpdate.name = req.body.name;
+
+    await permissionToUpdate.save();
+    res.status(200).json({ ok: true, data: permissionToUpdate });
+  } catch (error) {
+    sendInternalErrorResponse(res, error);
+    return;
+  }
+};
+// delete a permission
+export const deletePermission = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const permissionToDelete = await Permission.findByPk(req.params.id);
+    if (!permissionToDelete) {
+      res.status(404).json({ ok: false, errorMessage: 'Permission not found' });
+      return;
+    }
+    await permissionToDelete.destroy();
+    res.status(200).json({ ok: true, message: 'permission deleted successfully!' });
+  } catch (error) {
+    sendInternalErrorResponse(res, error);
+    return;
+  }
+};
diff --git a/src/controllers/roleControllers.ts b/src/controllers/roleControllers.ts
@@ -1,26 +1,45 @@
 import logger from '../logs/config';
 import { Request, Response } from 'express';
 import Role from '../database/models/role';
+import Permission from '../database/models/permission';
 import { sendInternalErrorResponse, validateFields } from '../validations';
+import sequelize from '../database/models/index';
 
 const createRole = async (req: Request, res: Response): Promise<void> => {
   try {
-    if (validateFields(req, ['name']).length !== 0) {
-      res.status(400).json({ ok: false, errorMessage: 'Role name is required' });
+    const { name, permissionIds } = req.body;
+    const missingFields = validateFields(req, ['name', 'permissionIds']);
+    if (missingFields.length > 0) {
+      res.status(400).json({ ok: false, message: `Required fields: ${missingFields.join(', ')}` });
       return;
     }
-    const { name, displayName } = req.body;
-    const createdRole = await Role.create({ name, displayName });
-    res.status(201).json({ ok: true, data: createdRole });
+
+    const permissions = await Permission.findAll({ where: { id: permissionIds } });
+    if (permissions.length !== permissionIds.length) {
+      logger.error('Adding role: One or more permissions not found');
+      res.status(404).json({ ok: false, message: 'Roles create permissions not found' });
+      return;
+    }
+
+    const transaction = await sequelize.transaction();
+    try {
+      const role = await Role.create({ name }, { transaction });
+      await (role as any).addPermissions(permissions, { transaction });
+      await transaction.commit();
+      res.status(201).json({ ok: true, message: 'Role created successfully' });
+    } catch (err) {
+      logger.error('Error creating role');
+      await transaction.rollback();
+      throw err;
+    }
   } catch (error) {
     logger.error(error);
     sendInternalErrorResponse(res, error);
-    return;
   }
 };
 const getAllRoles = async (req: Request, res: Response): Promise<void> => {
   try {
-    const roles = await Role.findAll();
+    const roles = await Role.findAll({ include: { model: Permission, attributes: ['name'] } });
     res.status(200).json({ ok: true, data: roles });
   } catch (error) {
     logger.error(error);
@@ -29,11 +48,10 @@ const getAllRoles = async (req: Request, res: Response): Promise<void> => {
   }
 };
 const getSingleRole = async (req: Request, res: Response): Promise<void> => {
-  const { id } = req.params;
   try {
-    const role = await Role.findByPk(id);
+    const role = await Role.findByPk(req.params.id, { include: { model: Permission, attributes: ['name'] } });
     if (!role) {
-      res.status(404).json({ ok: false, errorMessage: 'Roles can not be found' });
+      res.status(404).json({ ok: false, message: 'Roles can not be found' });
       return;
     }
     res.status(200).json({ ok: true, data: role });
@@ -44,36 +62,42 @@ const getSingleRole = async (req: Request, res: Response): Promise<void> => {
   }
 };
 const updateRole = async (req: Request, res: Response): Promise<void> => {
-  const { id } = req.params;
-  const contentsToUpdate = { ...req.body };
   try {
-    const roleToupdate = await Role.findByPk(id);
-    if (!roleToupdate) {
-      res.status(404).json({ ok: false, errorMessage: 'Role not found' });
-      return;
-    }
-    if (contentsToUpdate.name) {
-      roleToupdate.name = contentsToUpdate.name;
-    }
-    if (contentsToUpdate.displayName) {
-      roleToupdate.displayName = contentsToUpdate.displayName;
+    const transaction = await sequelize.transaction();
+    try {
+      const role = await Role.findByPk(req.params.id, { transaction });
+      if (!role) {
+        logger.error(`Role not found`);
+        res.status(404).json({ ok: false, errorMessage: 'Role not found' });
+        return;
+      }
+      const missingFields = validateFields(req, ['name', 'permissionIds']);
+      if (missingFields.length > 0) {
+        res.status(400).json({ ok: false, errorMessage: `the required fields: ${missingFields.join(', ')}` });
+      }
+      role.name = req.body.name;
+      const updatedRole = await role.save({ transaction });
+      await (updatedRole as any).setPermissions(req.body.permissionIds, { transaction });
+      await transaction.commit();
+      res.status(200).json({ ok: true, message: 'role updated successfully' });
+    } catch (err) {
+      logger.error('error updating role');
+      await transaction.rollback();
+      throw err;
     }
-    await roleToupdate.save();
-    res.status(200).json({ ok: true, data: roleToupdate });
   } catch (error) {
     logger.error(error);
     sendInternalErrorResponse(res, error);
     return;
   }
 };
 const deleteRole = async (req: Request, res: Response): Promise<void> => {
-  const { id } = req.params;
   try {
-    const deletedCount = await Role.destroy({ where: { id } });
+    const deletedCount = await Role.destroy({ where: { id: req.params.id } });
     if (deletedCount === 1) {
-      res.status(200).json({ ok: true, data: deletedCount });
+      res.status(200).json({ ok: true, message: 'Role deleted successfully' });
     } else {
-      res.status(404).json({ ok: false, errorMessage: 'Role not found' });
+      res.status(404).json({ ok: false, message: 'Role not found' });
     }
   } catch (error) {
     logger.error(error);

diff --git a/src/controllers/sellerRequestController.ts b/src/controllers/sellerRequestController.ts
@@ -0,0 +1,122 @@
+import { Request, Response } from 'express';
+import { sendInternalErrorResponse } from '../validations';
+import logger from '../logs/config';
+import VendorRequest from '../database/models/sellerRequest';
+import uploadImage from '../helpers/claudinary';
+import User from '../database/models/user';
+const fileUploadService = async (req: Request) => {
+  const store: string[] = [];
+  for (const file of req.files as Express.Multer.File[]) {
+    store.push(await uploadImage(file.buffer));
+  }
+  return store;
+};
+export const createSellerRequest = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const vendorId = (req.user as User).id;
+    const exisistingUser = await VendorRequest.findOne({ where: { vendorId } });
+    if (exisistingUser) {
+      logger.error('user request exists!');
+      res.status(400).json({ ok: false, message: 'This user has sent the request already!' });
+      return;
+    }
+    if (!req.files || +req.files.length < 6) {
+      res.status(400).json({ message: 'Please upload  all required documents(6)' });
+      return;
+    }
+    if (req.body.agreement !== 'true') {
+      res.status(400).json({ message: 'Please agree to the terms and conditions' });
+      return;
+    }
+    const documents = await fileUploadService(req);
+
+    logger.info('Documents uploaded successfully!');
+    const { agreement } = req.body;
+
+    const result = await VendorRequest.create({
+      vendorId,
+      agreement,
+      documents,
+    });
+    res.status(201).json({ ok: true, data: result });
+  } catch (error) {
+    logger.error(error);
+    sendInternalErrorResponse(res, error);
+  }
+};
+export const getSellerRequest = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const request = await VendorRequest.findByPk(req.params.id);
+    if (!request) {
+      res.status(404).json({ ok: false, message: `No request found by id: ${req.params.id}` });
+    }
+    res.status(200).json({ ok: true, data: request });
+  } catch (error) {
+    logger.error(error);
+    sendInternalErrorResponse(res, error);
+  }
+};
+export const updateSellerRequest = async (req: Request, res: Response): Promise<void> => {
+  try {
+    if (req.body.agreement !== 'true') {
+      res.status(400).json({
+        ok: false,
+        errorMessage: `Please agree to our terms and conditions first`,
+      });
+      return;
+    }
+    const request = await VendorRequest.findByPk(req.params.id);
+    if (request === null) {
+      res.status(404).json({
+        ok: false,
+        message: 'request not found',
+      });
+    }
+    if (!req.files || +req.files.length !== 6) {
+      res.status(400).json({ ok: false, message: '6 files are required' });
+      return;
+    }
+    const docs = await fileUploadService(req);
+    request!.documents = docs;
+    req.body.agreement === 'true'
+      ? (request!.agreement = req.body.agreement)
+      : (request!.agreement = request!.agreement);
+    await request?.save();
+
+    res.status(200).json({ ok: true, message: 'request updated successfully', data: request });
+  } catch (error) {
+    logger.error(error);
+    sendInternalErrorResponse(res, error);
+  }
+};
+export const deleteSellerRequest = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const request = await VendorRequest.findByPk(req.params.id);
+    if (request === null) {
+      res.status(404).json({
+        ok: false,
+        message: 'request not found',
+      });
+    }
+    await request?.destroy();
+
+    res.status(200).json({ ok: true, message: 'Vendor request deleted successfully' });
+  } catch (error) {
+    logger.error(error);
+    sendInternalErrorResponse(res, error);
+  }
+};
+export const getAllSellerRequests = async (req: Request, res: Response): Promise<void> => {
+  try {
+    const requests = await VendorRequest.findAll({
+      include: {
+        model: User,
+      },
+    });
+
+    res.status(200).json({ ok: true, data: requests });
+  } catch (error) {
+    logger.error(error);
+    sendInternalErrorResponse(res, error);
+  }
+};
diff --git a/src/controllers/userController.ts b/src/controllers/userController.ts
@@ -32,7 +32,7 @@ export const signupUser = async (req: Request, res: Response) => {
     if (!validatePassword(password)) {
       return res.status(400).json({
         ok: false,
-        error: 'Password contains at least 1 letter, 1 number, and 1 special character, minumun 8 characters',
+        error: 'Password should contains at least 1 letter, 1 number, and 1 special character, minumun 8 characters',
       });
     }