Added Users controller

Luciano Nooijen · Luciano Nooijen · commit ee8098f9a1c0 · 2018-11-07T22:37:30.000+01:00
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ POST routes are protected
 
 * For testing add SQLite support
 * Fix Travis testing script, Postgres integration
-* Add authentication
+* Add authentication, password hashing -> also improve seed scripts
 * Set all Knex stuff to ./db folder
 * Create documentation, API documentation using Swagger
 * Add performance testing script, maybe using https://k6.io/
diff --git a/controllers/users.js b/controllers/users.js
@@ -0,0 +1,88 @@
+const knex = require('../helpers/database');
+
+const listUsers = async () => {
+    const Users = await knex.select('*').from('users');
+    return Users;
+};
+
+const getUser = async id => {
+    const user = await knex
+        .select('*')
+        .from('users')
+        .where({ id });
+    return user[0];
+};
+
+const addUser = async user => {
+    const newUserData = {
+        username: user.username,
+        email: user.email,
+        first_name: user.first_name,
+        last_name: user.last_name,
+        password: `${user.password}NONHASHED!`, // TODO: Add hashing
+        author_id: user.author_id,
+    };
+    const returning = [
+        'id',
+        'username',
+        'email',
+        'first_name',
+        'last_name',
+        'password',
+        'author_id',
+    ];
+    const newUser = await knex('users')
+        .insert([newUserData])
+        .returning(returning);
+    return newUser[0];
+};
+
+const modifyUser = async (id, user) => {
+    const {
+        /* eslint-disable camelcase */
+        username,
+        email,
+        first_name,
+        last_name,
+        password,
+        author_id,
+    } = user;
+    const newUserData = {
+        username,
+        email,
+        first_name,
+        last_name,
+        password,
+        author_id,
+    }; /* eslint-enable */
+    const returning = [
+        'id',
+        'username',
+        'email',
+        'first_name',
+        'last_name',
+        'password',
+        'author_id',
+    ];
+    const oldUserData = getUser(id);
+    const newUser = Object.assign({}, { ...oldUserData, ...newUserData });
+    const modifiedUser = await knex('users')
+        .returning(returning)
+        .where('id', '=', id)
+        .update(newUser);
+    return modifiedUser[0];
+};
+
+const deleteUser = async id =>
+    knex('users')
+        .returning(['id'])
+        .where({ id })
+        .delete();
+
+module.exports = {
+    listUsers,
+    getUser,
+    addUser,
+    modifyUser,
+    deleteUser,
+};
diff --git a/tests/database/users.test.js b/tests/database/users.test.js
@@ -0,0 +1,90 @@
+const databaseSetup = require('../config/database-setup');
+const {
+    listUsers,
+    getUser,
+    addUser,
+    modifyUser,
+    deleteUser,
+} = require('../../controllers/users');
+
+beforeEach(done => databaseSetup(done));
+
+const newUser = {
+    username: 'anewuser',
+    email: 'anewuser@domain.com',
+    first_name: 'Jane',
+    last_name: 'Doe',
+    password: 'theplainpasswordgoeshere',
+    author_id: 2,
+};
+
+describe('Test if Users CRUD operations are working correctly', () => {
+    test('Listing all Users should return rows', async () => {
+        expect.assertions(1);
+        const Users = await listUsers();
+        expect(Users.length).toBeGreaterThan(0);
+    });
+
+    test('Fetching a single User should return an User', async () => {
+        expect.assertions(7);
+        const user = await getUser(1);
+        expect(user.id).toBe(1);
+        expect(typeof user.username).toBe('string');
+        expect(typeof user.email).toBe('string');
+        expect(typeof user.first_name).toBe('string');
+        expect(typeof user.last_name).toBe('string');
+        expect(typeof user.password).toBe('string');
+        expect(typeof user.author_id).toBe('number');
+    });
+
+    test('Adding a new User should add a single row', async () => {
+        expect.assertions(1);
+        const UsersBefore = await listUsers();
+        const userLengthBefore = UsersBefore.length;
+        return addUser(newUser).then(async () => {
+            const UsersAfter = await listUsers();
+            const userLengthAfter = UsersAfter.length;
+            expect(userLengthAfter).toBe(userLengthBefore + 1);
+        });
+    });
+
+    test('Adding a new User should return the new User', async () => {
+        expect.assertions(7);
+        const addedUser = await addUser(newUser);
+        expect(typeof addedUser.id).toBe('number');
+        expect(addedUser.username).toBe(newUser.username);
+        expect(addedUser.email).toBe(newUser.email);
+        expect(addedUser.first_name).toBe(newUser.first_name);
+        expect(addedUser.last_name).toBe(newUser.last_name);
+        expect(addedUser.password).not.toBe(newUser.password); // Hashed pass
+        expect(addedUser.author_id).toBe(newUser.author_id);
+    });
+
+    test('Updating an User should return the modified data', async () => {
+        expect.assertions(15);
+        const originalUser = await getUser(1);
+        expect(originalUser.id).toBe(1);
+        expect(originalUser.username).not.toBe(newUser.username);
+        expect(originalUser.email).not.toBe(newUser.email);
+        expect(originalUser.first_name).not.toBe(newUser.first_name);
+        expect(originalUser.last_name).not.toBe(newUser.last_name);
+        expect(originalUser.password).not.toBe(newUser.password);
+        expect(originalUser.author_id).not.toBe(newUser.author_id);
+        const modifiedUser = await modifyUser(1, newUser);
+        expect(modifiedUser.id).toBeDefined();
+        expect(typeof modifiedUser.id).toBe('number');
+        expect(modifiedUser.username).toBe(newUser.username);
+        expect(modifiedUser.email).toBe(newUser.email);
+        expect(modifiedUser.first_name).toBe(newUser.first_name);
+        expect(modifiedUser.last_name).toBe(newUser.last_name);
+        expect(modifiedUser.password).toBe(newUser.password);
+        expect(modifiedUser.author_id).toBe(newUser.author_id);
+    });
+
+    test('Deleting an User should return undefined', async () => {
+        expect.assertions(2);
+        return deleteUser(1)
+            .then(data => expect(data.id).toBe(undefined))
+            .then(async () => expect(await getUser(1)).toBeUndefined());
+    });
+});
