mblabs-roccato-backend-commons 1.0.56 → 1.0.57

package/dist/interfaces/azure.d.ts

@@ -68,10 +68,11 @@ export declare namespace AzureCalendar {
     namespace GetEvents {
         interface Request {
             data: {
-                user: string;
+                account: string;
                 accessToken: string;
-                startDate: Date;
-                endDate: Date;
+                refreshToken: string;
+                startDate?: Date;
+                endDate?: Date;
             };
             credentials: Credentials;
         }

package/dist/services/azure/calendar.js

@@ -11,11 +11,12 @@ class AzuerCalendarService {
         const client = microsoft_graph_client_1.Client.init({
             authProvider: (done) => { done(null, data.accessToken); },
         });
+        const { startDate: startDateDefault, endDate: endDateDefault, } = date_1.default.getStartAndEndOfYear();
         const { value: items } = await client
-            .api(`/users/${data.user}/calendarview`)
+            .api(`/users/${data.account}/calendarview`)
             .query({
-            'startDateTime': date_1.default.toISO(data.startDate),
-            'endDateTime': date_1.default.toISO(data.endDate),
+            'startDateTime': data.startDate ? date_1.default.toISO(data.startDate) : startDateDefault,
+            'endDateTime': data.endDate ? date_1.default.toISO(data.endDate) : endDateDefault,
             '$select': 'subject,start,end,location,organizer,type,responseStatus',
             '$orderby': 'start/dateTime',
         })

package/dist/services/date.d.ts

@@ -18,7 +18,11 @@ declare class DateService {
     };
     getStartOfDay(inp: string, format?: string): string;
     getEndOfDay(inp: string, format?: string): string;
-    getStartAndEndOfMonth(inp?: string): {
+    getStartAndEndOfMonth(inp?: string | Date): {
+        startDate: string;
+        endDate: string;
+    };
+    getStartAndEndOfYear(inp?: string | Date): {
         startDate: string;
         endDate: string;
     };

package/dist/services/date.js

@@ -87,14 +87,23 @@ class DateService {
         const date = luxon_1.DateTime.fromISO(inp);
         return date.endOf('day').toFormat(format);
     }
-    getStartAndEndOfMonth(inp) {
-        const date = luxon_1.DateTime.fromISO(inp || this.getCurrent());
-        const startDate = date.startOf('month').toISODate();
-        const endDate = date
-            .plus({ months: 1 })
-            .startOf('month')
-            .minus({ days: 1 }).toISODate();
-        return { startDate, endDate };
+    getStartAndEndOfMonth(inp = this.getCurrentDate()) {
+        const date = inp instanceof Date
+            ? luxon_1.DateTime.fromJSDate(inp)
+            : luxon_1.DateTime.fromISO(inp);
+        return {
+            startDate: date.startOf('month').toISODate(),
+            endDate: date.plus({ months: 1 }).startOf('month').minus({ days: 1 }).toISODate(),
+        };
+    }
+    getStartAndEndOfYear(inp = this.getCurrentDate()) {
+        const date = inp instanceof Date
+            ? luxon_1.DateTime.fromJSDate(inp)
+            : luxon_1.DateTime.fromISO(inp);
+        return {
+            startDate: date.startOf('year').toISODate(),
+            endDate: date.endOf('year').toISODate(),
+        };
     }
     getCurrentTimestamp() {
         return luxon_1.DateTime.now().toMillis();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mblabs-roccato-backend-commons",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/interfaces/azure.ts

@@ -75,10 +75,11 @@ export namespace AzureCalendar {
   export namespace GetEvents {
     export interface Request {
       data: {
-        user: string;
+        account: string;
         accessToken: string;
-        startDate: Date;
-        endDate: Date;
+        refreshToken: string;
+        startDate?: Date;
+        endDate?: Date;
       };
       credentials: Credentials;
     }

package/src/services/azure/calendar.ts

@@ -15,11 +15,16 @@ class AzuerCalendarService implements IAzureCalendarService {
       authProvider: (done) => { done(null, data.accessToken); },
     });
 
+    const {
+      startDate: startDateDefault,
+      endDate: endDateDefault,
+    } = DateService.getStartAndEndOfYear();
+
     const { value: items } = await client
-      .api(`/users/${data.user}/calendarview`)
+      .api(`/users/${data.account}/calendarview`)
       .query({
-        'startDateTime': DateService.toISO(data.startDate),
-        'endDateTime': DateService.toISO(data.endDate),
+        'startDateTime': data.startDate ? DateService.toISO(data.startDate) : startDateDefault,
+        'endDateTime': data.endDate ? DateService.toISO(data.endDate) : endDateDefault,
         '$select': 'subject,start,end,location,organizer,type,responseStatus',
         '$orderby': 'start/dateTime',
       })

package/src/services/date.ts

@@ -114,17 +114,26 @@ class DateService {
     return date.endOf('day').toFormat(format);
   }
 
-  public getStartAndEndOfMonth (inp?: string) {
-    const date = DateTime.fromISO(inp || this.getCurrent());
+  public getStartAndEndOfMonth (inp: string |Date = this.getCurrentDate()) {
+    const date = inp instanceof Date
+      ? DateTime.fromJSDate(inp)
+      : DateTime.fromISO(inp);
 
-    const startDate = date.startOf('month').toISODate();
+    return {
+      startDate: date.startOf('month').toISODate(),
+      endDate: date.plus({ months: 1 }).startOf('month').minus({ days: 1 }).toISODate(),
+    };
+  }
 
-    const endDate = date
-      .plus({ months: 1 })
-      .startOf('month')
-      .minus({ days: 1 }).toISODate();
+  public getStartAndEndOfYear (inp: string | Date = this.getCurrentDate()) {
+    const date = inp instanceof Date
+      ? DateTime.fromJSDate(inp)
+      : DateTime.fromISO(inp);
 
-    return { startDate, endDate };
+    return {
+      startDate: date.startOf('year').toISODate(),
+      endDate: date.endOf('year').toISODate(),
+    };
   }
 
   public getCurrentTimestamp (): number {