Merge branch 'seed-batching-fix' of fyindr/siimee into dev

backend/db/dataSort.js

@@ -0,0 +1,3 @@
+const dataSort = (table, id) => { return table.sort((a,b) => {return a[`${id}`] < b[`${id}`]})}
+
+module.exports = dataSort

backend/db/seeds/01-users.js

@@ -1,5 +1,7 @@
 const mock = require('../data-generator/mock')
 const fs = require('fs')
+const dataSort = require ('../dataSort')
+const { batchSize } = require('../data-generator/config.json')
 
 let users = []
 const generatedDataPath = './db/generated'
@@ -10,15 +12,19 @@ for (let name of fileNames) {
         users = [...users, ...data.users]
     }
 }
+// sort data
+users = dataSort(users, 'user_id')
 
-exports.seed = knex => {
-    // Deletes ALL existing entries
-    return knex('users')
-        .truncate()
-        .then(function () {
-            // Inserts seed entries
-            return users
-                ? knex('users').insert(users)
-                : knex('users').insert(mock.users)
-        })
-}
+exports.seed = async knex => {
+    await knex('users').del()
+    let usersToPush = []
+    let len = users.length
+    for (let i = 1; i <= len; i += 1) {
+        usersToPush.push(users.shift())
+        if (i % batchSize === 0) {
+            await knex('users').insert(usersToPush)
+            usersToPush = []
+        }
+        
+    }
+}

backend/db/seeds/02-profiles.js

@@ -1,5 +1,8 @@
 const mock = require('../data-generator/mock')
 const fs = require('fs')
+const dataSort = require ('../dataSort')
+const { batchSize } = require('../data-generator/config.json')
+
 
 let profiles = []
 const generatedDataPath = './db/generated'
@@ -10,15 +13,19 @@ for (let name of fileNames) {
         profiles = [...profiles, ...data.profiles]
     }
 }
+// sort data
+profiles = dataSort(profiles, 'profile_id')
+
 
-exports.seed = knex => {
-    // Deletes ALL existing entries
-    return knex('profiles')
-        .truncate()
-        .then(function () {
-            // Inserts seed entries
-            return profiles
-                ? knex('profiles').insert(profiles)
-                : knex('profiles').insert(mock.profiles)
-        })
+exports.seed = async knex => {
+    await knex('profiles').del()
+    let profilesToPush = []
+    let len = profiles.length
+    for (let i = 1; i <= len; i += 1) {
+        profilesToPush.push(profiles.shift())
+        if (i % batchSize === 0 || i > profiles.length) {
+            await knex('profiles').insert(profilesToPush)
+            profilesToPush = []
+        }
+    }
 }

backend/db/seeds/04-responses.js

@@ -1,5 +1,7 @@
 const mock = require('../data-generator/mock')
 const fs = require('fs')
+const dataSort = require ('../dataSort')
+const { batchSize } = require('../data-generator/config.json')
 
 let responses = []
 const generatedDataPath = './db/generated'
@@ -11,14 +13,18 @@ for (let name of fileNames) {
     }
 }
 
-exports.seed = knex => {
-    // Deletes ALL existing entries
-    return knex('responses')
-        .truncate()
-        .then(function () {
-            // Inserts seed entries
-            return responses
-                ? knex('responses').insert(responses)
-                : knex('responses').insert(mock.responses)
-        })
+// sort data
+responses = dataSort(responses, 'response_id')
+
+exports.seed = async knex => {
+    await knex('responses').del()
+    let responsesToPush = []
+    let len = responses.length
+    for (let i = 1; i <= len; i += 1) {
+        responsesToPush.push(responses.shift())
+        if (i % batchSize === 0 || i > responses.length) {
+            await knex('responses').insert(responsesToPush)
+            responsesToPush = []
+        }
+    }
 }