merge from master

mmaquina · mmaquina · commit 5a88ffdd0267 · 2023-04-21T22:53:58.000-03:00
diff --git a/.git-crypt/keys/PROD/0/F0EBF422F70334C5FE8CAF487A1FE9C45A4A5B22.gpg b/.git-crypt/keys/PROD/0/F0EBF422F70334C5FE8CAF487A1FE9C45A4A5B22.gpg
diff --git a/.git-crypt/keys/STAGE/0/F0EBF422F70334C5FE8CAF487A1FE9C45A4A5B22.gpg b/.git-crypt/keys/STAGE/0/F0EBF422F70334C5FE8CAF487A1FE9C45A4A5B22.gpg
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+## Description
+
+Add a description of the: feature, bug fix,code change that improves performance, that affect the build system or external dependencies, on documentation, refactor or test.
+
+## Files changed
+
+- Add a list of files that have been changed
+
+## Task board
+
+- [Ticket name](Ticket url)
+
+## Acceptance criteria
+
+Add the acceptance criteria for this task.
diff --git a/.github/workflows/time-tracker-ui-cd-prod.yml b/.github/workflows/time-tracker-ui-cd-prod.yml
@@ -13,7 +13,9 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
-        
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/.github/workflows/time-tracker-ui-cd-stage.yml b/.github/workflows/time-tracker-ui-cd-stage.yml
@@ -13,6 +13,8 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
         
     steps:
     - name: Checkout
diff --git a/.github/workflows/time-tracker-ui-ci.yml b/.github/workflows/time-tracker-ui-ci.yml
@@ -18,6 +18,9 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+
     strategy:
       max-parallel: 5
     steps:
diff --git a/README.md b/README.md
@@ -181,7 +181,7 @@ Stryker is also executed on GitHub actions with the following cron expresion:
 
 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
 
-## Deploy the app on Azure
+## Deploy the app on Azure (deprecated)
 
 The app deployment is automatically executed after each pull request is merged in master. That's wht it is necessary that each pull request meets at least 80% of test coverage.
 
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -5,15 +5,22 @@ terraform {
       source  = "hashicorp/azurerm"
       version = "~> 2.90"
     }
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.9.0"
+    }
   }
 
-  backend "azurerm" {
-    resource_group_name  = "ioet-infra-tf-state"
-    storage_account_name = "timetrackertfstate"
-    container_name       = "time-tracker-tf-state"
-    key                  = "time-tracker-ui.tfstate"
+  backend "s3" {
+    bucket  = "time-tracker-service"
+    key     = "ioet-time-tracker-ui/terraform.tfstate"
+    region  = "us-east-1"
+    encrypt = true
   }
+}
 
+provider "aws" {
+  region = "us-east-1"
 }
 
 provider "azurerm" {
@@ -22,13 +29,11 @@ provider "azurerm" {
 }
 
 data "terraform_remote_state" "service" {
-  backend   = "azurerm"
-  workspace = terraform.workspace
+  backend = "s3"
   config = {
-    resource_group_name  = "ioet-infra-tf-state"
-    storage_account_name = "timetrackertfstate"
-    container_name       = "time-tracker-tf-state"
-    key                  = "this.tfstate"
+    bucket = "time-tracker-service"
+    key    = "env://${local.environment}/time-tracker-service/terraform.tfstate"
+    region = "us-east-1"
   }
 }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",
diff --git a/src/app/modules/customer-management/components/projects/components/services/project.service.spec.ts b/src/app/modules/customer-management/components/projects/components/services/project.service.spec.ts
@@ -74,7 +74,7 @@ describe('ProjectService', () => {
     service.getRecentProjects().subscribe((projectsInResponse) => {
       expect(projectsInResponse.length).toBe(projectsFoundSize);
     });
-    const getProjectsRequest = httpMock.expectOne(`${service.url}/recent`);
+    const getProjectsRequest = httpMock.expectOne(`${service.url}/recent/`);
     expect(getProjectsRequest.request.method).toBe('GET');
     getProjectsRequest.flush(projectsList);
   });
diff --git a/src/app/modules/customer-management/components/projects/components/store/project.effects.spec.ts b/src/app/modules/customer-management/components/projects/components/store/project.effects.spec.ts
@@ -8,7 +8,7 @@ import { ProjectActionTypes } from './project.actions';
 import { ProjectEffects } from './project.effects';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ToastrModule, ToastrService } from 'ngx-toastr';
