fix build and move search to netlify

Author: vkarpov15

netlify/functions/requestSlackInvite.js

@@ -2,7 +2,7 @@
 
 const Archetype = require('archetype');
 const extrovert = require('extrovert');
-const requestInvite = require('../src/actions/requestInvite');
+const requestInvite = require('../../src/actions/requestInvite');
 
 const RequestSlackInviteParams = new Archetype({
   email: {

search/index.js renamed to netlify/functions/search.js

@@ -1,59 +1,68 @@
-'use strict';
-
-const cheerio = require('cheerio');
-const config = require('../.config');
-const mongoose = require('mongoose');
-
-let conn = null;
-const contentSchema = new mongoose.Schema({
-  title: { type: String, required: true },
-  body: { type: String, required: true },
-  url: { type: String, required: true },
-  version: { type: String },
-  versionNumber: { type: Number }
-});
-
-module.exports = async function search(context, req) {
-  let Content;
-  if (conn == null) {
-    conn = mongoose.createConnection(config.uri);
-    await conn.asPromise();
-  }
-
-  Content = conn.model('Content', contentSchema, 'Content');
-
-  const query = req.query.search.toString();
-  const version = req.query.version ? +req.query.version.replace(/\.x$/, '') : null;
-  let results = await Content.aggregate([
-    {
-      $search: {
-        index: 'mongoose-content',
-        compound: {
-          must: [
-            ...(version ? [{
-              equals: {
-                path: 'versionNumber',
-                value: version
-              }
-            }] : []),
-            { text: { query, path: { wildcard: '*' }, fuzzy: {} } }
-          ]
-        }
-      }
-    },
-    { $limit: 10 }
-  ]);
-
-  results = results.map(doc => {
-    const $ = cheerio.load(doc.body);
-
-    doc.body = $('p').get(0) ? $('p').first().html() : doc.body;
-
-    return doc;
-  });
-
-  context.res = {
-    // status: 200, /* Defaults to 200 */
-    body: JSON.stringify({ results })
-  };
+'use strict';
+
+const Archetype = require('archetype');
+const cheerio = require('cheerio');
+const extrovert = require('extrovert');
+const mongoose = require('mongoose');
+
+let conn = null;
+const contentSchema = new mongoose.Schema({
+  title: { type: String, required: true },
+  body: { type: String, required: true },
+  url: { type: String, required: true },
+  version: { type: String },
+  versionNumber: { type: Number }
+});
+
+const SearchParams = new Archetype({
+  version: {
+    $type: 'string'
+  },
+  search: {
+    $type: 'string',
+    $required: true
+  }
+})
+
+module.exports = extrovert.toNetlifyFunction(async function search(params) {
+  params = new SearchParams(params);
+  let Content;
+  if (conn == null) {
+    conn = mongoose.createConnection(config.uri);
+    await conn.asPromise();
+  }
+
+  Content = conn.model('Content', contentSchema, 'Content');
+
+  const query = params.search;
+  const version = params.version ? +params.version.replace(/\.x$/, '') : null;
+  let results = await Content.aggregate([
+    {
+      $search: {
+        index: 'mongoose-content',
+        compound: {
+          must: [
+            ...(version ? [{
+              equals: {
+                path: 'versionNumber',
+                value: version
+              }
+            }] : []),
+            { text: { query, path: { wildcard: '*' }, fuzzy: {} } }
+          ]
+        }
+      }
+    },
+    { $limit: 10 }
+  ]);
+
+  results = results.map(doc => {
+    const $ = cheerio.load(doc.body);
+
+    doc.body = $('p').get(0) ? $('p').first().html() : doc.body;
+
+    return doc;
+  });
+
+  return { results };
 }

search/function.json

@@ -1,7 +1,8 @@
 'use strict';
 
 const axios = require('axios');
-const config = require('../../.config/development');
+
+const slackToken = process.env.SLACK_TOKEN;
 
 const url = 'https://slack.com/api/chat.postMessage';
 const emailRegexp = /^[a-zA-Z0-9+._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+$/;
@@ -26,7 +27,7 @@ module.exports = () => async function requestInvite(email) {
         }
       },
     ]
-  }, { headers: { authorization: `Bearer ${config.slackToken}` } });
+  }, { headers: { authorization: `Bearer ${slackToken}` } });
 
   return { success: true };
 }