Merge 44aa752 into 118e0d1

Author: VanessaIniguez

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

@@ -143,10 +143,13 @@ describe('EntryService', () => {
 
   it('entries are found by project id with a limit 2 by default', () => {
     const projectId = 'project-id';
+    const startDate = (moment().subtract(1, 'months')).format();
+    const endDate = moment().format();
 
     service.findEntriesByProjectId(projectId).subscribe();
 
-    const restartEntryRequest = httpMock.expectOne( `${service.baseUrl}?limit=2&project_id=${projectId}`);
+    const restartEntryRequest = httpMock.expectOne( `${service.baseUrl}?limit=2&project_id=${projectId}&start_date=${startDate}&end_date=${endDate}`);
     expect(restartEntryRequest.request.method).toBe('GET');
   });
+
 });

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

@@ -7,6 +7,7 @@ import { environment } from './../../../../environments/environment';
 import { TimeEntriesTimeRange } from '../models/time-entries-time-range';
 import { DatePipe } from '@angular/common';
 import { Entry } from '../../shared/models';
+import * as moment from 'moment';
 
 @Injectable({
   providedIn: 'root',
@@ -59,7 +60,9 @@ export class EntryService {
   }
 
   findEntriesByProjectId(projectId: string): Observable<Entry[]> {
-    const findEntriesByProjectURL = `${this.baseUrl}?limit=2&project_id=${projectId}`;
+    const startDate = this.getDateLastMonth();
+    const endDate = this.getCurrentDate();
+    const findEntriesByProjectURL = `${this.baseUrl}?limit=2&project_id=${projectId}&start_date=${startDate}&end_date=${endDate}`;
     return this.http.get<Entry[]>(findEntriesByProjectURL);
   }
 
@@ -77,4 +80,12 @@ export class EntryService {
       }
     );
   }
+
+  getDateLastMonth() {
+    return (moment().subtract(1, 'months')).format();
+  }
+
+  getCurrentDate() {
+    return moment().format();
+  }
 }