Tt 501 integrate reports with the new backend (#797)

* refactor: TT-501 change of route

* refactor: TT-501 change of name of route

* refactor: TT-501 just change the url when in development

Co-authored-by: Davcg5 <[email protected]>

Author: OscarPallazhco

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

@@ -105,10 +105,10 @@ describe('EntryService', () => {
     const pipe: DatePipe = new DatePipe('en');
     const timeRange: TimeEntriesTimeRange = {start_date: yesterday, end_date: today};
     const userId = '123';
-
+    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
+    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
     expect(loadEntryRequest.request.params.get('start_date')).toBe(pipe.transform(yesterday,
       EntryService.TIME_ENTRIES_DATE_TIME_FORMAT));
     expect(loadEntryRequest.request.params.get('end_date')).toBe(pipe.transform(today, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT));
@@ -120,10 +120,10 @@ describe('EntryService', () => {
     const today = moment(new Date());
     const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
     const userId = '123';
-
+    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
+    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
     expect(loadEntryRequest.request.params.get('limit')).toEqual('9999');
   });
 
@@ -132,10 +132,11 @@ describe('EntryService', () => {
     const today = moment(new Date());
     const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
     const userId = '123';
+    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
 
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === service.baseUrl);
+    const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
 
     const timezoneOffset = new Date().getTimezoneOffset().toString();
     expect(loadEntryRequest.request.params.get('timezone_offset')).toEqual(timezoneOffset);

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

@@ -68,7 +68,8 @@ export class EntryService {
 
   loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
     const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999;
-    return this.http.get(this.baseUrl,
+    const loadEntriesByTimeRangeURL = this.urlInProduction ? this.baseUrl : this.baseUrl + '/report';
+    return this.http.get(loadEntriesByTimeRangeURL,
       {
         params: {
           start_date: this.datePipe.transform(range.start_date, EntryService.TIME_ENTRIES_DATE_TIME_FORMAT),