Completed User Data Service and TSLint Setup

Author: ioedeveloper

src/api/user.ts

@@ -1,6 +1,9 @@
 import * as express from 'express';
 import { Request, Response } from 'express';
+import { UserService } from '../service/userService';
+
 const router = express.Router();
+const userService = new UserService();
 
 router.post('/signup', async function(req: Request, res: Response) {
     const data = req.body;
@@ -11,4 +14,11 @@ router.post('/signup', async function(req: Request, res: Response) {
         return res.status(400).send({ message: 'VSCode Extension Id is Required!'});
     }
 
+    try {
+        const newUser = await userService.addUser(data);
+        return res.status(200).send({ data: newUser });
+    } catch (error) {
+        throw error;
+    }
+
 });

src/config/types/user.ts

@@ -1,6 +1,8 @@
-interface INewUser {
+interface IUser {
+    id: number;
     email: string;
     extensionId: string;
+    deleted: boolean;
 }
 
-export { INewUser };
+export { IUser };

src/model/user.ts

@@ -3,13 +3,13 @@ import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
 @Entity()
 export class UserModel {
     @PrimaryGeneratedColumn
-    id: number | null;
+    id: number;
 
     @Column
-    email: string | null;
+    email: string;
 
     @Column
-    extensionId: string | null;
+    extensionId: string;
 
     @Column
     deleted: boolean = false;

src/service/userDataService.ts

@@ -8,12 +8,25 @@ export class UserDataService {
         this._db = getConnection().getMongoRepository(UserModel);
     }
 
+    public async create(newUser: UserModel): Promise<UserModel> {
+        const userModel: UserModel = new UserModel();
+        userModel.id = newUser.id;
+        userModel.email = newUser.email;
+        userModel.extensionId = newUser.extensionId;
+        try {
+            const user = await this._db.save(userModel);
+            return user;
+        } catch (error) {
+            throw error;
+        }
+    }
+
     public async findBy(query: UserModel, skip: number, take: number): Promise<UserModel[]> {
         if (!skip) skip = 0;
         if (!take) take = 10;
         query.deleted = false;
         try {
-            const users: Array<UserModel> = await this._db.find({
+            const users: UserModel[] = await this._db.find({
                 where: query,
                 skip,
                 take,
@@ -34,30 +47,52 @@ export class UserDataService {
         }
     }
 
-    public async create(newUser: UserModel): Promise<UserModel>{
-        const userModel: UserModel = new UserModel();
-        userModel.id = newUser.id;
-        userModel.email = newUser.email;
-        userModel.extensionId = newUser.extensionId;
-        try{
-            const user = await this._db.save(userModel);
-            return user;
-        } catch (error){
+    public async update(user: UserModel): Promise<UserModel> {
+        if (!user.id) {
+            try {
+                const newUser = this.create(user);
+                return newUser;
+            } catch (error) {
+                throw error;
+            }
+        } else {
+            user.deleted = false;
+            try {
+                await this._db.findOneAndUpdate({id: user.id}, {
+                    $set: {
+                        email: user.email,
+                        extensionId: user.extensionId,
+                    },
+                });
+                return user;
+            } catch (error) {
+                throw error;
+            }
+        }
+    }
+
+    public async countBy(query: UserModel): Promise<number> {
+        query.deleted = false;
+        try {
+            const count = await this._db.count(query);
+            return count;
+        } catch (error) {
             throw error;
         }
     }
 
-    public async deleteBy(query: UserModel, userId: number): Promise<UpdateWriteOpResult>{
-        try{
+    public async deleteBy(query: UserModel, userId: number): Promise<UpdateWriteOpResult> {
+        query.deleted = false;
+        try {
             const result: UpdateWriteOpResult = await this._db.updateMany(query, {
                 $set: {
                     deleted: true,
-                    deleteBy: userId
-                }
+                    deleteBy: userId,
+                },
             });
             return result;
-        } catch (error){
+        } catch (error) {
             throw error;
         }
     }
-}
+}

src/service/userService.ts

@@ -1,8 +1,22 @@
-import { INewUser } from '../config/types/user';
-import { UserModel } from '../model/user';
+import { IUser } from '../config/types/user';
+import { UserDataService } from './userDataService';
 
-export default class UserService {
-    public async addUser(newUser: INewUser): Promise<UserModel> {
-        
+class UserService {
+
+    private _data: UserDataService;
+
+    constructor() {
+        this._data = new UserDataService();
     }
-}
+
+    public async addUser(newUser: IUser): Promise<IUser> {
+        try {
+            newUser = await this._data.create(newUser);
+            return newUser;
+        } catch (error) {
+            throw error;
+        }
+    }
+}
+
+export { UserService };

tslint.json

@@ -14,6 +14,6 @@
         "variable-name":false,
         "member-access":false,
         "curly":false,
-        "ordered-imports":false,
+        "ordered-imports":false
     }
 }