-import { INFO_SAVED_SUCCESSFULLY, INFO_DELETE_SUCCESSFULLY } from '../../../../../shared/messages';
+import { INFO_SAVED_SUCCESSFULLY, PROJECT_DEACTIVATED_SUCCESSFULLY } from '../../../../../shared/messages';
 
 describe('ProjectEffects', () => {
   let actions$: Observable<Action>;
@@ -128,7 +128,7 @@ describe('ProjectEffects', () => {
     spyOn(service, 'deleteProject').and.returnValue(of({}));
 
     effects.deleteProject$.subscribe((action) => {
-      expect(toastrService.success).toHaveBeenCalledWith(INFO_DELETE_SUCCESSFULLY);
+      expect(toastrService.success).toHaveBeenCalledWith(PROJECT_DEACTIVATED_SUCCESSFULLY);
       expect(action.type).toEqual(ProjectActionTypes.DELETE_PROJECT_SUCCESS);
     });
   });
diff --git a/src/app/modules/shared/interceptors/inject.token.interceptor.spec.ts b/src/app/modules/shared/interceptors/inject.token.interceptor.spec.ts
@@ -32,19 +32,4 @@ describe('InjectTokenInterceptor test', () => {
     expect(handler.handle).toHaveBeenCalledWith(request);
   });
 
-  it('if request.url is part of time-tracker-api, then Authorization header is injected', () => {
-    const interceptor = new InjectTokenInterceptor(azureAdB2CService, loginService);
-    interceptor.isProduction = true;
-    const request = new HttpRequest('GET', environment.timeTrackerApiUrl);
-    spyOn(handler, 'handle');
-    const requestWithHeaders = request.clone(
-      {
-        headers: request.headers.set('Authorization', 'Bearer XYZ')
-      });
-
-    interceptor.intercept(request, handler);
-
-    expect(handler.handle).toHaveBeenCalledWith(requestWithHeaders);
-  });
-
 });
diff --git a/src/app/modules/time-clock/services/entry.service.spec.ts b/src/app/modules/time-clock/services/entry.service.spec.ts
@@ -17,7 +17,7 @@ describe('EntryService', () => {
     service = TestBed.inject(EntryService);
     httpMock = TestBed.inject(HttpTestingController);
     service.baseUrl = 'time-entries';
-    reportsUrl = service.urlInProductionLegacy ? service.baseUrl : service.baseUrl + '/report';
+    reportsUrl = service.urlInProductionLegacy ? service.baseUrl : service.baseUrl + '/report/';
   });
 
   it('services are ready to be used', inject(
@@ -36,22 +36,22 @@ describe('EntryService', () => {
       expect(response.length).toBe(1);
     });
 
-    const createEntryRequest = httpMock.expectOne(service.baseUrl);
+    const createEntryRequest = httpMock.expectOne(`${service.baseUrl}/`);
     expect(createEntryRequest.request.method).toBe('POST');
     createEntryRequest.flush(entry);
   });
 
   it('loads an activeEntry with /running', () => {
     service.loadActiveEntry().subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/running`);
+    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/running/`);
     expect(loadEntryRequest.request.method).toBe('GET');
   });
 
   it('loads summary with get /summary?time_offset=<time-offset>', () => {
     service.summary().subscribe();
     const timeOffset = new Date().getTimezoneOffset();
-    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/summary?time_offset=${timeOffset}`);
+    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/summary/?time_offset=${timeOffset}`);
     expect(loadEntryRequest.request.method).toBe('GET');
   });
 
@@ -62,7 +62,7 @@ describe('EntryService', () => {
     const timezoneOffset = new Date().getTimezoneOffset();
     service.loadEntries({ year, month }).subscribe();
 
-    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}?month=${month}&year=${year}&timezone_offset=${timezoneOffset}`);
+    const loadEntryRequest = httpMock.expectOne(`${service.baseUrl}/?month=${month}&year=${year}&timezone_offset=${timezoneOffset}`);
     expect(loadEntryRequest.request.method).toBe('GET');
 
   });
@@ -89,15 +89,15 @@ describe('EntryService', () => {
     service.urlInProductionLegacy = true;
     service.stopEntryRunning('id').subscribe();
 
-    const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/id/stop`);
+    const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/id/stop/`);
     expect(updateEntryRequest.request.method).toBe('POST');
   });
 
   it('stops an entry using PUT', () => {
     service.urlInProductionLegacy = false;
     service.stopEntryRunning('id').subscribe();
 
-    const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/stop`);
+    const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/stop/`);
     expect(updateEntryRequest.request.method).toBe('PUT');
   });
 
@@ -153,7 +153,7 @@ describe('EntryService', () => {
 
     service.findEntriesByProjectId(projectId).subscribe();
 
-    const restartEntryRequest = httpMock.expectOne( `${service.baseUrl}?limit=2&project_id=${projectId}&start_date=${startDate}&end_date=${endDate}`);
+    const restartEntryRequest = httpMock.expectOne( `${service.baseUrl}/?limit=2&project_id=${projectId}&start_date=${startDate}&end_date=${endDate}`);
     expect(restartEntryRequest.request.method).toBe('GET');
   });
 
diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
@@ -501,15 +501,6 @@ describe('TimeEntriesComponent', () => {
     expect(component.doSave).toHaveBeenCalledTimes(0);
   });
 
-  it('call cookieService.get() when call ngOnInit', () => {
-    spyOn(cookieService, 'get');
-    const sentParameter = FeatureToggle.TIME_TRACKER_CALENDAR;
-
-    component.ngOnInit();
-
-    expect(cookieService.get).toHaveBeenCalledWith(sentParameter);
-  });
-
 
   it('set true in displayGridView when its initial value is false and call onDisplayModeChange', () => {
     const expectedValue = true;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "time-tracker",`
`3`		`- "version": "2.2.1",`
	`3`	`+ "version": "2.3.0",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"preinstall": "npx npm-force-resolutions",`
`6`	`6`	`"ng": "ng",`