Merge branch 'master' into feature

Author: velopert

velog-backend/package.json

@@ -8,7 +8,7 @@
     "migrate": "NODE_PATH=src babel-node src/scripts/migrate --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
     "deploy:dev": "sls deploy --stage dev",
     "deploy": "sls deploy --stage prod",
-    "deploy:local": "./scripts/loadenv && sls deploy --stage prod",
+    "deploy:local": ". ./scripts/loadenv && sls deploy --stage prod",
     "prettier:watch": "onchange '**/*.js' -- prettier-eslint --write {{changed}}"
   },
   "devDependencies": {

velog-backend/serverless.yml

@@ -19,6 +19,9 @@ provider:
     REDIS_HOST: ${env:REDIS_HOST}
     REDIS_PASS: ${env:REDIS_PASS}
     INTERNAL_KEY: ${env:INTERNAL_KEY}
+    POSTGRES_HOST: ${env:POSTGRES_HOST}
+    POSTGRES_USER: ${env:POSTGRES_USER}
+    POSTGRES_PW: ${env:POSTGRES_PW}
     NODE_ENV: "production"
   iamRoleStatements:
     - Effect: "Allow"
@@ -65,6 +68,7 @@ functions:
     vpc:
       securityGroupIds:
         - sg-5bc57830
+        - sg-056b9986a73e2f766
       subnetIds:
         - subnet-91481ef9
         - subnet-4f59dc03

velog-backend/src/database/db.js

@@ -1,28 +1,26 @@
 // @flow
-import SequelizeCockroach from 'sequelize-cockroachdb';
-import type Sequelize from 'sequelize';
+import Sequelize from 'sequelize';
 import pg from 'pg';
 
 (pg: any).defaults.parseInt8 = true; // fixes issue: umbers returning as string.
 
-const { COCKROACHDB_HOST, COCKROACHDB_PW } = process.env;
-const db: Sequelize = new SequelizeCockroach('velog', 'velog', COCKROACHDB_PW, {
-  host: COCKROACHDB_HOST,
+const {
+  COCKROACHDB_HOST,
+  COCKROACHDB_PW,
+  POSTGRES_HOST,
+  POSTGRES_USER,
+  POSTGRES_PW,
+} = process.env;
+const db: Sequelize = new Sequelize('velog', POSTGRES_USER, POSTGRES_PW, {
+  host: POSTGRES_HOST || '',
   dialect: 'postgres',
-  port: 26257,
-  logging: process.env.NODE_ENV === 'development',
-  ssl: true,
-  dialectOptions: {
-    ssl: true,
-    supportBigNumbers: true,
-  },
   define: {
     underscored: true,
   },
   pool: {
     max: 5,
     min: 0,
-    acquire: 10000,
+    acquire: 30000,
     idle: 10000,
   },
 });

velog-backend/src/database/models/PostsTags.js

@@ -92,7 +92,7 @@ PostsTags.getPostsCount = async ({ userId }: GetPostsCountParams) => {
     INNER JOIN posts AS p ON p.id = pt.fk_post_id
     WHERE p.fk_user_id = $userId
     AND p.is_temp = FALSE
-  ) GROUP BY tag
+  ) as q GROUP BY tag
   ORDER BY count DESC, tag
   `;
   try {