Feature Admin update role 187584923 (#36)

* [delivers #187584923] Delivered with testing * [finished #187584923] Feature admin should update user role * [finishes #187584923] Feature admin should update user role * mend * [finishes #187584923] Feature admin should update user role 1 * mend * mend * mend * mend * [delivers #187584915] Added user login (#35) * mend * mend * mend * mend * [delivers #187584923] Delivered with testing * [finished #187584923] Feature admin should update user role * mend * [finishes #187584923] Feature admin should update user role 1 * mend * mend * mend * mend * mend * mend * mend * mend * [Delivers #187584922] Admin should be able to disable an account (#25) * [Delivers #187584922] Admin should be able to disable an account * Admin should be able to disable or enable an account * Admin should be able to disable or enable an account * Admin should be able to disable or enable an account * Admin should be able to disable or enable an account * Admin should be able to disable or enable an account * Adjusted the database * DB adjusted * adjusted info * done rebase * mend * mend * [delivers #187584923] Delivered with testing * [finished #187584923] Feature admin should update user role * mend * mend * mend * mend * mend * mend * mend * mend * mend * [delivers #187584923] Delivered with testing * [finished #187584923] Feature admin should update user role * mend * [finishes #187584923] Feature admin should update user role 1 * mend * mend * mend * mend * mend * mend * mend * mend * mend * mend * [finishes #187584923] finishes fix the errors * mend * mend * mend * mend --------- Co-authored-by: Mr. David <[email protected]> Co-authored-by: Saddock Kabandana <[email protected]>
atlp-rwanda · May 30, 2024 · 7582873 · 7582873
1 parent 64cf94d
commit 7582873
Show file tree

Hide file tree

Showing 14 changed files with 342 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,8 @@ This is the backend for E-Commerce-Ninjas, written in Node.js with TypeScript.
 - Verification Email Endpoint
 - Resend verification Endpoint
 - Login Endpoint
-- Admin change status Endpoint
+- Admin Update Status Endpoint
+- Admin Update Role Endpoint
 
 ## TABLE OF API ENDPOINTS SPECIFICATION AND DESCRIPTION
 
@@ -42,8 +43,9 @@ This is the backend for E-Commerce-Ninjas, written in Node.js with TypeScript.
 | 3  | GET   | /api/auth/verify-email/:token           | 200 OK      | public  | Verifying email               |
 | 4  | POST  | /api/auth/send-verify-email             | 200 OK      | public  | Resend verification email     |
 | 5  | POST  | /api/auth/login                         | 200 OK      | public  | Login with Email and Password |
-| 6  | PUT   | /api/users/admin-update-user-status/:id | 200 OK      | private | Admin change status           |
-
+| 5 | PUT    | /api/users/admin-update-role/:id        | 200 OK      | private | Update the user role by admin|
+| 6  | PUT   | /api/users/admin-update-user-status/:id | 200 OK      | private | Admin Update Status Endpoint          |
+| 7  | PUT   | /api/users/admin-update-role/:id        | 200 OK      | private |  Admin Update Role Endpoint  |
 
 ## INSTALLATION
 

diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
     "start": "ts-node-dev src/index.ts",
     "dev": "ts-node-dev src/index.ts",
     "test": "cross-env NODE_ENV=test npm run deleteAllTables && cross-env NODE_ENV=test npm run createAllTables && cross-env NODE_ENV=test npm run createAllSeeders && nyc cross-env NODE_ENV=test mocha --require ts-node/register 'src/**/*.spec.ts' --timeout 600000 --exit",
-    "test-dev": "cross-env NODE_ENV=development npm run deleteAllTables && cross-env NODE_ENV=development npm run createAllTables && cross-env NODE_ENV=development npm run createAllSeeders && nyc cross-env NODE_ENV=development mocha --require ts-node/register 'src/**/*.spec.ts' --timeout 600000 --exit",
     "coveralls": "nyc --reporter=lcov --reporter=text-lcov npm test | coveralls",
     "coverage": "cross-env NODE_ENV=test nyc mocha --require ts-node/register 'src/**/*.spec.ts' --timeout 600000 --exit",
     "lint": "eslint . --ext .ts",

diff --git a/public/BUILD.txt b/public/BUILD.txt
diff --git a/public/ProjectManagement.jpg b/public/ProjectManagement.jpg
diff --git a/src/middlewares/index.ts b/src/middlewares/index.ts
diff --git a/src/middlewares/validation.ts b/src/middlewares/validation.ts
@@ -99,4 +99,7 @@ const verifyUserCredentials = async (req: Request, res: Response, next: NextFunc
 
 
 
-export { validation, isUserExist, isAccountVerified, verifyUserCredentials };
+
+
+
+export { validation, isUserExist, isAccountVerified,verifyUserCredentials };
diff --git a/src/modules/auth/controller/authControllers.ts b/src/modules/auth/controller/authControllers.ts
@@ -35,7 +35,7 @@ const sendVerifyEmail = async (req: any, res: Response) => {
 const verifyEmail = async (req: any, res: Response) => {
         try {
                 await authRepositories.destroySession(req.user.id, req.session.token)
-                await authRepositories.UpdateUserByAttributes("isVerified", true, "id", req.user.id);
+                await authRepositories.updateUserByAttributes("isVerified", true, "id", req.user.id);
                 res.status(httpStatus.OK).json({ status: httpStatus.OK, message: "Account verified successfully, now login." });
         } catch (error) {
                 return res.status(httpStatus.INTERNAL_SERVER_ERROR).json({ status: httpStatus.INTERNAL_SERVER_ERROR, message: error.message });

diff --git a/src/modules/auth/repository/authRepositories.ts b/src/modules/auth/repository/authRepositories.ts
@@ -11,7 +11,7 @@ const findUserByAttributes = async (key:string, value:any) =>{
     return await Users.findOne({ where: { [key]: value} })
 }
 
-const UpdateUserByAttributes = async (updatedKey:string, updatedValue:any, whereKey:string, whereValue:any) =>{
+const updateUserByAttributes = async (updatedKey:string, updatedValue:any, whereKey:string, whereValue:any) =>{
     await Users.update({ [updatedKey]: updatedValue }, { where: { [whereKey]: whereValue} });
     return await findUserByAttributes(whereKey, whereValue)
 }
@@ -28,4 +28,4 @@ const destroySession = async (userId: number, token:string) =>{
     return await Session.destroy({ where: {userId, token } });
 }
 
-export default { createUser, createSession, findUserByAttributes, destroySession, UpdateUserByAttributes, findSessionByUserId }
+export default { createUser, createSession, findUserByAttributes, destroySession, updateUserByAttributes, findSessionByUserId }
diff --git a/src/modules/user/controller/userControllers.ts b/src/modules/user/controller/userControllers.ts
@@ -1,14 +1,35 @@
+// user Controllers
 import { Request, Response } from "express";
-import httpStatus from "http-status";
+
 import authRepositories from "../../auth/repository/authRepositories";
+import httpStatus from "http-status";
+
+const updateUserRole = async (req: Request, res: Response) => {
+  try {
+    const data = await authRepositories.updateUserByAttributes("role", req.body.role, "id", req.params.id)
+    return res.status(httpStatus.OK).json({
+      message: "User role updated successfully",
+      data
+    });
+  } catch (error) {
+    return res.status(httpStatus.INTERNAL_SERVER_ERROR).json({
+      status: httpStatus.INTERNAL_SERVER_ERROR,
+      message: error.message
+    });
+  }
+};
+
 
 const updateUserStatus = async (req: Request, res: Response): Promise<void> => {
   try {
     const userId: number = Number(req.params.id);
-    const data = await authRepositories.UpdateUserByAttributes("status", req.body.status, "id", userId);
+    const data = await authRepositories.updateUserByAttributes("status", req.body.status, "id", userId);
     res.status(httpStatus.OK).json({ message: "Status updated successfully.", data });
   } catch (error) {
     res.status(httpStatus.INTERNAL_SERVER_ERROR).json({ status: httpStatus.INTERNAL_SERVER_ERROR, message: error.message });
   }
 };
-export default { updateUserStatus };
+
+
+
+export default { updateUserStatus,updateUserRole };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,4 +99,7 @@ const verifyUserCredentials = async (req: Request, res: Response, next: NextFunc



		export { validation, isUserExist, isAccountVerified, verifyUserCredentials };



		export { validation, isUserExist, isAccountVerified,verifyUserCredentials };