user services test

Author: hemadnap

package.json

@@ -22,7 +22,7 @@
   "homepage": "https://github.com/tocausan/express-api-ts#readme",
   "scripts": {
     "start": "node dist/bundle.js",
-    "test": "mocha -r ts-node/register src/test/index.ts",
+    "test": "mocha -r ts-node/register src/test/index.ts --exit",
     "watch:test": "mocha -r ts-node/register src/test/index.ts --watch",
     "build": "node node_modules/webpack/bin/webpack.js --config webpack.config.js",
     "postinstall": "node node_modules/typings/dist/bin.js install --overwrite",

src/models/User.ts

@@ -5,7 +5,7 @@ export class User {
     public id: string;
     public username: string;
     public email: string;
-    public language: string;
+    public language: number;
     public role: number;
 
     constructor(data?: any) {

src/services/user.ts

@@ -37,7 +37,9 @@ export const UserServices = {
         },
 
         getUser: async (username: string): Promise<User> => {
-            return new User((await DbClient.findOne(Config.database.collections.users, {username: username})));
+            const result = await DbClient.findOne(Config.database.collections.users, {username: username});
+            if (_.isNil(result)) throw new Error('user not found');
+            return new User(result);
         },
 
         updateUser: async (username: string, update: any): Promise<User> => {
@@ -47,9 +49,9 @@ export const UserServices = {
 
         deleteUser: async (username: string): Promise<void> => {
             try {
-                await DbClient.findOneAndDelete(Config.database.collections.users, {username: username})
                 await UserServices.deletePassword(username);
                 await UserServices.deleteToken(username);
+                await DbClient.findOneAndDelete(Config.database.collections.users, {username: username});
             } catch (err) {
                 throw err;
             }
@@ -61,7 +63,7 @@ export const UserServices = {
                 userId: user.id,
                 password: password
             });
-            return await DbClient.insertOneIfNotExist(Config.database.collections.passwords, {userId: user.id}, psswrd);
+            return await DbClient.findOneAndUpdateOrInsert(Config.database.collections.passwords, {userId: user.id}, psswrd);
         },
 
         getPassword: async (username: string): Promise<Password> => {

src/test/services/auth.ts

@@ -5,7 +5,7 @@ let authTestUser = {
     username: 'authTestUser',
     password: 'authTestUser',
     passwordConfirmation: 'authTestUser',
-    role: '3'
+    role: 3
 };
 
 before(done => {
@@ -21,6 +21,10 @@ describe('auth', () => {
                 .then(res => {
                     result = res;
                     done();
+                })
+                .catch(err => {
+                    console.log(err);
+                    done();
                 });
         });
 
@@ -30,7 +34,11 @@ describe('auth', () => {
     });
 });
 
-after(after => {
+after(done => {
     UserServices.deleteUser(authTestUser.username)
-        .then(() => after());
+        .then(() => done())
+        .catch(err => {
+            console.log(err);
+            done();
+        });
 });