feat: supply option to use from and to in request

Author: jroehl

README.md

@@ -20,7 +20,9 @@ export DEBITOOR_API_TOKEN="<debitoor_api_token>"
   // Optional - run for a specific range
   "range": {
     "month": 8,
-    "year": 2020
+    "year": 2020,
+    "from": "ISODATE",
+    "to": "ISODATE"
   },
   // Optional - run only for specific customers
   "customerWhitelist": [

src/functions/debitoor/handler.ts

@@ -40,8 +40,8 @@ const handler: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (
     } = config;
 
     const timeEntries = await fetchTimeEntriesBetween(
-      time.startOfMonthISO,
-      time.endOfMonthISO
+      time.fromAsISO,
+      time.toAsISO
     );
 
     const billableTimeEntries = filterTimeEntriesByLabel(

src/functions/schema.ts

@@ -44,6 +44,12 @@ export default {
         year: {
           type: 'integer',
         },
+        from: {
+          type: 'string',
+        },
+        to: {
+          type: 'string',
+        },
       },
     },
   },

src/functions/sheet/handler.ts

@@ -32,8 +32,8 @@ const handler: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (
     } = config;
 
     const timeEntries = await fetchTimeEntriesBetween(
-      time.startOfMonthISO,
-      time.endOfMonthISO
+      time.fromAsISO,
+      time.toAsISO
     );
 
     const billableTimeEntries = filterTimeEntriesByLabel(

src/libs/csv.ts

@@ -54,14 +54,14 @@ export const createCsv = async (
           mapWrapJoin(
             translate('FROM'),
             formatDateForInvoice(
-              config.time.startOfMonthFormatted,
+              config.time.fromDateFormatted,
               customer.contentful.language
             )
           ),
           mapWrapJoin(
             translate('TO'),
             formatDateForInvoice(
-              config.time.endOfMonthFormatted,
+              config.time.toDateFormatted,
               customer.contentful.language
             )
           ),

src/libs/debitoor.ts

@@ -17,13 +17,13 @@ import {
   LogoResponse,
   Product,
   Settings,
-  Unit,
+  Unit
 } from './debitoor-types';
 import { formatDateForInvoice, getRoundedHours } from './time';
 import {
   ClientTimeEntries,
   EnrichedTimeEntry,
-  ProjectTimeEntries,
+  ProjectTimeEntries
 } from './toggl-types';
 import { CustomerData, Locale } from './types';
 import {
@@ -32,7 +32,7 @@ import {
   initFetch,
   initTranslate,
   Logger,
-  uniquify,
+  uniquify
 } from './utils';
 
 const BASE_URL = 'https://api.debitoor.com/api';
@@ -264,11 +264,11 @@ export const generateInvoiceTemplate = async (
   const notes = [
     translate('PERFORMANCE_PERIOD', {
       from: formatDateForInvoice(
-        time.startOfMonthFormatted,
+        time.fromDateFormatted,
         customerTimeEntries.customer.contentful.language
       ),
       to: formatDateForInvoice(
-        time.endOfMonthFormatted,
+        time.toDateFormatted,
         customerTimeEntries.customer.contentful.language
       ),
     }),
@@ -349,11 +349,11 @@ export const createDraftInvoices = async (
             const fileName = [
               matches.join(''),
               formatDateForInvoice(
-                config.time.startOfMonthFormatted,
+                config.time.fromDateFormatted,
                 customerTimeEntries.customer.contentful.language
               ),
               formatDateForInvoice(
-                config.time.endOfMonthFormatted,
+                config.time.toDateFormatted,
                 customerTimeEntries.customer.contentful.language
               ),
             ].join('_');

src/libs/time.ts

@@ -34,50 +34,47 @@ export const sortByDate = <T>(a: T, b: T) =>
   moment(a['stop'] ?? a).isBefore(moment(b['stop'] ?? b)) ? -1 : 1;
 
 export class Time {
+  public from: moment.Moment;
+  public to: moment.Moment;
   private _moment: moment.Moment = moment();
   private _format: string = 'YYYY-MM-DD';
-  constructor(public month?: number, public year?: number) {
-    if (this.month !== undefined) {
-      this._moment.month(this.month - 1);
+
+  constructor(
+    private config: {
+      month?: number;
+      year?: number;
+      from?: string;
+      to?: string;
     }
-    if (this.year !== undefined) {
-      this._moment.year(this.year);
+  ) {
+    if (this.config.from && this.config.to) {
+      this.from = moment(this.config.from);
+      this.to = moment(this.config.to);
+    } else {
+      if (this.config.month !== undefined) {
+        this._moment.month(this.config.month - 1);
+      }
+      if (this.config.year !== undefined) {
+        this._moment.year(this.config.year);
+      }
+      this.from = this._moment.clone().startOf('month');
+      this.to = this._moment.clone().endOf('month');
     }
   }
 
-  get startOfMonth(): moment.Moment {
-    return this._moment.clone().startOf('month');
-  }
-
-  get endOfMonth(): moment.Moment {
-    return this._moment.clone().endOf('month');
-  }
-
-  get startOfMonthFormatted(): string {
-    return this.startOfMonth.format(this._format);
-  }
-
-  get endOfMonthFormatted(): string {
-    return this.endOfMonth.format(this._format);
-  }
-
-  get startOfMonthISO(): string {
-    return this.startOfMonth.format();
-  }
-
-  get endOfMonthISO(): string {
-    return this.endOfMonth.format();
+  get fromDateFormatted(): string {
+    return this.from.format(this._format);
   }
 
-  get startOfMonthEpoch(): number {
-    return this.startOfMonth.valueOf();
+  get toDateFormatted(): string {
+    return this.to.format(this._format);
   }
 
-  get endOfMonthEpoch(): number {
-    return this.endOfMonth.valueOf();
+  get fromAsISO(): string {
+    return this.from.format();
   }
 
-  get dueTimestamp(): string {
-    return this.endOfMonth.utc().add(1, 'day').format();
+  get toAsISO(): string {
+    return this.to.format();
   }
 }

src/libs/utils.ts

@@ -110,14 +110,14 @@ export const getConfig = <T extends EventBody>(
   const month =
     body?.range?.month ?? (usePreviousMonth ? getLastMonth() : undefined);
 
-  const time = new Time(month, body?.range?.year);
+  const time = new Time({ ...(body?.range || {}), month });
 
   const isProduction = getEnvironment() === 'production';
   return {
     ...(body || {}),
     range: {
-      from: time.startOfMonthFormatted,
-      to: time.endOfMonthFormatted,
+      from: time.fromDateFormatted,
+      to: time.toDateFormatted,
     },
     dryRun: body?.dryRun ?? !isProduction,
     setBilled: body?.setBilled ?? isProduction,