Merge pull request #180 from YuriGor/master

 explicit email templates init #111

Author: tima101

.gitignore

@@ -16,4 +16,7 @@ node_modules/
 book/8-exp
 tutorials/working
 
-yarn-error.log
+yarn-error.log
+.directory
+*.code-workspace
+package-lock.json

book/4-end/server/app.js

@@ -6,6 +6,7 @@ const mongoose = require('mongoose');
 
 const auth = require('./google');
 const logger = require('./logs');
+const { insertTemplates } = require('./models/EmailTemplate');
 
 require('dotenv').config();
 
@@ -28,7 +29,7 @@ const ROOT_URL = `http://localhost:${port}`;
 const app = next({ dev });
 const handle = app.getRequestHandler();
 
-app.prepare().then(() => {
+app.prepare().then(async () => {
   const server = express();
 
   const MongoStore = mongoSessionStore(session);
@@ -48,7 +49,7 @@ app.prepare().then(() => {
   };
 
   server.use(session(sess));
-
+  await insertTemplates();
   auth({ server, ROOT_URL });
 
   server.get('*', (req, res) => handle(req, res));

book/4-end/server/models/EmailTemplate.js

@@ -22,7 +22,21 @@ const mongoSchema = new Schema({
 
 const EmailTemplate = mongoose.model('EmailTemplate', mongoSchema);
 
-function insertTemplates() {
+async function getEmailTemplate(name, params) {
+  const source = await EmailTemplate.findOne({ name });
+  if (!source) {
+    throw new Error(`No EmailTemplates found.
+      Please check that at least one is generated at server startup,
+      restart your server and try again.`);
+  }
+
+  return {
+    message: _.template(source.message)(params),
+    subject: _.template(source.subject)(params),
+  };
+}
+
+async function insertTemplates() {
   const templates = [
     {
       name: 'welcome',
@@ -40,31 +54,21 @@ function insertTemplates() {
     },
   ];
 
-  templates.forEach(async (template) => {
-    if ((await EmailTemplate.find({ name: template.name }).countDocuments()) > 0) {
-      return;
-    }
-
-    EmailTemplate.create(template).catch((error) => {
-      logger.error('EmailTemplate insertion error:', error);
-    });
+  const updates = _.reduce(
+    templates,
+    (res, template) => {
+      res.push(EmailTemplate.updateOne({ name: template.name }, template, { upsert: true }));
+      return res;
+    },
+    [],
+  );
+  return Promise.all(updates).catch((error) => {
+    logger.error('EmailTemplate insertion error: ', error);
+    throw error;
   });
 }
 
-insertTemplates();
-
-async function getEmailTemplate(name, params) {
-  const source = await EmailTemplate.findOne({ name });
-  if (!source) {
-    throw new Error(`No EmailTemplates found.
-      Please check that at least one is generated at server startup,
-      restart your server and try again.`);
-  }
-
-  return {
-    message: _.template(source.message)(params),
-    subject: _.template(source.subject)(params),
-  };
-}
-
-module.exports = getEmailTemplate;
+module.exports = {
+  insertTemplates,
+  getEmailTemplate,
+};

book/4-end/server/models/User.js

@@ -3,7 +3,7 @@ const _ = require('lodash');
 
 const generateSlug = require('../utils/slugify');
 const sendEmail = require('../aws');
-const getEmailTemplate = require('./EmailTemplate');
+const { getEmailTemplate } = require('./EmailTemplate');
 const logger = require('../logs');
 
 const { Schema } = mongoose;