Merge pull request #26 from tim-s-ccs/make-some-date-updates

Make some small updates to add some date helpers

src/models/activeModel.ts

@@ -169,7 +169,7 @@ abstract class ActiveModel extends Model implements ActiveModelInterface {
 
     activeModelAttributes.forEach(activeModelAttribute => (this.data[activeModelAttribute] as ActiveModel)._save(req, dataInterface))
 
-    if ('updatedAt' in this.modelSchema) this.data['updatedAt'] = utils.getCurrentDate()
+    if ('updatedAt' in this.modelSchema) this.data['updatedAt'] = utils.dateHelpers.getCurrentDateTimeString()
 
     dataInterface(req, this.tableName, this.data.id, this.attributes())
   }

src/utils/dateHelpers.ts

@@ -0,0 +1,29 @@
+const getCurrentDateTime = (): Date => {
+  const currentDate = new Date()
+  const offset = currentDate.getTimezoneOffset()
+  return new Date(currentDate.getTime() - (offset*60*1000))
+}
+
+const getCurrentDateTimeString = (): string => {
+  return getCurrentDateTime().toISOString()
+}
+
+const getCurrentDate = (): Date => {
+  const currentDate = getCurrentDateTime()
+  currentDate.setHours(0,0,0,0)
+
+  return currentDate
+}
+
+const getCurrentDateString = (): string => {
+  return getCurrentDate().toISOString()
+}
+
+const dateHelpers = {
+  getCurrentDateTime: getCurrentDateTime,
+  getCurrentDateTimeString: getCurrentDateTimeString,
+  getCurrentDate: getCurrentDate,
+  getCurrentDateString: getCurrentDateString
+}
+
+export default dateHelpers

src/utils/utils.ts

@@ -1,15 +1,15 @@
 import addLeadingZeros from './addLeadingZeros'
 import cast from './cast'
+import dateHelpers from './dateHelpers'
 import formatDate from './formatDate'
-import getCurrentDate from './getCurrentDate'
 import numberToCurrency from './numberToCurrency'
 import pluralise from './pluralise'
 
 export default {
   addLeadingZeros: addLeadingZeros,
   cast: cast,
   formatDate: formatDate,
-  getCurrentDate: getCurrentDate,
+  dateHelpers: dateHelpers,
   pluralise: pluralise,
   numberToCurrency: numberToCurrency
 }

src/validation/validators/inputValidators/dateValidator.ts

@@ -35,7 +35,7 @@ class DateValidator extends InputValidator {
         break
       case 'tommorow':
         onOrAfterDate = this.todayAtMidnight()
-        onOrAfterDate = new Date(onOrAfterDate.setDate(onOrAfterDate.getDate() + 1))
+        onOrAfterDate.setDate(onOrAfterDate.getDate() + 1)
         break
       default:
         onOrAfterDate = new Date(this.options.onOrAfterDate)
@@ -57,7 +57,7 @@ class DateValidator extends InputValidator {
         break
       case 'yesterday':
         onOrBeforeDate = this.todayAtMidnight()
-        onOrBeforeDate = new Date(onOrBeforeDate.setDate(onOrBeforeDate.getDate() - 1))
+        onOrBeforeDate.setDate(onOrBeforeDate.getDate() - 1)
         break
       default:
         onOrBeforeDate = new Date(this.options.onOrBeforeDate)