Merge pull request #81 from aquality-automation/feature/project-id-as-part-of-api-url

VladislavKostyukevich · web-flow · commit 9b2bee7244f6 · 2020-02-20T11:52:42.000+03:00
added project_id parameters for requests
diff --git a/e2e/api/editor.api.ts b/e2e/api/editor.api.ts
@@ -62,7 +62,7 @@ export class EditorAPI {
     }
 
     public async addTestToSuite(testId: number, suiteId: number) {
-        return sendPost(Endpoints.testToSuite, { testId, suiteId, projectId: this.project.id }, {}, this.token, this.project.id);
+        return sendPost(Endpoints.testToSuite, { testId, suiteId, project_id: this.project.id }, {}, this.token, this.project.id);
     }
 
     public async getSuites(testSuite: TestSuite): Promise<TestSuite[]> {
@@ -82,6 +82,6 @@ export class EditorAPI {
     }
 
     public async removeTestRun(testRunId: number) {
-        return sendDelete(Endpoints.testrun, { id: testRunId, projectId: this.project.id}, null, this.token, this.project.id);
+        return sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id}, null, this.token, this.project.id);
     }
 }
diff --git a/e2e/specs/audit/auditFlow.spec.ts b/e2e/specs/audit/auditFlow.spec.ts
@@ -3,7 +3,6 @@ import { projectList } from '../../pages/project/list.po';
 import { projectAudits } from '../../pages/audit/project.list.po';
 import { createAudit } from '../../pages/audit/create.po';
 import { auditInfo } from '../../pages/audit/view.po';
-import { browser } from 'protractor';
 import { testData } from '../../utils/testData.util';
 import { ProjectHelper } from '../../helpers/project.helper';
 
