Merge pull request #5 from Bookmark-Oneday/main

syncup

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
+    },
 }

README.md

@@ -41,6 +41,16 @@ npm install --save
     docker-compose -f ./docker/DB-docker-compose.yml --env-file ./deploy/env/postgresql.env down
     ```
 <br />
+
+- DB Migration
+    - install migration tool
+        ```bash
+        npm install knex -g
+        ```
+    - Run migration
+        ```bash
+        knex migrate:latest
+        ```
 <br />
 
 ## Test Commands

deploy/config/constant.js

@@ -0,0 +1,7 @@
+const constants = {
+    oauthType: ['google', 'kakao']    
+}
+
+module.exports = {
+    constants,
+}

deploy/dbMigrations/20230301144748_add_account_table.js

@@ -0,0 +1,38 @@
+/*
+Test accounts
+insert into tbl_account values('31a1c45d-4026-4533-a63d-b44d58408556','test1','test1-1','nickname1','[email protected]','010-1235-5678','KR','google','72be7001-1711-4f01-bbfd-ecaf5d90832f',null,7200,null,false,null,false,null,null,'[]','{}',now(),now(),null);
+insert into tbl_account values('db77428c-0e01-49be-bcfe-e3f30361e72b','test2','test2-1','nickname2','[email protected]','210-1235-5678','KR','google','1ded124b-af4a-4306-8c3e-4c781b925d76',null,3600,null,false,null,false,null,null,'[]','{}',now(),now(),null);
+insert into tbl_account values('47ac1567-b916-4947-b9e5-4ae4f849af73','test3','test3-1','nickname3','[email protected]','310-1235-5678','KR','google','618f40a7-aa47-4d46-b40e-47bc9fc256a4',null,7200,null,false,null,false,null,null,'[]','{}',now(),now(),null);
+*/
+
+
+exports.up = (knex) => {
+    return knex.schema.dropTableIfExists('tbl_account').createTable('tbl_account', (table)=>{
+        table.uuid('id').notNullable().primary().index('tbl_account_id_index')
+        table.string('firstname', 50)
+        table.string('lastname', 50)
+        table.string('nickname', 50)
+        table.string('email', 64)
+        table.string('mobile', 64)
+        table.string('country', 2).defaultTo('KR')
+        table.string('oauth_type', 16).notNullable().index('tbl_account_oauth_type_index')
+        table.string('oauth_id', 512).index('tbl_account_oauth_id_index')
+        table.string('pin', 64).defaultTo('0000')
+        table.integer('target_read_time').notNullable().defaultTo(3600)
+        table.timestamp('pin_created_at')
+        table.boolean('email_verification').defaultTo(false)
+        table.timestamp('email_verification_date')
+        table.boolean('age_verification').defaultTo(false)
+        table.timestamp('age_verification_date')
+        table.string('profile_image_url', 2048)
+        table.jsonb('bg_image_urls', 2048).notNullable().defaultTo(JSON.stringify([]))
+        table.jsonb('meta').notNullable().defaultTo(JSON.stringify({}))
+        table.timestamp('created_at').defaultTo(knex.fn.now())
+        table.timestamp('updated_at').defaultTo(knex.fn.now())
+        table.timestamp('deleted_at')
+    })
+}
+
+exports.down = (knex)=>{
+    return knex.schema.dropTable('tbl_account')
+}

deploy/dbMigrations/20230301144748_init_tables.js

@@ -0,0 +1,33 @@
+
+/*
+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')
+        table.uuid('user_id').notNullable().index('tbl_mybook_user_id_index')
+        table.string('title', 255).notNullable()
+        table.text('content')
+        table.jsonb('authors').defaultTo(JSON.stringify([]))
+        table.jsonb('translators').defaultTo(JSON.stringify([]))
+        table.string('publisher')
+        table.string('thumbnail_url')
+        table.string('isbn').notNullable()
+        table.integer('current_page').defaultTo(0)
+        table.integer('total_page').defaultTo(1)
+        table.jsonb('images').notNullable().defaultTo(JSON.stringify([]))
+        table.boolean('reading').defaultTo(false)
+        table.boolean('favorite').defaultTo(false).index('tbl_mybook_favorite_index')
+        table.jsonb('meta').notNullable().defaultTo(JSON.stringify({}))
+        table.timestamp('created_at').defaultTo(knex.fn.now())
+        table.timestamp('updated_at').defaultTo(knex.fn.now())
+        table.timestamp('deleted_at')
+    })
+}
+
+exports.down = (knex)=>{
+    return knex.schema.dropTable('tbl_mybook')
+}

deploy/dbMigrations/20230311173534_add_mybook_table.js

@@ -0,0 +1,26 @@
+/**
+ * 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')
+        table.uuid('user_id').notNullable().index('tbl_myhistory_user_id_index')
+        table.uuid('mybook_id').notNullable().index('tbl_myhistory_mybook_id_index')
+        table.integer('reading_time').notNullable().defaultTo(0)
+        table.timestamp('created_at').defaultTo(knex.fn.now()).index('tbl_myhistory_created_at_index')
+        table.timestamp('updated_at').defaultTo(knex.fn.now()).index('tbl_myhistory_updated_at_index')
+        table.timestamp('deleted_at')
+    })
+}
+
+exports.down = (knex)=>{
+    return knex.schema.dropTable('tbl_myhistory')
+}

deploy/dbMigrations/20230311175534_add_myhistory_table.js

@@ -11,7 +11,7 @@
     "test:controllers": "jest --forceExit --detectOpenHandles ./src/controllers/",
     "test:routes": "jest --forceExit --detectOpenHandles ./src/routes/",
     "test:services": "jest --forceExit --detectOpenHandles ./src/services/",
-    "start:local": "APP_ENV=local node ./src/app.js",
+    "start:local": "APP_ENV=local nodemon ./src/app.js",
     "start:dev": "APP_ENV=dev node ./src/app.js",
     "start:prod": "APP_ENV=prod node ./src/app.js",
     "lint": "eslint ./src"
@@ -51,7 +51,7 @@
     "jest": "^29.4.3",
     "mocha": "^10.2.0",
     "mockdate": "^3.0.5",
-    "nodemon": "^2.0.20",
+    "nodemon": "^2.0.21",
     "sinon": "^15.0.1",
     "supertest": "^6.3.3",
     "supertest-as-promised": "^4.0.2"

package-lock.json

@@ -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())

package.json

@@ -1,23 +1,34 @@
-const { AccountService } = require('../services')
+const { AccountService, InvalidRequestParameter } = require('../services')
 
 const getMe = async (ctx)=>{
     const {
         headers: {
-            userid
+            userid,
+            oauth_id,
+            oauth_type,
         }
     } = ctx
 
     const inst = new AccountService()
     if(userid){
         ctx.body = await inst.getAccountByUserId(userid)
+    }if(oauth_id && oauth_type){
+        ctx.body = await inst.getAccountByOauthId(oauth_id, oauth_type)
+        console.log('ctx : ', ctx.body)
+    }else{
+        throw new InvalidRequestParameter('oauth_id', 'oauth_type')
+    }
+    
+    ctx.body.meta = {
+        requestId: ctx.state.requestId,
+        now: +new Date(),
     }
 }
 
 const joinMe = async (ctx)=>{
     const {
         query,
         headers,
-        request: { body }
     } = ctx
     const inst = new AccountService()
     inst.addNewAccount()