Merge branch 'feature'

Author: velopert

velog-backend/package.json

@@ -29,7 +29,7 @@
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-flowtype": "^2.39.1",
     "eslint-plugin-import": "^2.8.0",
-    "flow-bin": "0.72.0",
+    "flow-bin": "0.75",
     "onchange": "^3.3.0",
     "pg-hstore": "^2.3.2",
     "pg-native": "^2.2.0",

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

@@ -2,20 +2,32 @@ import Sequelize from 'sequelize';
 import db from 'database/db';
 import { primaryUUID } from 'lib/common';
 import { User } from 'database/models';
+import pick from 'lodash/pick';
 
 const Series = db.define(
   'series',
   {
     id: primaryUUID,
     fk_user_id: Sequelize.UUID,
     name: Sequelize.STRING,
-    description: Sequelize.STRING,
+    description: Sequelize.TEXT,
+    thumbnail: Sequelize.STRING,
+    url_slug: Sequelize.STRING,
   },
   {
     indexes: [
       {
         fields: ['fk_user_id'],
       },
+      {
+        fields: ['created_at'],
+      },
+      {
+        fields: ['updated_at'],
+      },
+      {
+        fields: ['fk_user_id', 'url_slug'],
+      },
     ],
   },
 );
@@ -28,4 +40,22 @@ Series.associate = () => {
   });
 };
 
+export const serializeSeries = data => ({
+  ...pick(data, [
+    'id',
+    'name',
+    'description',
+    'thumbnail',
+    'url_slug',
+    'created_at',
+    'updated_at',
+  ]),
+  user: {
+    id: data.user.id,
+    short_bio: data.user.user_profile.short_bio,
+    username: data.user.username,
+    thumbnail: data.user.user_profile.thumbnail,
+  },
+});
+
 export default Series;

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

@@ -1,3 +1,4 @@
+// @flow
 import Sequelize from 'sequelize';
 import db from 'database/db';
 import { primaryUUID } from 'lib/common';
