chore(endpoint):owner name on accounts

Add owner name when creating and fetching accounts [Finishes #165813280]
tolulope-od · May 7, 2019 · 7998469 · 7998469
1 parent aa073e4
commit 7998469
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 16 deletions.
diff --git a/server/controllers/AccountController.js b/server/controllers/AccountController.js
@@ -61,8 +61,27 @@ export default class AccountController {
           error: 'Account not found'
         });
       }
-      const { id, balance, owner, createdon, type, owneremail, status } = accountDetails[0];
-      const data = { id, accountNumber, owner, balance, createdon, type, owneremail, status };
+      const {
+        id,
+        balance,
+        owner,
+        createdon,
+        type,
+        owneremail,
+        status,
+        ownername
+      } = accountDetails[0];
+      const data = {
+        id,
+        accountNumber,
+        owner,
+        balance,
+        createdon,
+        type,
+        owneremail,
+        status,
+        ownername
+      };
       return res.status(200).json({
         status: 200,
         data: [data]
@@ -79,8 +98,27 @@ export default class AccountController {
         error: 'Account not found'
       });
     }
-    const { id, balance, owner, createdon, type, owneremail, status } = userAccountDetails[0];
-    const data = { id, accountNumber, owner, balance, createdon, type, owneremail, status };
+    const {
+      id,
+      balance,
+      owner,
+      createdon,
+      type,
+      owneremail,
+      status,
+      ownername
+    } = userAccountDetails[0];
+    const data = {
+      id,
+      accountNumber,
+      owner,
+      balance,
+      createdon,
+      type,
+      owneremail,
+      status,
+      ownername
+    };
     return res.status(200).json({
       status: 200,
       data: [data]
@@ -101,8 +139,12 @@ export default class AccountController {
     if (req.decoded.type === 'client') {
       const accountNumber = Math.floor(Math.random() * 10 ** 10);
       const newAccount = await accounts.create(
-        ['accountNumber', 'owner', 'ownerEmail', 'type', 'status', 'balance'],
-        [`${accountNumber}, ${id}, '${email}', '${type}', 'active', 0.0`]
+        ['accountNumber', 'owner', 'ownerName', 'ownerEmail', 'type', 'status', 'balance'],
+        [
+          `${accountNumber}, ${id}, '${req.decoded.firstName} ${
+            req.decoded.lastName
+          }', '${email}', '${type}', 'active', 0.0`
+        ]
       );
       const data = {
         accountNumber: newAccount[0].accountnumber,

diff --git a/server/db/seeder.js b/server/db/seeder.js
@@ -44,6 +44,7 @@ const createTable = async () => {
     id SERIAL PRIMARY KEY,
     accountNumber BIGINT NOT NULL,
     owner INT NOT NULL,
+    ownerName VARCHAR NOT NULL,
     type VARCHAR NOT NULL,
     status VARCHAR NOT NULL,
     balance NUMERIC NOT NULL,
@@ -74,16 +75,16 @@ const createTable = async () => {
   VALUES('olegunnar@manutd.com', 'Ole', 'Solksjaer', '${userPass}', 'Old Trafford, Manchester', '/uploads/avatar/ole.jpg', 08739084, 'client', false);
   INSERT INTO users (email, firstName, lastName, password, address, avatar, phoneNumber, type, isAdmin)
   VALUES('kyloren@vader.com', 'Kylo', 'Ren', '${adminPass}', 'Tatooine, Planet C53', '/uploads/avatar/kylo.jpg', 08939084, 'staff', false);
-  INSERT INTO accounts (accountNumber, owner, ownerEmail, type, status, balance)
-  VALUES(5563847290, 2, 'thor@avengers.com', 'current', 'active', 349876358.08);
-  INSERT INTO accounts (accountNumber, owner, ownerEmail, type, status, balance)
-  VALUES(8897654324, 3, 'olegunnar@manutd.com', 'savings', 'dormant', 7665435.97);
-  INSERT INTO accounts (accountNumber, owner, ownerEmail, type, status, balance)
-  VALUES(8894354324, 3, 'olegunnar@manutd.com', 'current', 'draft', 43435.97);
-  INSERT INTO accounts (accountNumber, owner, ownerEmail, type, status, balance)
-  VALUES(4294354324, 2, 'thor@avengers.com', 'current', 'draft', 43435.97);
-  INSERT INTO accounts (accountNumber, owner, ownerEmail, type, status, balance)
-  VALUES(6754354123, 4, 'kyloren@vader.com', 'savings', 'dormant', 321324.7);
+  INSERT INTO accounts (accountNumber, owner, ownerName, ownerEmail, type, status, balance)
+  VALUES(5563847290, 2, 'Thor Odinson','thor@avengers.com', 'current', 'active', 349876358.08);
+  INSERT INTO accounts (accountNumber, owner, ownerName, ownerEmail, type, status, balance)
+  VALUES(8897654324, 3, 'Ole Solksjaer', 'olegunnar@manutd.com', 'savings', 'dormant', 7665435.97);
+  INSERT INTO accounts (accountNumber, owner, ownerName, ownerEmail, type, status, balance)
+  VALUES(8894354324, 3, 'Ole Solksjaer', 'olegunnar@manutd.com', 'current', 'draft', 43435.97);
+  INSERT INTO accounts (accountNumber, owner, ownerName, ownerEmail, type, status, balance)
+  VALUES(4294354324, 2, 'Thor Odinson', 'thor@avengers.com', 'current', 'draft', 43435.97);
+  INSERT INTO accounts (accountNumber, owner, ownerName, ownerEmail, type, status, balance)
+  VALUES(6754354123, 4, 'Kylo Ren', 'kyloren@vader.com', 'savings', 'dormant', 321324.7);
   INSERT INTO transactions (type, accountNumber, owner, cashier, cashierName, amount, oldBalance, newBalance)
   VALUES('credit', 8897654324, 3, 4, 'Kylo Ren', 400500.0, 7264935.97, 7665435.97);
   INSERT INTO transactions (type, accountNumber, owner, cashier, cashierName, amount, oldBalance, newBalance)

diff --git a/test/account.test.js b/test/account.test.js
@@ -530,6 +530,7 @@ describe('Account Route', () => {
           .eql(200);
         expect(res.body).to.have.nested.property('data[0].accountNumber');
         expect(res.body).to.have.nested.property('data[0].status');
+        expect(res.body).to.have.nested.property('data[0].ownername');
         expect(res.status).to.equal(200);
         done();
       });
@@ -547,6 +548,7 @@ describe('Account Route', () => {
           .eql(200);
         expect(res.body).to.have.nested.property('data[0].accountNumber');
         expect(res.body).to.have.nested.property('data[0].status');
+        expect(res.body).to.have.nested.property('data[0].ownername');
         expect(res.status).to.equal(200);
         done();
       });