Merge pull request #162 from julianpoy/fix-lcb-import-fields

Fix lcb import fields
julianpoy · Feb 15, 2019 · 304519f · 304519f
2 parents 215045a + e23392b
commit 304519f
Show file tree

Hide file tree

Showing 10 changed files with 2,279 additions and 16 deletions.
diff --git a/Backend/app.js b/Backend/app.js
@@ -21,7 +21,7 @@ var devMode = appConfig.environment === 'dev';
 
 Raven.config(appConfig.sentry.dsn, {
   environment: appConfig.environment,
-  release: '1.5.0'
+  release: '1.5.1'
 }).install();
 
 // Routes

diff --git a/Backend/output b/Backend/output
diff --git a/Backend/routes/index.js b/Backend/routes/index.js
@@ -462,13 +462,19 @@ router.post(
               let createdAt = new Date(lcbRecipe.createdate || Date.now())
               let updatedAt = new Date(lcbRecipe.modifieddate || Date.now())
 
+              let totalTime = (lcbRecipe.readyintime || '').toString().trim()
+              if (lcbRecipe.cookingtime) {
+                totalTime += ` (${lcbRecipe.cookingtime.toString().trim()} cooking time)`;
+              }
+              totalTime = totalTime.trim();
+
               return Recipe.create({
                 userId: res.locals.session.userId,
                 title: lcbRecipe.recipename || '',
                 description,
-                yield: lcbRecipe.yield || '',
-                activeTime: lcbRecipe.preparationtime || '',
-                totalTime: lcbRecipe.readyintime || '',
+                yield: (lcbRecipe.yield || '').toString(),
+                activeTime: (lcbRecipe.preparationtime || '').toString(),
+                totalTime,
                 source: lcbRecipe.source || '',
                 url: lcbRecipe.webpage || '',
                 notes,

diff --git a/Backend/routes/recipes.js b/Backend/routes/recipes.js
@@ -94,7 +94,7 @@ router.get(
       userId: res.locals.session.userId,
       folder: req.query.folder
     },
-    attributes: ['id', 'title', 'description', 'source', 'image', 'folder', 'fromUserId', 'createdAt', 'updatedAt'],
+    attributes: ['id', 'title', 'description', 'source', 'url', 'image', 'folder', 'fromUserId', 'createdAt', 'updatedAt'],
     include: [{
       model: User,
       as: 'fromUser',