@@ -26,20 +27,47 @@ const SeriesPosts = db.define(
 );
 
 SeriesPosts.associate = () => {
-  Post.belongsTo(Series, {
+  SeriesPosts.belongsTo(Post, {
     onDelete: 'CASCADE',
-    onUpdate: 'Restrict',
-    through: {
-      model: SeriesPosts,
-    },
+    onUpdate: 'restrict',
     foreignKey: 'fk_post_id',
   });
-  Series.belongsTo(Post, {
+  SeriesPosts.belongsTo(Series, {
     onDelete: 'CASCADE',
-    onUpdate: 'Restrict',
-    through: {
-      model: SeriesPosts,
-    },
+    onUpdate: 'restrict',
     foreignKey: 'fk_series_id',
   });
 };
+
+SeriesPosts.append = async (
+  seriesId: string,
+  postId: string,
+  userId: string,
+) => {
+  // list all series post
+  const seriesPosts = await SeriesPosts.findAll({
+    where: {
+      fk_series_id: seriesId,
+    },
+    include: [Post],
+    order: [['index', 'ASC']],
+  });
+  const nextIndex =
+    seriesPosts.length === 0
+      ? 1
+      : seriesPosts[seriesPosts.length - 1].index + 1;
+  // check already added
+  const exists = seriesPosts.find(sp => sp.fk_post_id === postId);
+  if (exists) {
+    return exists;
+  }
+  const sp = await SeriesPosts.build({
+    fk_user_id: userId,
+    index: nextIndex,
+    fk_post_id: postId,
+    fk_series_id: seriesId,
+  }).save();
+  return sp;
+};
+
+export default SeriesPosts;

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

@@ -21,3 +21,5 @@ export { default as UrlSlugHistory } from './UrlSlugHistory';
 export { default as EmailCert } from './EmailCert';
 export { default as UserMeta } from './UserMeta';
 export { default as UserImage } from './UserImage';
+export { default as Series } from './Series';
+export { default as SeriesPosts } from './SeriesPosts';

velog-backend/src/database/rawQuery/series.js

@@ -0,0 +1,28 @@
+// @flow
+import Sequelize from 'sequelize';
+import db from 'database/db';
+
+type SeriesPostCountRow = {
+  id: string,
+  count: number,
+};
+
+export const getSeriesPostCountList = async (
+  seriesIds: string[],
+): Promise<SeriesPostCountRow[]> => {
+  const matches = `(${seriesIds.map(seriesId => `'${seriesId}'`).join(', ')})`;
+  const query = `
+  select series.id, COUNT(series_posts.fk_post_id) FROM series
+  left join series_posts on series.id = series_posts.fk_series_id
+  where series.id IN ${matches}
+  group by series.id
+`;
+  try {
+    const rows = await db.query(query, {
+      type: Sequelize.QueryTypes.SELECT,
+    });
+    return rows;
+  } catch (e) {
+    throw e;
+  }
+};

velog-backend/src/database/sync.js

@@ -22,6 +22,8 @@ import {
   EmailCert,
   UserMeta,
   UserImage,
+  Series,
+  SeriesPosts,
 } from './models';
 import * as views from './views';
 
@@ -47,6 +49,8 @@ export function associate() {
   EmailCert.associate();
   UserMeta.associate();
   UserImage.associate();
+  Series.associate();
+  SeriesPosts.associate();
 }
 export default function sync() {
   associate();

velog-backend/src/lib/redisClient.js

@@ -15,7 +15,6 @@ class RedisClient {
   }
   connect() {
     const p = new Promise((resolve, reject) => {
-      const { REDIS_HOST, REDIS_PASS } = process.env;
       const client = redis.createClient({
         host: process.env.REDIS_HOST || '',
         password: process.env.REDIS_PASS || '',

velog-backend/src/router/index.js

@@ -13,7 +13,8 @@ import common from './common';
 import sitemaps from './sitemaps';
 import internal from './internal';
 import atom from './atom';
-import search from './search/search';
+import search from './search';
+import series from './series';
 
 const router: Router = new Router();
 
@@ -28,6 +29,7 @@ router.use('/sitemaps', sitemaps.routes());
 router.use('/internal', internal.routes());
 router.use('/atom', atom.routes());
 router.use('/search', search.routes());
+router.use('/series', series.routes());
 
 router.get('/check', (ctx: Context) => {
   console.log('avoiding cold start...');

velog-backend/src/router/posts/post/post.ctrl.js

@@ -17,6 +17,8 @@ import {
   PostsTags,
   PostsCategories,
   Category,
+  Series,
+  SeriesPosts,
 } from 'database/models';
 import redisClient from 'lib/redisClient';
 import UrlSlugHistory from 'database/models/UrlSlugHistory';
@@ -72,6 +74,7 @@ export const updatePost = async (ctx: Context): Promise<*> => {
     is_temp: boolean,
     meta: any,
     is_private: boolean,
+    series_id: ?string,
   };
 
   const schema = Joi.object().keys({
@@ -92,6 +95,7 @@ export const updatePost = async (ctx: Context): Promise<*> => {
       .max(130),
     meta: Joi.object(),
     is_private: Joi.boolean(),
+    series_id: Joi.string().allow(null),
   });
 
   if (!validateSchema(ctx, schema)) {
@@ -108,6 +112,7 @@ export const updatePost = async (ctx: Context): Promise<*> => {
     is_temp: isTemp,
     meta,
     is_private,
+    series_id,
   }: BodySchema = (ctx.request.body: any);
 
   const stringsToCheck = [title, body, ...tags];
@@ -180,8 +185,8 @@ export const updatePost = async (ctx: Context): Promise<*> => {
     thumbnail,
     is_temp: isTemp,
     meta,
-    is_private: (is_private || false),
-    released_at: (!isTemp && ctx.post.is_temp) ? new Date() : undefined,
+    is_private: is_private || false,
+    released_at: !isTemp && ctx.post.is_temp ? new Date() : undefined,
   };
 
   Object.keys(updateQuery).forEach((key) => {
@@ -190,6 +195,48 @@ export const updatePost = async (ctx: Context): Promise<*> => {
     }
   });
 
+  // Update Series
+  let series = null;
+  try {
+    const seriesPost = await SeriesPosts.findOne({
+      where: { fk_post_id: id },
+      include: [Series],
+    });
+    // Check Series Validity
+    if (series_id) {
+      const nextSeries = await Series.findById(series_id);
+      if (!nextSeries) {
+        ctx.status = 404;
+        ctx.body = {
+          name: 'INVALID_SERIES',
+        };
+      }
+      if (nextSeries.fk_user_id !== ctx.user.id) {
+        ctx.status = 403;
+        return;
+      }
+      series = {
+        id: nextSeries.id,
+        name: nextSeries.name,
+      };
+    }
+
+    if (seriesPost) {
+      if (seriesPost.series.id !== series_id) {
+        seriesPost.destroy();
+        if (!series_id) {
+          series = null;
+        } else {
+          await SeriesPosts.append(series_id, id, ctx.user.id);
+        }
+      }
+    } else {
+      await SeriesPosts.append(series_id, id, ctx.user.id);
+    }
+  } catch (e) {
+    ctx.throw(500, e);
+  }
+
   // Update Tags
   if (tags) {
     // Check which tags to remove or add
@@ -254,7 +301,7 @@ export const updatePost = async (ctx: Context): Promise<*> => {
     await ctx.post.update(updateQuery);
     const post = await Post.readPostById(id);
     const serialized = serializePost(post);
-    ctx.body = serialized;
+    ctx.body = { ...serialized, series };
   } catch (e) {
     ctx.throw(500, e);
   }
@@ -264,9 +311,26 @@ export const updatePost = async (ctx: Context): Promise<*> => {
 export const readPost = async (ctx: Context): Promise<*> => {
   const { id } = ctx.params;
   try {
-    const post = await Post.readPostById(id);
+    const [post, seriesPost] = await Promise.all([
+      Post.readPostById(id),
+      SeriesPosts.findOne({
+        include: [Series],
+        where: {
+          fk_post_id: id,
+        },
+      }),
+    ]);
+
     const serialized = serializePost(post);
-    ctx.body = serialized;
+    ctx.body = {
+      ...serialized,
+      series: seriesPost
+        ? {
+          id: seriesPost.series.id,
+          name: seriesPost.series.name,
+        }
+        : null,
+    };
   } catch (e) {
     ctx.throw(500, e);
   }