Merge pull request #491 from ioet/489_send_tz_offset_in_get_time_entries

feat: 💥 send timezone offset in get time-entries #489

Author: Angeluz-07

src/app/modules/time-clock/services/entry.service.spec.ts

@@ -55,9 +55,10 @@ describe('EntryService', () => {
 
   it('load all Entries', () => {
     const month = new Date().getMonth();
+    const timezoneOffset = new Date().getTimezoneOffset();
     service.loadEntries(month).subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}?month=${month}`);
+    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}?month=${month}&timezone_offset=${timezoneOffset}`);
     expect(loadEntryRequest.request.method).toBe('GET');
 
   });
@@ -115,6 +116,20 @@ describe('EntryService', () => {
     expect(loadEntryRequest.request.params.get('limit')).toEqual('9999');
   });
 
+  it('when getting time entries for report, timezone_offset parameter should be sent', () => {
+    const yesterday = moment(new Date()).subtract(1, 'day');
+    const today = moment(new Date());
+    const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
+    const userId = '123';
+
+    service.loadEntriesByTimeRange(timeRange, userId).subscribe();
+
+    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
+
+    const timezoneOffset = new Date().getTimezoneOffset().toString();
+    expect(loadEntryRequest.request.params.get('timezone_offset')).toEqual(timezoneOffset);
+  });
+
   it('when restarting entry, a POST is triggered', () => {
     const entry = 'entryId';
 

src/app/modules/time-clock/services/entry.service.ts

@@ -24,7 +24,8 @@ export class EntryService {
   }
 
   loadEntries(month): Observable<any> {
-    return this.http.get(`${this.baseUrl}?month=${month}`);
+    const timezoneOffset = new Date().getTimezoneOffset();
+    return this.http.get(`${this.baseUrl}?month=${month}&timezone_offset=${timezoneOffset}`);
   }
 
   createEntry(entryData): Observable<any> {
@@ -70,7 +71,8 @@ export class EntryService {
           start_date: this.datePipe.transform(range.start_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),
           end_date: this.datePipe.transform(range.end_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),
           user_id: userId,
-          limit: `${MAX_NUMBER_OF_ENTRIES_FOR_REPORTS}`
+          limit: `${MAX_NUMBER_OF_ENTRIES_FOR_REPORTS}`,
+          timezone_offset : new Date().getTimezoneOffset().toString(),
         }
       }
     );