Merge bb6c722 into 83d6f96

Cavdy · Apr 27, 2019 · c5c08bf · c5c08bf
2 parents 83d6f96 + bb6c722
commit c5c08bf
Show file tree

Hide file tree

Showing 20 changed files with 1,037 additions and 826 deletions.
diff --git a/server/swagger.json b/server/swagger.json
@@ -14,7 +14,7 @@
     "v1/auth/signup": {
       "post": {
         "tags": [
-          "Signup"
+          "Auth"
         ],
         "summary": "Users can signup",
         "description": "this endpoint uses get request to create users",
@@ -65,7 +65,7 @@
     "v1/auth/signup/addstaff": {
       "post": {
         "tags": [
-          "Signup"
+          "Auth"
         ],
         "summary": "Admin can signup staffs",
         "description": "this endpoint uses get request to create users",
@@ -135,7 +135,7 @@
     "v1/auth/signin": {
       "post": {
         "tags": [
-          "Signin"
+          "Auth"
         ],
         "summary": "Users can signup",
         "description": "this endpoint uses get request to create users",

diff --git a/server/v1/config/account.sql b/server/v1/config/account.sql
diff --git a/server/v1/config/database.js b/server/v1/config/database.js
@@ -36,26 +36,6 @@ const dbConnection = {
       return debug('query')(e.stack);
     }
   },
-
-  /**
-   * Connect to database - For test
-   * @constructor
-   * @param {*} passedQuery - passed in SQL query.
-   */
-  async dbTesting(passedQuery) {
-    try {
-      return (async () => {
-        const client = await pool.connect();
-        try {
-          return await client.query(passedQuery);
-        } finally {
-          client.release();
-        }
-      })();
-    } catch (e) {
-      return debug('query')(e.stack);
-    }
-  },
 };
 
 export default dbConnection;
diff --git a/server/v1/config/transaction.sql b/server/v1/config/transaction.sql
diff --git a/server/v1/config/user.sql b/server/v1/config/user.sql
diff --git a/server/v1/controllers/accounts.js b/server/v1/controllers/accounts.js
@@ -52,7 +52,7 @@ const CreateAccountController = {
   async specificAccounts(req, res) {
     const { accountNumber } = req.params;
     const specificAccounts = await AccountsService
-      .specificAccounts(accountNumber);
+      .specificAccounts(accountNumber, req.authorizedData);
 
     const data = await statusHelper
       .statusHelper(req,
@@ -72,7 +72,7 @@ const CreateAccountController = {
   async allAccountTransaction(req, res) {
     const { accountNumber } = req.params;
     const transactionHistory = await AccountsService
-      .allAccountTransaction(accountNumber);
+      .allAccountTransaction(accountNumber, req.authorizedData);
 
     const data = await statusHelper
       .statusHelper(req,

diff --git a/server/v1/controllers/auth.js b/server/v1/controllers/auth.js
@@ -40,26 +40,6 @@ const AuthController = {
         createdUser.returnSuccess);
     return data;
   },
-
-  /**
-   * Signup staff
-   * @constructor
-   * @param {*} req - get request.
-   * @param {*} res -get response
-   */
-  async createStaffs(req, res) {
-    const userData = req.body;
-    const createdStaff = await AuthService
-      .createStaffs(userData, req.signintoken, req.authorizedData);
-
-    const data = await statusHelper
-      .statusHelper(req,
-        res,
-        createdStaff.returnStatus,
-        createdStaff.returnError,
-        createdStaff.returnSuccess);
-    return data;
-  },
 };
 
 export default AuthController;
diff --git a/server/v1/controllers/users.js b/server/v1/controllers/users.js
@@ -59,6 +59,26 @@ const UsersController = {
         deleteUser.returnSuccess);
     return data;
   },
+
+  /**
+   * Signup staff
+   * @constructor
+   * @param {*} req - get request.
+   * @param {*} res -get response
+   */
+  async createStaffs(req, res) {
+    const userData = req.body;
+    const createdStaff = await UserService
+      .createStaffs(userData, req.signintoken, req.authorizedData);
+
+    const data = await statusHelper
+      .statusHelper(req,
+        res,
+        createdStaff.returnStatus,
+        createdStaff.returnError,
+        createdStaff.returnSuccess);
+    return data;
+  },
 };
 
 export default UsersController;
diff --git a/server/v1/helper/statusHelper.js b/server/v1/helper/statusHelper.js
@@ -10,42 +10,52 @@ const statusHelper = {
    * @param {*} data - passed in success data
    */
   async statusHelper(req, res, status, error, data) {
-    if (status === 401) { // unauthorized
-      res.status(401);
-      return res.json({
-        status: 401,
-        data: error,
-      });
-    } else if (status === 409) { // conflict
-      res.status(409);
-      return res.json({
-        status: 409,
-        data: error,
-      });
-    } else if (status === 201) { // created
-      res.status(201);
-      return res.json({
-        status: 201,
-        data,
-      });
-    } else if (status === 200) { // success
-      res.status(200);
-      return res.json({
-        status: 200,
-        data,
-      });
-    } else if (status === 404) { // not found
-      res.status(404);
-      return res.json({
-        status: 404,
-        data: error,
-      });
-    } else if (status === 422) {
-      res.status(422);
-      return res.json({ // unprocessable entity
-        status: 422,
-        data: error,
-      });
+    switch (status) {
+      case 401: // unauthorized
+        res.status(401);
+        return res.json({
+          status: 401,
+          data: error,
+        });
+      case 409: // conflict
+        res.status(409);
+        return res.json({
+          status: 409,
+          data: error,
+        });
+      case 403: // forbidden
+        res.status(403);
+        return res.json({
+          status: 403,
+          data: error,
+        });
+      case 201: // created
+        res.status(201);
+        return res.json({
+          status: 201,
+          data,
+        });
+      case 200: // success
+        res.status(200);
+        return res.json({
+          status: 200,
+          data,
+        });
+      case 404: // not found
+        res.status(404);
+        return res.json({
+          status: 404,
+          data: error,
+        });
+      case 422: // unprocessable entity
+        res.status(422);
+        return res.json({
+          status: 422,
+          data: error,
+        });
+      default:
+        // do nothing
+        break;
     }
   },
 };