Move db operations back to db module

db/index.js

@@ -176,9 +176,38 @@ function getPreviousTemperature(cycleDay) {
   return winner.temperature.value
 }
 
+const schema = db.schema.reduce((acc, curr) => {
+  acc[curr.name] = curr.properties
+  return acc
+}, {})
+
+function tryToCreateCycleDay(day, i) {
+  try {
+    db.create('CycleDay', day)
+  } catch (err) {
+    const msg = `Line ${i + 1}(${day.date}): ${err.message}`
+    throw new Error(msg)
+  }
+}
+
+function tryToImportWithDelete(cycleDays) {
+  db.write(() => {
+    db.delete(db.objects('CycleDay'))
+    cycleDays.forEach(tryToCreateCycleDay)
+  })
+}
+
+function tryToImportWithoutDelete(cycleDays) {
+  db.write(() => {
+    cycleDays.forEach((day, i) => {
+      const existing = getCycleDay(day.date)
+      if (existing) db.delete(existing)
+      tryToCreateCycleDay(day, i)
+    })
+  })
+}
 
 export {
-  db,
   saveSymptom,
   getOrCreateCycleDay,
   bleedingDaysSortedByDate,
@@ -187,5 +216,8 @@ export {
   fillWithDummyData,
   deleteAll,
   getPreviousTemperature,
-  getCycleDay
+  getCycleDay,
+  schema,
+  tryToImportWithDelete,
+  tryToImportWithoutDelete
 }

lib/import-export/get-csv-column-names.js

@@ -1,13 +1,13 @@
-import { db } from '../../db'
+import { schema } from '../../db'
 
 export default function getColumnNamesForCsv() {
   return getPrefixedKeys('CycleDay')
 
   function getPrefixedKeys(schemaName, prefix) {
-    const schema = db.schema.find(x => x.name === schemaName).properties
+    const model = schema[schemaName]
-    return Object.keys(schema).reduce((acc, key) => {
+    return Object.keys(model).reduce((acc, key) => {
       const prefixedKey = prefix ? [prefix, key].join('.') : key
-      const childSchemaName = schema[key].objectType
+      const childSchemaName = model[key].objectType
       if (!childSchemaName) {
         acc.push(prefixedKey)
         return acc

lib/import-export/import-from-csv.js

@@ -1,6 +1,6 @@
 import csvParser from 'csvtojson'
 import isObject from 'isobject'
-import { db, getCycleDay } from '../../db'
+import { schema, tryToImportWithDelete, tryToImportWithoutDelete } from '../../db'
 import getColumnNamesForCsv from './get-csv-column-names'
 
 export default async function importCsv(csv, deleteFirst) {
@@ -23,12 +23,11 @@ export default async function importCsv(csv, deleteFirst) {
     return Number(val)
   }
 
-  const cycleDayDbSchema = db.schema.find(x => x.name === 'CycleDay').properties
   const config = {
     ignoreEmpty: true,
     colParser: getColumnNamesForCsv().reduce((acc, colName) => {
       const path = colName.split('.')
-      const dbType = getDbType(cycleDayDbSchema, path)
+      const dbType = getDbType(schema.CycleDay, path)
       acc[colName] = item => {
         if (item === '') return null
         return parseFuncs[dbType](item)
@@ -45,29 +44,9 @@ export default async function importCsv(csv, deleteFirst) {
   putNullForEmptySymptoms(cycleDays)
 
   if (deleteFirst) {
-    db.write(() => {
+    tryToImportWithDelete(cycleDays)
-      db.delete(db.objects('CycleDay'))
-      cycleDays.forEach(tryToCreateCycleDay)
-    })
   } else {
-    db.write(() => {
+    tryToImportWithoutDelete(cycleDays)
-      cycleDays.forEach((day, i) => {
-        const existing = getCycleDay(day.date)
-        if (existing) {
-          db.delete(existing)
-        }
-        tryToCreateCycleDay(day, i)
-      })
-    })
-  }
-}
-
-function tryToCreateCycleDay(day, i) {
-  try {
-    db.create('CycleDay', day)
-  } catch (err) {
-    const msg = `Line ${i + 1}(${day.date}): ${err.message}`
-    throw new Error(msg)
   }
 }
 
@@ -99,6 +78,5 @@ function putNullForEmptySymptoms(data) {
 function getDbType(modelProperties, path) {
   if (path.length === 1) return modelProperties[path[0]].type
   const modelName = modelProperties[path[0]].objectType
-  const model = db.schema.find(x => x.name === modelName)
+  return getDbType(schema[modelName], path.slice(1))
-  return getDbType(model.properties, path.slice(1))
 }