task(fibery): fetch keywords & publication date [#56]

babajka · Sep 10, 2019 · 1100463 · 1100463
1 parent ae33d7a
commit 1100463
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/src/api/article/article.model.js b/src/api/article/article.model.js
@@ -48,12 +48,12 @@ const joiArticleSchema = Joi.object({
     platform: Joi.string().valid(['youtube']),
     id: Joi.string().regex(/^[a-zA-Z0-9_-]{11}$/),
     url: Joi.string().uri(),
-  }),
+  }).allow(null),
   audio: Joi.object({
     platform: Joi.string().valid(['soundcloud']),
     id: Joi.string(),
     url: Joi.string().uri(),
-  }),
+  }).allow(null),
   color: Joi.color().default(DEFAULT_COLOR),
   // Text on article card may be rendered in one of the following ways.
   // This depends on the color and is set manually.
@@ -64,7 +64,9 @@ const joiArticleSchema = Joi.object({
   tags: Joi.array().items(Joi.objectId().meta({ ref: 'Tag' })),
   // Keywords are for SEO optimization and search engines.
   keywords: Joi.string(),
-}).nand('video', 'audio');
+});
+// FIXME: falls with { audio: null, video: null }
+// .nand('video', 'audio');
 
 // FIXME: sync with design
 const IMAGES_BY_TYPE = {

diff --git a/src/api/article/utils.js b/src/api/article/utils.js
@@ -120,7 +120,16 @@ const getType = ({ video, audio }) => {
 };
 
 // `fibery` -> `wir` mapper
-export const mapFiberyArticle = async ({ cover, collection, locales, video, audio, ...rest }) => ({
+export const mapFiberyArticle = async ({
+  cover,
+  collection,
+  locales,
+  video,
+  audio,
+  publishAt,
+  keywords,
+  ...rest
+}) => ({
   ...omit(rest, TOPIC_SLUGS),
   ...mapCover(cover || {}),
   collection: mapCollection(collection),
@@ -132,10 +141,12 @@ export const mapFiberyArticle = async ({ cover, collection, locales, video, audi
   articleId: rest.fiberyId,
   active: true,
   type: getType({ video, audio }),
+  publishAt: new Date(publishAt),
+  keywords: keywords || ' ',
 });
 
 export const getArticle = async data => {
   const { fiberyId } = data;
-  const article = await Article.findOne({ fiberyId });
+  const article = await Article.findOneAndUpdate({ fiberyId }, data);
   return article || Article(data);
 };
diff --git a/src/services/fibery/index.js b/src/services/fibery/index.js
@@ -8,8 +8,16 @@ import { ValidationError } from 'utils/validation';
 import { map } from 'utils/func';
 
 import { /* STATE_READY, */ DOC_SECRET_NAME, DOC_FORMAT } from './constants';
-import { FIBERY_DEFAULT, ARTICLE_FIELDS, STATE, TAGS, RELATED_ENTITIES, CONTENT } from './query';
-import { getArticlePublicId, addAppName, mapAppNameLocales } from './utils';
+import {
+  FIBERY_DEFAULT,
+  ARTICLE_FIELDS,
+  ARTICLE_LOC_FIELDS,
+  STATE,
+  TAGS,
+  RELATED_ENTITIES,
+  CONTENT,
+} from './query';
+import { getArticlePublicId, addAppName, mapAppName, mapAppNameLocales } from './utils';
 // import { getState } from './getters';
 import { toWirFormat, formatEnum, IMAGE_FORMATER, TAG_FORMATER } from './formatters';
 
@@ -26,7 +34,8 @@ const getArticleData = async url => {
     {
       'q/from': addAppName('Article'),
       'q/select': FIBERY_DEFAULT.concat(
-        mapAppNameLocales(ARTICLE_FIELDS),
+        mapAppName(ARTICLE_FIELDS),
+        mapAppNameLocales(ARTICLE_LOC_FIELDS),
         STATE,
         TAGS,
         RELATED_ENTITIES,
@@ -61,7 +70,7 @@ const getArticleData = async url => {
   });
 
   const formatArticle = toWirFormat({
-    mapping: { Podcast: 'audio' },
+    mapping: { Podcast: 'audio', publication: 'publishAt' },
     mapper: (key, lang = '') => (lang ? `locales.${lang}.${key}` : key),
     formatters: {
       authors: TAG_FORMATER,

diff --git a/src/services/fibery/query.js b/src/services/fibery/query.js
@@ -3,7 +3,9 @@ import { DOC_SECRET_NAME } from './constants';
 
 export const FIBERY_DEFAULT = ['fibery/id', 'fibery/public-id'];
 
-export const ARTICLE_FIELDS = ['Title', 'Subtitle', 'Slug'];
+export const ARTICLE_FIELDS = ['Keywords', 'publication-date'];
+
+export const ARTICLE_LOC_FIELDS = ['Title', 'Subtitle', 'Slug'];
 
 export const ENUM = ['enum/name'];