diff --git a/src/app/pages/audit/audit-view/audit.info.component.ts b/src/app/pages/audit/audit-view/audit.info.component.ts
@@ -108,7 +108,7 @@ export class AuditInfoComponent implements OnInit {
 
   removeAttachment(id: number) {
     this.removingInProgress = true;
-    this.auditService.removeAuditAttachment(id).subscribe(res => {
+    this.auditService.removeAuditAttachment(id, this.audit.project.id).subscribe(() => {
       this.updateAttachments();
       this.removingInProgress = false;
     });
diff --git a/src/app/pages/project/milestone/list-milestone/list-milestone.component.ts b/src/app/pages/project/milestone/list-milestone/list-milestone.component.ts
@@ -66,6 +66,7 @@ export class ListMilestoneComponent implements OnInit {
   }
 
   async updateMilestone(milestone: Milestone) {
+    milestone.project_id = this.projectId;
     await this.milestoneService.createMilestone(milestone);
     return this.milestoneService.handleSuccess(`The milestone '${milestone.name}' was updated.`);
   }
diff --git a/src/app/services/audits.service.ts b/src/app/services/audits.service.ts
@@ -59,8 +59,9 @@ export class AuditService extends SimpleRequester {
     return this.doGet(`/audit/attachment?audit_id=${audit_id}&project_id=${project_id}`).map(res => res.json());
   }
 
-  removeAuditAttachment(id: number) {
-    return this.doDelete(`/audit/attachment?id=${id}`).map(res => this.handleSuccess(`Audit attachment was deleted.`));
+  removeAuditAttachment(id: number, project_id: number) {
+    return this.doDelete(`/audit/attachment?id=${id}&project_id=${project_id}`).
+      map(res => this.handleSuccess(`Audit attachment was deleted.`));
   }
 
   downloadAuditAttachment(id: number, project_id: number): Observable<Blob> {
diff --git a/src/app/services/import.service.ts b/src/app/services/import.service.ts
@@ -12,7 +12,7 @@ export class ImportService extends SimpleRequester {
   }
 
   importResults(projectId: number) {
-    return this.doGet(`/import/results?projectId=${projectId}`)
+    return this.doGet(`/import/results?project_id=${projectId}`)
       .map(res => res.json());
   }
 }
diff --git a/src/app/services/milestones.service.ts b/src/app/services/milestones.service.ts
@@ -17,11 +17,12 @@ export class MilestoneService extends SimpleRequester {
   }
 
   removeMilestone(milestone: Milestone) {
-    return this.doDelete(`/milestone?id=${milestone.id}`, )
+    return this.doDelete(`/milestone?id=${milestone.id}&project_id=${milestone.project_id}`, )
       .map(() => this.handleSuccess(`Milestone '${milestone.name}' was deleted.`)).toPromise();
   }
 
   getMilestoneResults(milestone: Milestone): Promise<TestResult[]> {
-    return this.doGet(`/milestone/results`, { milestoneId : milestone.id}, true).map(res => res.json()).toPromise();
+    return this.doGet(`/milestone/results`,
+     { milestoneId : milestone.id, project_id: milestone.project_id}, true).map(res => res.json()).toPromise();
   }
 }
diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts
@@ -31,15 +31,15 @@ export class ProjectService extends SimpleRequester {
   }
 
   getImportBodyPatterns(bodyPattern: ImportBodyPattern) {
-    return this.doGet(`/body_pattern?projectId=${bodyPattern.project_id}`).map(res => res.json());
+    return this.doGet(`/body_pattern?project_id=${bodyPattern.project_id}`).map(res => res.json());
   }
 
   createImportBodyPattern(bodyPattern: ImportBodyPattern) {
     return this.doPost('/body_pattern', bodyPattern).map(() => { });
   }
 
   removeImportBodyPattern(bodyPattern: ImportBodyPattern) {
-    return this.doDelete(`/body_pattern?id=${bodyPattern.id}&projectId=${bodyPattern.project_id}`)
+    return this.doDelete(`/body_pattern?id=${bodyPattern.id}&project_id=${bodyPattern.project_id}`)
       .map(() => this.handleSuccess(`Unique Body Pattern '${bodyPattern.name}' successfully removed.`));
   }
 
diff --git a/src/app/services/result-resolution.service.ts b/src/app/services/result-resolution.service.ts
@@ -13,9 +13,9 @@ export class ResultResolutionService extends SimpleRequester {
   getResolution(projectId?: number) {
     let pr = '';
     if (projectId) {
-      pr = `projectId=${projectId}`;
+      pr = `project_id=${projectId}`;
     } else if (this.route.snapshot.params['projectId']) {
-      pr = `projectId=${this.route.snapshot.params['projectId']}`;
+      pr = `project_id=${this.route.snapshot.params['projectId']}`;
     }
     return this.doGet(`/result_resolution?${pr}`).map(res => res.json());
   }
@@ -25,7 +25,7 @@ export class ResultResolutionService extends SimpleRequester {
   }
 
   removeResolution(resolution: ResultResolution) {
-    return this.doDelete(`/result_resolution?id=${resolution.id}&projectId=${resolution.project_id}`).map(res => {
+    return this.doDelete(`/result_resolution?id=${resolution.id}&project_id=${resolution.project_id}`).map(res => {
       this.handleSuccess(`Resolution '${resolution.name}' was deleted.`);
       return res;
     });
diff --git a/src/app/services/test-result.service.ts b/src/app/services/test-result.service.ts
@@ -31,7 +31,7 @@ export class TestResultService extends SimpleRequester {
   }
 
   removeTestResult(testresult: TestResult): Promise<void> {
-    return this.doDelete(`/testrun?id=${testresult.id}&projectId=${testresult.project_id}`)
+    return this.doDelete(`/testrun?id=${testresult.id}&project_id=${testresult.project_id}`)
       .map(() => this.handleSuccess(`Test result '${testresult.id}' was deleted.`)).toPromise();
   }
 
diff --git a/src/app/services/test.service.ts b/src/app/services/test.service.ts
@@ -35,23 +35,23 @@ export class TestService extends SimpleRequester {
   }
 
   addTestToTestSuite(test: Test, suite: TestSuite) {
-    return this.doPost(`/testToSuite?testId=${test.id}&suiteId=${suite.id}&projectId=${suite.project_id}`).map(() => {
+    return this.doPost(`/testToSuite?testId=${test.id}&suiteId=${suite.id}&project_id=${suite.project_id}`).map(() => {
       this.handleSuccess(`Test '${test.name}' was added to '${suite.name}' suite.`);
     });
   }
 
   removeTestFromTestSuite(test: Test, suite: TestSuite) {
-    return this.doDelete(`/testToSuite?testId=${test.id}&suiteId=${suite.id}&projectId=${suite.project_id}`).map(() => {
+    return this.doDelete(`/testToSuite?testId=${test.id}&suiteId=${suite.id}&project_id=${suite.project_id}`).map(() => {
       this.handleSuccess(`Test '${test.name}' was removed from '${suite.name}' suite.`);
     });
   }
 
   moveTest(from: Test, to: Test, remove: boolean, project_id: number) {
-    return this.doGet(`/test/move?from=${from.id}&to=${to.id}&remove=${remove}&projectId=${project_id}`).map(() => { });
+    return this.doGet(`/test/move?from=${from.id}&to=${to.id}&remove=${remove}&project_id=${project_id}`).map(() => { });
   }
 
   removeTest(test: Test) {
-    return this.doDelete(`/test?id=${test.id}&projectId=${test.project_id}`)
+    return this.doDelete(`/test?id=${test.id}&project_id=${test.project_id}`)
       .map(() => this.handleSuccess(`Test '${test.name}' was deleted.`));
   }
 }
diff --git a/src/app/services/testRun.service.ts b/src/app/services/testRun.service.ts
@@ -32,7 +32,7 @@ export class TestRunService extends SimpleRequester {
   }
 
   removeTestRun(testRun: TestRun): Promise<void> {
-    return this.doDelete(`/testrun`, { id: testRun.id, projectId: testRun.project_id })
+    return this.doDelete(`/testrun`, { id: testRun.id, project_id: testRun.project_id })
       .map(() => this.handleSuccess(`Test run '${testRun.build_name}/${testRun.start_time}' was deleted.`)).toPromise();
   }
 
diff --git a/src/app/services/testSuite.service.ts b/src/app/services/testSuite.service.ts
@@ -35,7 +35,7 @@ export class TestSuiteService extends SimpleRequester {
   }
 
   removeTestSuite(testSuite: TestSuite): Promise<void> {
-    return this.doDelete(`/suite?id=${testSuite.id}&projectId=${testSuite.project_id}`)
+    return this.doDelete(`/suite?id=${testSuite.id}&project_id=${testSuite.project_id}`)
       .map(() => this.handleSuccess(`Test Suite '${testSuite.name}' was deleted.`)).toPromise();
   }
 
@@ -55,10 +55,12 @@ export class TestSuiteService extends SimpleRequester {
   }
 
   syncSuite(tests: Test[], suiteId: number, removeNotExecutedResults: boolean) {
-    return this.doPost(`/suite/sync`, tests, { suiteId, removeNotExecutedResults }, true).map(res => res).toPromise();
+    const project_id = this.route.snapshot.params['projectId'];
+    return this.doPost(`/suite/sync`, tests, { project_id, suiteId, removeNotExecutedResults }, true).map(res => res).toPromise();
   }
 
   findTestToSync(notExecutedFor: number, suiteId: number): Promise<Test[]> {
-    return this.doGet('/suite/sync', { notExecutedFor, suiteId }, true).map(res => res.json()).toPromise();
+    const project_id = this.route.snapshot.params['projectId'];
+    return this.doGet('/suite/sync', { project_id, notExecutedFor, suiteId }, true).map(res => res.json()).toPromise();
   }
 }
diff --git a/src/app/services/user.services.ts b/src/app/services/user.services.ts
@@ -27,11 +27,11 @@ export class UserService extends SimpleRequester {
   }
 
   getPermissionsForProject(projectId: number) {
-    return this.doGet('/users/permissions?projectId=' + projectId).map(res => res.json());
+    return this.doGet('/users/permissions?project_id=' + projectId).map(res => res.json());
   }
 
   getProjectUsers(projectId: number) {
-    return this.doGet('/project/users?projectId=' + projectId).map(res => res.json());
+    return this.doGet('/project/users?project_id=' + projectId).map(res => res.json());
   }
 
   getUserProjects(userId: number): Promise<LocalPermissions[]> {
@@ -47,7 +47,7 @@ export class UserService extends SimpleRequester {
   }
 
   removeProjectUser(user: LocalPermissions) {
-    return this.doDelete(`/users/permissions?projectId=${user.project_id}&userId=${user.user.id}`).map(res => {
+    return this.doDelete(`/users/permissions?project_id=${user.project_id}&userId=${user.user.id}`).map(res => {
       this.handleSuccess(`Permissions for '${user.user.first_name} ${user.user.second_name}' were deleted.`);
       return res;
     });

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export class EditorAPI {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public async addTestToSuite(testId: number, suiteId: number) {`
`65`		`- return sendPost(Endpoints.testToSuite, { testId, suiteId, projectId: this.project.id }, {}, this.token, this.project.id);`
	`65`	`+ return sendPost(Endpoints.testToSuite, { testId, suiteId, project_id: this.project.id }, {}, this.token, this.project.id);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public async getSuites(testSuite: TestSuite): Promise<TestSuite[]> {`
`@@ -82,6 +82,6 @@ export class EditorAPI {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public async removeTestRun(testRunId: number) {`
`85`		`- return sendDelete(Endpoints.testrun, { id: testRunId, projectId: this.project.id}, null, this.token, this.project.id);`
	`85`	`+ return sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id}, null, this.token, this.project.id);`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ export class ListMilestoneComponent implements OnInit {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`async updateMilestone(milestone: Milestone) {`
	`69`	`+ milestone.project_id = this.projectId;`
`69`	`70`	`await this.milestoneService.createMilestone(milestone);`
`70`	`71`	return this.milestoneService.handleSuccess(`The milestone '${milestone.name}' was updated.`);
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ export class AuditService extends SimpleRequester {`
`59`	`59`	return this.doGet(`/audit/attachment?audit_id=${audit_id}&project_id=${project_id}`).map(res => res.json());
`60`	`60`	`}`
`61`	`61`
`62`		`- removeAuditAttachment(id: number) {`
`63`		- return this.doDelete(`/audit/attachment?id=${id}`).map(res => this.handleSuccess(`Audit attachment was deleted.`));
	`62`	`+ removeAuditAttachment(id: number, project_id: number) {`
	`63`	+ return this.doDelete(`/audit/attachment?id=${id}&project_id=${project_id}`).
	`64`	+ map(res => this.handleSuccess(`Audit attachment was deleted.`));
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`downloadAuditAttachment(id: number, project_id: number): Observable<Blob> {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export class ImportService extends SimpleRequester {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`importResults(projectId: number) {`
`15`		- return this.doGet(`/import/results?projectId=${projectId}`)
	`15`	+ return this.doGet(`/import/results?project_id=${projectId}`)
`16`	`16`	`.map(res => res.json());`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,12 @@ export class MilestoneService extends SimpleRequester {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`removeMilestone(milestone: Milestone) {`
`20`		- return this.doDelete(`/milestone?id=${milestone.id}`, )
	`20`	+ return this.doDelete(`/milestone?id=${milestone.id}&project_id=${milestone.project_id}`, )
`21`	`21`	.map(() => this.handleSuccess(`Milestone '${milestone.name}' was deleted.`)).toPromise();
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`getMilestoneResults(milestone: Milestone): Promise<TestResult[]> {`
`25`		- return this.doGet(`/milestone/results`, { milestoneId : milestone.id}, true).map(res => res.json()).toPromise();
	`25`	+ return this.doGet(`/milestone/results`,
	`26`	`+ { milestoneId : milestone.id, project_id: milestone.project_id}, true).map(res => res.json()).toPromise();`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ export class ProjectService extends SimpleRequester {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`getImportBodyPatterns(bodyPattern: ImportBodyPattern) {`
`34`		- return this.doGet(`/body_pattern?projectId=${bodyPattern.project_id}`).map(res => res.json());
	`34`	+ return this.doGet(`/body_pattern?project_id=${bodyPattern.project_id}`).map(res => res.json());
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`createImportBodyPattern(bodyPattern: ImportBodyPattern) {`
`38`	`38`	`return this.doPost('/body_pattern', bodyPattern).map(() => { });`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`removeImportBodyPattern(bodyPattern: ImportBodyPattern) {`
`42`		- return this.doDelete(`/body_pattern?id=${bodyPattern.id}&projectId=${bodyPattern.project_id}`)
	`42`	+ return this.doDelete(`/body_pattern?id=${bodyPattern.id}&project_id=${bodyPattern.project_id}`)
`43`	`43`	.map(() => this.handleSuccess(`Unique Body Pattern '${bodyPattern.name}' successfully removed.`));
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ export class ResultResolutionService extends SimpleRequester {`
`13`	`13`	`getResolution(projectId?: number) {`
`14`	`14`	`let pr = '';`
`15`	`15`	`if (projectId) {`
`16`		- pr = `projectId=${projectId}`;
	`16`	+ pr = `project_id=${projectId}`;
`17`	`17`	`} else if (this.route.snapshot.params['projectId']) {`
`18`		- pr = `projectId=${this.route.snapshot.params['projectId']}`;
	`18`	+ pr = `project_id=${this.route.snapshot.params['projectId']}`;
`19`	`19`	`}`
`20`	`20`	return this.doGet(`/result_resolution?${pr}`).map(res => res.json());
`21`	`21`	`}`
`@@ -25,7 +25,7 @@ export class ResultResolutionService extends SimpleRequester {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`removeResolution(resolution: ResultResolution) {`
`28`		- return this.doDelete(`/result_resolution?id=${resolution.id}&projectId=${resolution.project_id}`).map(res => {
	`28`	+ return this.doDelete(`/result_resolution?id=${resolution.id}&project_id=${resolution.project_id}`).map(res => {
`29`	`29`	this.handleSuccess(`Resolution '${resolution.name}' was deleted.`);
`30`	`30`	`return res;`
`31`	`31`	`});`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export class TestResultService extends SimpleRequester {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`removeTestResult(testresult: TestResult): Promise<void> {`
`34`		- return this.doDelete(`/testrun?id=${testresult.id}&projectId=${testresult.project_id}`)
	`34`	+ return this.doDelete(`/testrun?id=${testresult.id}&project_id=${testresult.project_id}`)
`35`	`35`	.map(() => this.handleSuccess(`Test result '${testresult.id}' was deleted.`)).toPromise();
`36`	`36`	`}`
`37`	`37`