merge conflicts

Author: eessex

.circleci/config.yml

@@ -1,12 +1,11 @@
 version: 2.1
 
 orbs:
-  hokusai: artsy/hokusai@0.3.0
+  hokusai: artsy/hokusai@0.7.0
 
 jobs:
   build-and-test:
-    docker:
-      - image: artsy/hokusai
+    executor: hokusai/deploy
     steps:
       - add_ssh_keys
       - checkout
@@ -54,10 +53,5 @@ workflows:
             - push-staging-image
 
       # Release
-      - hokusai/push:
-          name: push-production-image
-          <<: *only_release
       - hokusai/deploy-production:
           <<: *only_release
-          requires:
-            - push-production-image

.env.example

@@ -72,6 +72,5 @@ SAILTHRU_SECRET=REPLACE_ME
 SECURE_IMAGES_URL=REPLACE_ME
 FB_PAGE_ID=REPLACE_ME
 DEFAULT_PARTNER_ID=REPLACE_ME
-DISPLAY_ID=REPLACE_ME
 SENTRY_PUBLIC_DSN=REPLACE_ME
 SENTRY_PRIVATE_DSN=REPLACE_ME

README.md

@@ -141,4 +141,4 @@ yarn task scripts/backfill.js
 
 ## Additional docs
 
-You can find additional documentation about Positron in [doc](/doc).
+You can find additional documentation about Positron in [doc](/doc) and [data-sync](/data-sync).

data-sync/README.md

@@ -1,4 +1,6 @@
-## Data Sync Ops
+# Data Sync Ops
+
+## Updating the data synchronization process
 
 ### The Short
 
@@ -75,4 +77,22 @@ Do the following:
   585031190124.dkr.ecr.us-east-1.amazonaws.com/positron:data-sync and can be
   `docker pull`-ed or referenced via Kubernetes and Hokusai.
 
