[BMOL-24] Refactorying, timezone utility (#11)

* BMOL-24 Refactorying

* BMOL-24 Refactorying and use Timezone.

---------

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

Author: pokers

deploy/dbMigrations/20230311173534_add_mybook_table.js

@@ -1,4 +1,10 @@
 
+/*
+test data
+insert into tbl_mybook values('38d44dba-910a-49cb-88b0-440353164777', '31a1c45d-4026-4533-a63d-b44d58408556', 'testbook1', 'testboo1 contents', '["author1", "author2"]', '["trans1", "trans2"]', 'publisher1', 'thumbnail url', '00000000', 0, 512, '["image1", "image2"]', false, false, '{}', now(), now(), null);
+insert into tbl_mybook values('4b4acc85-c0de-41ed-8077-fa9d8a1807e9', '31a1c45d-4026-4533-a63d-b44d58408556', 'testbook2', 'testboo2 contents', '["author2-1", "author2-2"]', '["trans2-1", "trans2-2"]', 'publisher2', 'thumbnail url 2', '11111111', 0, 600, '["image2-1", "image2-2"]', false, false, '{}', now(), now(), null);
+insert into tbl_mybook values('84e65492-0bc3-4507-9f14-36edf07ba9a0', '31a1c45d-4026-4533-a63d-b44d58408556', 'testbook2', 'testboo2 contents', '["author3-1", "author3-2"]', '["trans3-1", "trans3-2"]', 'publisher3', 'thumbnail url 3', '22222222', 0, 812, '["image3-1", "image3-2"]', false, false, '{}', now(), now(), null);
+*/
 exports.up = (knex) => {
     return knex.schema.dropTableIfExists('tbl_mybook').createTable('tbl_mybook', (table)=>{
         table.uuid('id').notNullable().primary().index('tbl_mybook_id_index')

deploy/dbMigrations/20230311175534_add_myhistory_table.js

@@ -1,4 +1,14 @@
-
+/**
+ * test data
+insert into tbl_myhistory values('75d332e1-3de0-44ee-95df-265f0cacdbf0', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 360, '2023-03-05 18:34:33', '2023-03-05 18:34:33', null);
+insert into tbl_myhistory values('5be35a18-fd1a-4136-9837-50ac6243a88e', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 237, '2023-03-06 21:30:00', '2023-03-06 21:30:00', null);
+insert into tbl_myhistory values('94b71146-ec35-4f00-ab5a-20551a17017f', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 245, '2023-03-07 03:30:00', '2023-03-07 03:30:00', null);
+insert into tbl_myhistory values('27245397-22ea-4af5-b5c2-8f1dcc4a2947', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 3678, '2023-03-12 01:30:00', '2023-03-12 01:30:00', null);
+insert into tbl_myhistory values('c7d2e046-df3b-4cb4-b1c4-e9c1fdf2eb36', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 341, '2023-03-17 13:30:00', '2023-03-17 13:30:00', null);
+insert into tbl_myhistory values('7fb01edb-e29e-48bc-a5cf-70d977ddd5de', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 741, '2023-03-17 17:30:00', '2023-03-17 17:30:00', null);
+insert into tbl_myhistory values('8d3b0fd6-afe9-4c6a-b6f6-50a23fbc71e4', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 861, '2023-03-17 22:30:00', '2023-03-17 22:30:00', null);
+insert into tbl_myhistory values('cfb5a016-8d5f-410c-9497-e7be1a0a19db', '31a1c45d-4026-4533-a63d-b44d58408556', '38d44dba-910a-49cb-88b0-440353164777', 341, '2023-03-19 10:30:00', '2023-03-19 10:30:00', null);
+ */
 exports.up = (knex) => {
     return knex.schema.dropTableIfExists('tbl_myhistory').createTable('tbl_myhistory', (table)=>{
         table.uuid('id').notNullable().primary().index('tbl_myhistory_id_index')

src/app.js

@@ -1,60 +1,19 @@
 const koa = require('koa')
 const koaBody = require('koa-body')
-const uuid = require('uuid')
 
 const { config } = require('../deploy/config/config') 
 const { initRouter } = require('./routes') 
-const { log, requestLogger } = require('./utils/logging')
+const { log } = require('./utils/logging')
+
+const { corsMiddleware, loggingMiddleware } = require('./middleware')
 
 const app = new koa()
 app.use(koaBody.koaBody())
 
-// Set CORS
-app.use(async (ctx, next)=>{
-    if(ctx.method === 'OPTIONS'){
-        if (!ctx.get('Access-Control-Requrest-Method')){
-            await next()
-        }
-        ctx.set('Access-Control-Allow-Origin', '*')
-        ctx.set('Access-Control-Allow-Credentials', 'true')
-        ctx.set('Access-Control-Allow-Methods', 'GET')
-        ctx.set('Access-Control-Allow-Headers', '*')
-        ctx.status = 204
-    }else{
-        ctx.set('Access-Control-Allow-Origin', '*')
-        ctx.set('Access-Control-Allow-Credentials', 'true')
-        ctx.set('Vary', 'Origin')
-        await next();
-    }
-})
-
-// error logging
-app.use(async (ctx, next)=>{
-    ctx.state.requestId = uuid.v4()
-    try{
-        await next()
-    }catch(err){
-        const errorObject = {
-            ...err,
-            message: err.message,
-            trace: err.stack,
-        }
-
-        ctx.status = err.status || err.statusCode || 500
-        ctx.body = {
-            error: errorObject,
-            meta: {
-                requestId: ctx.state.requestId,
-                now: +new Date(),
-            },
-        }
 
-        requestLogger(ctx, {
-            message: err.message,
-            trace: err.stack,
-        })
-    }
-})
+// set middleware
+app.use(corsMiddleware)
+app.use(loggingMiddleware)
 
 const router = initRouter()
 app.use(router.routes())

src/controllers/accountController.js

@@ -29,7 +29,6 @@ const joinMe = async (ctx)=>{
     const {
         query,
         headers,
-        request: { body }
     } = ctx
     const inst = new AccountService()
     inst.addNewAccount()

src/dao/bookTimerDao.js

@@ -6,26 +6,30 @@ const { MyBookNotFound, InternalServerError } = require('../services/errorServic
 class BookTimerDao {
     constructor(){
         this._daoName = 'BookTimerDao'
+        this._repo = {
+            bookHistory: new BookHistoryRepository(),
+            account: new AccountRepository(),
+        }
     }
 
     get daoName(){
         return this._daoName
     }
 
     async getBookTimerInfoByBookId(bookId){
-        const bookHistoryRepo = new BookHistoryRepository()
-        const accountRepo = new AccountRepository()
         const bookTimerDecorator = new BookTimerDecorator()
 
-        const accountInfo = await accountRepo.getAccountByBookId(bookId)
-        const bookHistoryInfo = await bookHistoryRepo.getBookHistoryListByBookId(bookId)
+        const [accountInfo, bookHistoryInfo] = await Promise.all([
+            this._repo.account.getAccountByBookId(bookId),
+            this._repo.bookHistory.getBookHistoryListByBookId(bookId)
+        ])
 
         // deleted book check
         if (!accountInfo || !bookHistoryInfo){
             throw new MyBookNotFound(bookId)
         }
 
-        const bookTimerInfo = await bookTimerDecorator.decorateBookTimer(accountInfo, bookHistoryInfo)
+        const bookTimerInfo = bookTimerDecorator.decorateBookTimer(bookId, {accountInfo, bookHistoryInfo})
 
         const result = {
             data : bookTimerInfo

src/dao/bookTimerDecorator.js

@@ -1,4 +1,4 @@
-
+const { getTimezoneDate, isSameDay, getYMDHMS } = require('../utils/timezoneDate')
 
 class BookTimerDecorator {
     constructor(){
@@ -9,35 +9,30 @@ class BookTimerDecorator {
         return this._serviceName
     }
 
-    async decorateBookTimer(userInfo, historyInfo){
-
-        let history = new Array()
-        let daily = 0
-
-        // today date, format: yyyy-mm-dd 
-        const date = new Date()
-        const today = date.getFullYear() + '-' + ('0'+(date.getMonth() + 1)).slice(-2) + '-' + date.getDate()
+    decorateBookTimer(bookId, {accountInfo, bookHistoryInfo}){
 
-        // history array
-        for (const h of historyInfo){
-
-            // if created_at == today, add daily time
-            if (h.created_at.toISOString().split('T')[0] == today ){
-                daily += h.reading_time
-            }
+        let dailyTime = 0
+        // 오늘 날짜 계산 yyyy-mm-dd format
+        const now = getTimezoneDate()
+        const history = bookHistoryInfo.map(item=>{
+            const itemDate = getTimezoneDate(item.updated_at)
 
-            history.push({"id": h.id, 
-                        "date": h.created_at.toISOString().split('T')[0],
-                        "time": h.reading_time})
-            
-        }
+            if(isSameDay(now, itemDate)){
+                dailyTime += item.reading_time
+            }
+            return {
+                id: item.id,
+                date: getYMDHMS(itemDate),
+                time: item.reading_time
+            }
+        })
 
         const data = {
-            "user_id": userInfo.user_id,
-            "target_time": userInfo.target_read_time,
-            "daily": daily, 
+            "user_id": accountInfo.user_id,
+            "target_time": accountInfo.target_read_time,
+            "daily": dailyTime, // 오늘 모든 책을 읽은 전체 시간
             "book":{
-                "book_id": historyInfo[0].mybook_id,
+                "book_id": bookId,
                 "history": history
             }
         }

src/dao/repositories/bookHistoryRepository.js

@@ -17,7 +17,7 @@ class BookHistoryRepository {
                         .where('tb.id', bookId)
                         .whereNull('tb.deleted_at')
                         .whereNull('th.deleted_at')
-                        .orderBy('th.created_at', 'desc')
+                        .orderBy('th.updated_at', 'desc')
                         .limit(100)
 
         return await query

src/services/accountService.js

@@ -34,6 +34,8 @@ class AccountService {
             throw new InvalidOauthType(oauthType)
         }
 
+        
+        
         const accountDao = new AccountDao()
         const accountInfo = await accountDao.getAccountInfoByOauthId(oauthId, oauthType)
         return accountInfo