yr & mo changes not needed

Author: klequis

db/dataTypes.js

@@ -4,7 +4,8 @@ const dataTypes = {
   Number: 'Number',
   Array: 'Array',
   Boolean: 'Boolean',
-  Date: 'Date'
+  Date: 'Date',
+  Undefined: 'Undefined'
 }
 
 export default dataTypes

routes/importData/importValidation.js

@@ -1,57 +1,66 @@
 import { transactionFields as tFields } from 'db/constants'
 import R from 'ramda'
-import { getOverlappingDaysInRanges, isDate } from 'date-fns'
+import { /*getOverlappingDaysInRanges, */ isDate } from 'date-fns'
 import dataTypes from 'db/dataTypes'
 
 // eslint-disable-next-line
 import { yellow, blue, green, redf } from 'logger'
 
-const isDateType = (value) => isDate(new Date(value))
-    ? 'Date'
-    : R.type(value)
+const isDateType = (value) => (isDate(new Date(value)) ? 'Date' : R.type(value))
 
 /**
- * 
- * @param {string} fieldName 
- * @param {any} fieldValue 
+ *
+ * @param {string} fieldName
+ * @param {any} fieldValue
  * @returns {object} { good: boolean, error: null || string }
  * @description Returns true if fieldValue is the correct type for fieldName
  *              'type' & 'checkNumber' fields are optional
  */
 export const checkField = (fieldName, fieldValue) => {
-    
-    const expectedType = tFields[fieldName].type
-    if (expectedType === dataTypes.Any) {
-        return { good: true, error: null }
-    }
-    const receivedType = fieldName === tFields.date.name
-        ? isDateType(fieldValue)
-        : R.type(fieldValue)
-    if (fieldName === tFields.type.name || fieldName === tFields.checkNumber.name) {
-        if (fieldValue === undefined) {
-            return { good: true, error: null }
-        }
+  const expectedType = tFields[fieldName].type
+  if (expectedType === dataTypes.Any) {
+    return { good: true, error: null }
+  }
+  const receivedType =
+    fieldName === tFields.date.name
+      ? isDateType(fieldValue)
+      : R.type(fieldValue)
+  if (
+    fieldName === tFields.type.name ||
+    fieldName === tFields.checkNumber.name
+  ) {
+    if (fieldValue === undefined) {
+      return { good: true, error: null }
     }
+  }
 
-    if (fieldName === tFields.credit.name && fieldValue < 0) {
-        // blue('fieldName', fieldName)
-        // blue('fieldValue', fieldValue)
-        // blue(' credit typeof ', typeof fieldValue)
-        return { good: false, error: `A credit must be a positive (+) or zero. Received ${fieldValue}`}
+  if (fieldName === tFields.credit.name && fieldValue < 0) {
+    // blue('fieldName', fieldName)
+    // blue('fieldValue', fieldValue)
+    // blue(' credit typeof ', typeof fieldValue)
+    return {
+      good: false,
+      error: `A credit must be a positive (+) or zero. Received ${fieldValue}`
     }
+  }
 
-    if (fieldName === tFields.debit.name && fieldValue > 0) {
-        blue('fieldName', fieldName)
-        blue('fieldValue', fieldValue)
-        blue(' debit typeof ', typeof fieldValue)
-        return { good: false, error: `A debit must be a negative (-) or zero. Received ${fieldValue}`}
+  if (fieldName === tFields.debit.name && fieldValue > 0) {
+    blue('fieldName', fieldName)
+    blue('fieldValue', fieldValue)
+    blue(' debit typeof ', typeof fieldValue)
+    return {
+      good: false,
+      error: `A debit must be a negative (-) or zero. Received ${fieldValue}`
     }
+  }
 
-    
-    const good = receivedType === expectedType
-        ? { good: true, error: null }
-        : { good: false, error: `checkField: field=${fieldName}: Expected ${expectedType} but received type ${receivedType} with value ${fieldValue}` }
-
-    return good
+  const good =
+    receivedType === expectedType
+      ? { good: true, error: null }
+      : {
+          good: false,
+          error: `checkField: field=${fieldName}: Expected ${expectedType} but received type ${receivedType} with value ${fieldValue}`
+        }
 
-}
+  return good
+}

routes/views/allTransactionsByDescription.js

@@ -4,6 +4,7 @@ import {
   TRANSACTIONS_COLLECTION_NAME,
   convertFieldValuesToUi
 } from 'db/constants'
+import isNilOrEmpty from 'lib/isNilOrEmpty'
 
 /* eslint-disable */
 import { yellow, red, redf } from 'logger'
@@ -46,12 +47,17 @@ import * as R from 'ramda'
 
 const allDataByDescription = wrap(async (req, res) => {
   const { params } = req
-  const { showOmitted } = params
+  const { showOmitted, year, month } = params
 
-  const filter =
+  // yellow('params', params)
+  yellow('year', year)
+  yellow('month', R.type(month))
+  const f1 =
     showOmitted === 'true' ? { omit: { $eq: true } } : { omit: { $eq: false } }
 
-  const data = await find(TRANSACTIONS_COLLECTION_NAME, filter)
+  // const f2 = !isNilOrEmpty(year) ? R.merge(f1, { })
+
+  const data = await find(TRANSACTIONS_COLLECTION_NAME, f1)
   // TODO: tmp code here
   // const limit = R.take(5, data)
   // yellow('limit100', limit100)

routes/views/index.js

@@ -9,7 +9,18 @@ const router = express.Router()
 router.get('/amount-by-category', amountByCategory)
 router.get('/data-changes', transactionsChanges)
 router.get('/original-values', originalValues)
-router.get('/all-data-by-description/:showOmitted', allTransactionsByDescription)
+router.get(
+  '/all-data-by-description/:showOmitted',
+  allTransactionsByDescription
+)
+router.get(
+  '/all-data-by-description/:showOmitted/:year',
+  allTransactionsByDescription
+)
+router.get(
+  '/all-data-by-description/:showOmitted/:year/:month',
+  allTransactionsByDescription
+)
 router.get('/raw-data', allTransactionsByDescription)
 
 export default router