[BMOL-25] fixed bugs and refactorying. (#14)

* BMOL-25 fixed bugs and refactorying

* BMOL-25 rollback

* BMOL-25 align lines, space

---------

Co-authored-by: pokers <[email protected]>

Author: pokers

.eslintrc.js

@@ -11,5 +11,19 @@ module.exports = {
         "ecmaVersion": 2020,
     },
     "rules": {
-    }
+        "max-len": [
+            "error",
+            200,
+            2,
+            {
+                "ignoreComments": true,
+                "ignoreUrls": true,
+                "ignoreTemplateLiterals": true,
+                "ignoreRegExpLiterals": true
+            }
+        ],
+        "max-classes-per-file": "off",
+        "default-param-last": "warn",
+        "no-unused-vars": 0
+    },
 }

src/controllers/bookTimerController.js

@@ -1,45 +1,42 @@
 const { BookTimerService } = require('../services')
 const { MissingRequestParameter, InvalidRequestParameter } = require('../services/errorService')
 
-
-
 const getBookTimer = async (ctx)=>{
     const {
         params: {
             bookId
         }
     } = ctx
 
-    const inst = new BookTimerService()
-
-    if(bookId){
-        ctx.body = await inst.getBookTimerByBookId(bookId)
+    if (!bookId){
+        throw new InvalidRequestParameter('bookId')
     }
 
-    const deleteReadingTime = async (ctx)=>{
-        const {
-            params: {
-                bookId
-            }
-        } = ctx
-
-        let bookHistoryId;
+    const inst = new BookTimerService()
+    ctx.body = await inst.getBookTimerByBookId(bookId)
+}
 
-        if (ctx.request.query && ctx.request.query.historyId ){
-            bookHistoryId = ctx.query.historyId
-        }
-    
-        const inst = new BookTimerService()
-    
-        if(bookId){
-            ctx.body = await inst.removeReadingTime(bookId, bookHistoryId)
-            ctx.body.meta = {
-                requestId: ctx.state.requestId,
-                now: +new Date(),
-            }
+const deleteReadingTime = async (ctx)=>{
+    const {
+        params: {
+            bookId
         }
-        
-    
+    } = ctx
+
+    if (!bookId){
+        throw new InvalidRequestParameter('bookId')
+    }
+    if (!ctx.request.query || !ctx.request.query.historyId ){
+        throw new InvalidRequestParameter('historyId')
+    }
+
+    const bookHistoryId = ctx.request.query.historyId
+    const inst = new BookTimerService()
+    ctx.body = await inst.removeReadingTime(bookId, bookHistoryId)
+    ctx.body.meta = {
+        requestId: ctx.state.requestId,
+        now: +new Date(),
+    }
 }
 
 const postReadingTime = async (ctx)=>{
@@ -49,32 +46,23 @@ const postReadingTime = async (ctx)=>{
         }
     } = ctx
 
-
+    if (!bookId){
+        throw new InvalidRequestParameter('bookId')
+    }
     if (!ctx.request.body || (!ctx.request.body.reading_time && ctx.request.body.reading_time != 0)){
         throw new MissingRequestParameter("reading_time")
     }
-
-    const readingTime = ctx.request.body.reading_time
-
+    const readingTime = 0 + ctx.request.body.reading_time
     if (readingTime < 0){
         throw new InvalidRequestParameter("readingTime")
     }
 
     const inst = new BookTimerService()
-
-    if(bookId){
-        ctx.body = await inst.addReadingTime(bookId, readingTime)
-    }
+    ctx.body = await inst.addReadingTime(bookId, readingTime)
 }
 
-
-
-
-
-
 module.exports = { 
     getBookTimer,
     postReadingTime,
-    deleteReadingTime
-
+    deleteReadingTime,
 }

src/dao/bookTimerDao.js

@@ -1,5 +1,4 @@
 const { BookHistoryRepository } = require('./repositories/bookHistoryRepository')
-const { MyBookRepository } = require('./repositories/myBookRepository')
 const { AccountRepository } = require('./repositories/accountRepository')
 const { BookTimerDecorator } = require('./bookTimerDecorator')
 
@@ -53,7 +52,7 @@ class BookTimerDao {
         const postResult = await bookHistoryRepo.insertReadingTimeByBookId(accountInfo.user_id, bookId, reading_time)
 
         // postResult check
-        if (!postResult || !postResult[0].hasOwnProperty('id')){
+        if (!postResult || !postResult.length < 0){
             throw new InternalServerError()
         }
 

src/dao/repositories/bookHistoryRepository.js

@@ -1,14 +1,13 @@
 const pgClient = require('../connections/postgresql')
 
-
 class BookHistoryRepository {
     constructor(){
         this._repositoryName = 'BookHistoryRepository'
     }
     get name(){
         return this._repositoryName
     }
-    
+
     async getBookHistoryListByBookId(bookId){
         const query = pgClient.select('*')
                         .from('tbl_mybook as tb')
@@ -18,8 +17,6 @@ class BookHistoryRepository {
                         .whereNull('th.deleted_at')
                         .orderBy('th.updated_at', 'desc')
                         .limit(100)
-
-
         return await query
     }
 
@@ -29,9 +26,6 @@ class BookHistoryRepository {
                         .where('th.id', bookHistoryId)
                         .whereNull('th.deleted_at')
                         .first()
-
-
-
         return await query
     }
 
@@ -45,7 +39,6 @@ class BookHistoryRepository {
     }
 
     async insertReadingTimeByBookId(userId, bookId, readingTime){
-        
         const query = pgClient.transaction(function(trx) {
                                         pgClient.insert({id:pgClient.raw('gen_random_uuid()') , 
                                         user_id : userId, 
@@ -54,24 +47,19 @@ class BookHistoryRepository {
                                         .into('tbl_myhistory')
                                         .returning('id')
                                         .then(trx.commit) 
-                                        .catch(trx.rollback)});
-
+                                        .catch(trx.rollback)
+                                    });
         return await query
-
-
     }
     async removeReadingTimeByBookHistoryId(bookHistoryId){
-        
         const query = pgClient.transaction(function(trx) {
                                         pgClient.table('tbl_myhistory')
                                         .update({deleted_at : pgClient.raw('now()')})
                                         .where('id', bookHistoryId)
                                         .then(trx.commit) 
-                                        .catch(trx.rollback)});
-
+                                        .catch(trx.rollback)
+                                    });
         return await query
-
-
     }
 
     async removeReadingTimeByBookId(bookId){
@@ -80,12 +68,10 @@ class BookHistoryRepository {
                                         .update({deleted_at : pgClient.raw('now()')})
                                         .where('mybook_id', bookId)
                                         .then(trx.commit) 
-                                        .catch(trx.rollback)});
+                                        .catch(trx.rollback)
+                                    });
         return await query
-
-
     }
-
 }
 
 module.exports = {

src/services/bookTimerService.js

@@ -1,5 +1,5 @@
 const validator = require('validator')
-const { InvalidUUID, InternalServerError } = require('./errorService')
+const { InvalidUUID, InvalidINT } = require('./errorService')
 const { BookTimerDao } = require('../dao/bookTimerDao')
 
 class BookTimerService {
@@ -12,21 +12,18 @@ class BookTimerService {
     }
 
     async getBookTimerByBookId(bookId){
-
         // uuid type check
         if (!validator.isUUID(bookId)){
             throw new InvalidUUID(bookId)
         }
 
         const bookTimerDao = new BookTimerDao()
-
         const bookTimerInfo = await bookTimerDao.getBookTimerInfoByBookId(bookId)
 
         return bookTimerInfo
     }
 
     async addReadingTime(bookId, readingTime){
-
         // uuid type check
         if (!validator.isUUID(bookId)){
             throw new InvalidUUID(bookId)
@@ -41,14 +38,12 @@ class BookTimerService {
 
         // add new timer history
         const addedHistory = await bookTimerDao.postReadingTimeInfo(bookId, readingTime)
-
         const bookTimerInfo = await bookTimerDao.getBookTimerInfoByBookId(bookId)
 
         return bookTimerInfo
     }
 
     async removeReadingTime(bookId, bookHistoryId){
-
         // uuid type check
         if (!validator.isUUID(bookId)){
             throw new InvalidUUID(bookId)
@@ -61,20 +56,15 @@ class BookTimerService {
         }
 
         const bookTimerDao = new BookTimerDao()
-
         const bookTimerInfo = await bookTimerDao.getBookTimerInfoByBookId(bookId)
 
         let deleteHistory;
-
-
         if (bookHistoryId){
             deleteHistory = await bookTimerDao.deleteReadingTimeByHistoryId(bookId, bookHistoryId)
         }
         else{
             deleteHistory = await bookTimerDao.deleteReadingTimeByBookId(bookId)
         }
-
-
         return bookTimerInfo
     }