add PersonService

lambdaAgent · lambdaAgent · commit 3b7206d61a5c · 2018-10-31T08:47:45.000+07:00
diff --git a/src/Model/Person/Person.ts b/src/Model/Person/Person.ts
@@ -1,7 +1,7 @@
 import {Table, Column, Model, CreatedAt, UpdatedAt, AllowNull, IsUUID, PrimaryKey, NotNull, BeforeCreate, BeforeUpdate, Length, DataType, AfterCreate, AfterUpdate, IsEmail, Unique, HasOne} from 'sequelize-typescript';
 
 import {hashedPassword} from '../../utils/password'
-import PersonDetail from '../Detail/Detail'
+import PersonDetail from '../PersonDetail/PersonDetail'
 
 @Table({timestamps: true, tableName: "person", schema: "core"})
 class Person extends Model<Person> {
diff --git a/src/Model/PersonDetail/PersonDetail.ts b/src/Model/PersonDetail/PersonDetail.ts
@@ -8,20 +8,37 @@ import Person from '../Person/Person'
 class PersonDetail extends Model<PersonDetail> {
     @PrimaryKey @AutoIncrement @Column(DataType.INTEGER)
     id: number;
+
+    email:string
+    first_name: string
+    last_name: string
+
+    // has Many with social_media
+    social_media?: string[]
+
+    // has many asset row
+    asset: string
     
-    @AllowNull(false)
-    @ForeignKey(() => Person)
-    @Column(DataType.INTEGER)
-    person_id: number;
+    @ForeignKey(() => Person) @Column
+    personId: number;
     
-    @BelongsTo(() => Person, {
-        onUpdate: "CASCADE",
-        onDelete: "CASCADE"
-    })
+    @BelongsTo(() => Person)
     person: Person;
-    
+
     @AllowNull(false) @Column(DataType.STRING)
     type: string;
 }
+`
+CREATE TABLE IF NOT EXISTS core.person(
+    id SERIAL PRIMARY KEY,
+    email varchar(255) unique NOT NULL,
+    belongs_to_person varchar(255) NOT NULL,
+    last_name varchar(255) NOT NULL,
+    password varchar(255) NOT NULL,
+    email varchar(255) unique NOT NULL,
+    created_at TIME,
+    updated_at TIME
+  );
+`
 
 export default PersonDetail
diff --git a/src/Service/PersonService.ts b/src/Service/PersonService.ts
@@ -0,0 +1,40 @@
+import { Db_blog } from '../utils/dbUtils'
+import Person from '../model/Person/Person';
+import PersonDetail from '../Model/PersonDetail/PersonDetail'
+import logger = require('../utils/logger');
+import sequelize = require('sequelize');
+
+export default class PersonService {
+    static IsEmailRegistered(email:string): Promise<boolean>{
+        return new Promise((resolve, reject) => {
+            Person.findOne({where: {email}})
+            .then(user => {
+                if(!user) resolve(false)
+                else resolve(true)
+            })
+            .catch(reject)
+        })
+    }
+    static registerUser(email:string, password:string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            Db_blog.transaction(function (t:sequelize.Transaction) {
+                return PersonDetail.create({
+                    //TODO: index belongs_to_person on person_detail table
+                    belongs_to_person: email,
+                    email
+                }, {transaction: t}).then(function (userDetail:PersonDetail) {
+                return Person.create({
+                    belongs_to_person: userDetail.id,
+                    email, password
+                }, {transaction: t});
+                });
+            }).then(function (result) {
+                logger.info(`registered User with ${email} at ${new Date().getTime()}`)
+                resolve(result)
+            }).catch(function (err) {
+                logger.error(`Error registering user with ${email} at ${new Date().getTime()}`)
+                reject(err)
+            })
+        }) // Promise
+    }
+}
diff --git a/src/controller/mainController.ts b/src/controller/mainController.ts
@@ -7,7 +7,7 @@ import Token, { DataToken, TokenUtil } from '../Token/Token';
 import {AuthCacheUtil, AuthToken} from '../Token/Auth/AuthCache'
 import Roles from '../Token/Roles';
 import PathDetailUtil, { RouteDetail } from '../utils/PathDetail'
-import { reset } from 'continuation-local-storage';
+import PersonService from '../Service/PersonService'
 
 const router: Router = Router();
 
@@ -58,10 +58,21 @@ router.post('/login', validateLoginBody, (req:Request, res: Response, next) => {
 })
 
 PathDetailUtil.registerRoute('/register', 'post', Roles.ALL)
-router.post('/register', validateLoginBody, (req:Request, _:Response, _) => {
+router.post('/register', validateLoginBody, (req:Request, res:Response, next) => {
     const {email, password} = req.body
-    const person = new Person()  
-    //after register, please create PersonDetail
+    PersonService.IsEmailRegistered(email)
+        .then((isRegister):Promise<boolean> => {
+            if(isRegister) {
+                res.status(400).json({message: 'User has already registered'})
+                return Promise.resolve(false)
+            }
+            return Promise.resolve(false) //PersonService.registerUser(email, password)                      
+        })
+        .then(resultOfRegistering => {
+            if(resultOfRegistering) res.status(200).json({message: 'User successfully registered'})
+            res.status(500).json({message: 'Failed to registered'})
+        })
+        .catch(next)
 })
 
 export default router;
@@ -73,10 +84,10 @@ const errorContentType = (res) => res.status(400).json({message: 'wrong content
 
 function validateLoginBody(req, res, next){
     const body = req.body;
-    
+    console.log(body)
     if(Object.keys(body).length === 0) return errorContentType(res)
-    if(!("email" in body && "password" in body)) return error400(res, 'username or password is blank')
-    if(!body.email && !body.password) return error400(res, 'username or password is blank')
+    if(!("email" in body && "password" in body)) return error400(res, 'email or password is blank')
+    if(!body.email && !body.password) return error400(res, 'email or password is blank')
 
     return next()
 }