+## Running the data synchronization process
+
+  Positron is configured for daily data synchronization. [An export is scheduled from production](../hokusai/production.yml#L222), and [an import is scheduled for staging an hour later](../hokusai/staging.yml#L225).
+
+  If you need to run the data sync process on-demand, this can be done by pointing hokusai at the `data-sync` tag.
+
+  To export the data from production, run:
+
+  ```sh
+  hokusai production run --tag data-sync 'sh ./export-mongo.sh'
+  ```
+
+  This uploads the data to an S3 bucket, which can then be imported into staging:
+
+  ```sh
+  hokusai staging run --tag data-sync 'sh ./import-mongo.sh'
+  ```
+
 [0]:https://console.aws.amazon.com/ecr/get-started?region=us-east-1

hokusai/config.yml

@@ -2,4 +2,4 @@ git-remote: git@github.com:artsy/positron.git
 project-name: positron
 pre-build: export COMMIT_HASH=$(git rev-parse --short HEAD)
 pre-deploy: yarn publish-assets
-hokusai-required-version: ">=0.5.3"
+hokusai-required-version: "~=0.5"

package.json

@@ -27,7 +27,7 @@
   "resolutions": {
     "babel-core": "^7.0.0-0",
     "babel-plugin-relay": "https://github.com/artsy/relay/releases/download/v1.5.0-artsy.5/babel-plugin-relay-1.5.0-artsy.5.tgz",
-    "react": "16.8.3",
+    "react": "16.8.4",
     "react-relay": "https://github.com/artsy/relay/releases/download/v1.5.0-artsy.5/react-relay-1.5.0-artsy.5.tgz",
     "react-test-renderer": "16.8.3",
     "relay-compiler": "https://github.com/artsy/relay/releases/download/v1.5.0-artsy.5/relay-compiler-1.5.0-artsy.5.tgz",
@@ -36,10 +36,10 @@
   },
   "dependencies": {
     "@artsy/bucket-assets": "1.0.3",
-    "@artsy/express-reloadable": "1.4.6",
+    "@artsy/express-reloadable": "1.4.7",
     "@artsy/gemup": "0.0.3",
-    "@artsy/palette": "4.14.27",
-    "@artsy/reaction": "16.18.7",
+    "@artsy/palette": "4.17.7",
+    "@artsy/reaction": "18.1.16",
     "@babel/cli": "7.0.0",
     "@babel/core": "7.0.0",
     "@babel/node": "7.0.0",
@@ -97,7 +97,7 @@
     "jwt-decode": "2.2.0",
     "kerberos": "0.0.21",
     "knox": "0.9.2",
-    "lodash": "4.17.11",
+    "lodash": "4.17.13",
     "lokka": "1.7.0",
     "lokka-transport-http": "1.6.1",
     "mocha": "3.2.0",
@@ -113,8 +113,8 @@
     "prop-types": "15.6.0",
     "raven": "2.0.2",
     "raven-js": "3.15.0",
-    "react": "16.8.3",
-    "react-dom": "16.8.3",
+    "react": "16.8.4",
+    "react-dom": "16.8.4",
     "react-dom-factories": "1.0.2",
     "react-hot-loader": "4.0.0",
     "react-redux": "5.0.6",

src/api/apps/graphql/index.js

@@ -7,7 +7,6 @@ import Article from "api/apps/articles/model/schema.coffee"
 import Author from "api/apps/authors/model.coffee"
 import Channel from "api/apps/channels/model.coffee"
 import Curation from "api/apps/curations/model.coffee"
-import Display from "api/apps/graphql/schemas/display.js"
 import * as resolvers from "api/apps/graphql/resolvers.js"
 import Tag from "api/apps/tags/model.coffee"
 import { setUser } from "api/apps/users/routes.coffee"
@@ -42,24 +41,55 @@ const metaFields = {
     }),
   relatedArticles: array()
     .items(
-      object(Article.inputSchema).concat(
-        object({
-          authors: array()
-            .items(object(Author.schema))
-            .meta({
-              resolve: resolvers.relatedAuthors,
+      object(Article.inputSchema)
+        .concat(
+          object({
+            authors: array()
+              .items(object(Author.schema))
+              .meta({
+                resolve: resolvers.relatedAuthors,
+              }),
+          })
+        )
+        .concat(
+          object({
+            seriesArticle: object(Article.inputSchema).meta({
+              resolve: resolvers.seriesArticle,
             }),
-        })
-      )
+          })
+        )
+        .concat(
+          object({
+            relatedArticles: array()
+              .items(
+                object(Article.inputSchema)
+                  .concat(
+                    object({
+                      authors: array()
+                        .items(object(Author.schema))
+                        .meta({
+                          resolve: resolvers.relatedAuthors,
+                        }),
+                    })
+                  )
+                  .concat(
+                    object({
+                      seriesArticle: object(Article.inputSchema).meta({
+                        resolve: resolvers.seriesArticle,
+                      }),
+                    })
+                  )
+              )
+              .meta({
+                resolve: resolvers.relatedArticles,
+              }),
+          })
+        )
     )
     .meta({
       name: "RelatedArticles",
       resolve: resolvers.relatedArticles,
     }),
-  display: Display.schema.meta({
-    args: Display.querySchema,
-    resolve: resolvers.display,
-  }),
   authors: array()
     .items(object(Author.schema))
     .meta({
@@ -103,10 +133,6 @@ const schema = joiql({
         args: Channel.querySchema,
         resolve: resolvers.channels,
       }),
-    display: Display.schema.meta({
-      args: Display.querySchema,
-      resolve: resolvers.display,
-    }),
     tags: array()
       .items(object(Tag.schema))
       .meta({

src/api/apps/graphql/resolvers.js

@@ -1,6 +1,4 @@
 import _ from "underscore"
-import moment from "moment"
-import { get } from "lodash"
 const Author = require("api/apps/authors/model.coffee")
 const Channel = require("api/apps/channels/model.coffee")
 const Curation = require("api/apps/curations/model.coffee")
@@ -14,9 +12,6 @@ const {
   find,
 } = require("api/apps/articles/model/index.js")
 const { ObjectId } = require("mongojs")
-const { DISPLAY_ID } = process.env
-
-let DISPLAY_COUNTER = 0
 
 export const articles = (root, args, req, ast) => {
   const unpublished = !args.published || args.scheduled
@@ -125,70 +120,38 @@ export const channels = (root, args, req, ast) => {
   })
 }
 
-export const display = (root, args, req, ast) => {
-  return new Promise((resolve, reject) => {
-    Curation.mongoFetch(
-      {
-        _id: ObjectId(DISPLAY_ID),
-      },
-      (err, { results }) => {
-        if (err) {
-          reject(new Error(err))
-        }
-        if (!results.length) {
-          resolve(null)
-        }
-
-        const firstResultCampaigns = get(results, "0.campaigns", [])
-
-        // Filter for campaigns that are available based on date
-        const now = moment(new Date())
-        const liveCampaigns = _.filter(firstResultCampaigns, campaign => {
-          const { start_date, end_date } = campaign
-
-          const startsAfterNow = moment(start_date).isAfter(now)
-          const endsBeforeNow = moment(end_date).isBefore(now)
-          return !(startsAfterNow || endsBeforeNow)
-        })
-
-        if (liveCampaigns.length > 5) {
-          reject(new Error("Share of voice sum cannot be greater than 100"))
-        } else {
-          const emptyCampaigns = _.times(5 - liveCampaigns.length, () => null)
-          liveCampaigns.push(...emptyCampaigns)
-
-          const result = liveCampaigns[DISPLAY_COUNTER]
-
-          if (DISPLAY_COUNTER === 4) {
-            DISPLAY_COUNTER = 0
-          } else {
-            DISPLAY_COUNTER = DISPLAY_COUNTER + 1
-          }
-
-          resolve(result)
-        }
-      }
-    )
-  })
-}
-
-export const relatedArticles = root => {
+export const relatedArticles = (root, args, req) => {
   const { related_article_ids } = root
+  const relatedArticleArgs = {
+    ids: related_article_ids,
+    channel_id: ObjectId(root.channel_id),
+  }
+  const unauthorized = !User.hasChannelAccess(req.user, root.channel_id)
+  if (unauthorized) {
+    relatedArticleArgs.published = true
+  }
 
   return new Promise(async (resolve, reject) => {
     let relatedArticles = []
 
     if (related_article_ids && related_article_ids.length) {
-      const relatedArticleResults = await promisedMongoFetch({
-        ids: root.related_article_ids,
-        published: true,
-      }).catch(e => reject(e))
-
+      relatedArticleArgs.limit = related_article_ids.length
+      const relatedArticleResults = await promisedMongoFetch(
+        relatedArticleArgs
+      ).catch(e => reject(e))
       relatedArticles = presentCollection(relatedArticleResults).results
     }
 
     if (relatedArticles.length) {
-      resolve(relatedArticles)
+      const relatedArticlesById = relatedArticles.reduce(
+        (lookupIndex, val) => ({
+          ...lookupIndex,
+          [val.id]: val,
+        }),
+        {}
+      )
+      const output = related_article_ids.map(id => relatedArticlesById[id])
+      resolve(output)
     } else {
       resolve(null)
     }
@@ -308,7 +271,6 @@ export const seriesArticle = root => {
   return new Promise(async (resolve, reject) => {
     const seriesArticles = await promisedMongoFetch({
       layout: "series",
-      published: true,
     }).catch(e => reject(e))
 
     seriesArticles.results.map(article => {