Skip to content

Commit 6a6a7d9

Browse files
Update UI for use new stat endpoint
1 parent 162662b commit 6a6a7d9

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

src/app/services/test-result.service.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { TestResult, TestResultStat } from '../shared/models/test-result';
88
export class TestResultService extends SimpleRequester {
99

1010
getTestResult(testresult: TestResult): Promise<TestResult[]> {
11-
testresult.project_id = this.route.snapshot.params['projectId'];
11+
testresult = this.setProjectId(testresult);
1212
return this.doGet('/testresult', testresult).map(res => res.json()).toPromise();
1313
}
1414

@@ -19,7 +19,7 @@ export class TestResultService extends SimpleRequester {
1919

2020
bulkUpdate(testresults: TestResult[]): Promise<void> {
2121
testresults.forEach(testresult => {
22-
testresult.project_id = this.route.snapshot.params['projectId'];
22+
testresult = this.setProjectId(testresult);
2323
if (testresult.test_resolution) {
2424
testresult.test_resolution_id = testresult.test_resolution.id;
2525
}
@@ -31,12 +31,21 @@ export class TestResultService extends SimpleRequester {
3131
}
3232

3333
removeTestResult(testresult: TestResult): Promise<void> {
34+
testresult = this.setProjectId(testresult);
3435
return this.doDelete(`/testrun?id=${testresult.id}&project_id=${testresult.project_id}`)
3536
.map(() => this.handleSuccess(`Test result '${testresult.id}' was deleted.`)).toPromise();
3637
}
3738

38-
getTestResultsStat(projectId, testRunStartedFrom, testRunStartedTo): Promise<TestResultStat[]> {
39-
const params = { projectId, testRunStartedFrom, testRunStartedTo };
39+
getTestResultsStat(project_id: number, testRunStartedFrom: string, testRunStartedTo: string): Promise<TestResultStat[]> {
40+
const params = { project_id, testRunStartedFrom, testRunStartedTo };
4041
return this.doGet(`/stats/testresult`, params).map(res => res.json()).toPromise();
4142
}
43+
44+
private setProjectId(testResult: TestResult): TestResult {
45+
if (!testResult.project_id) {
46+
testResult.project_id = this.route.snapshot.params.projectId;
47+
}
48+
49+
return testResult;
50+
}
4251
}

src/app/services/testSuite.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class TestSuiteService extends SimpleRequester {
2727
};
2828
if (testsuite.id) { params['suiteId'] = testsuite.id; }
2929

30-
return this.doGet(`/suite/stat`, params).map(res => res.json());
30+
return this.doGet(`/stats/suite`, params).map(res => res.json());
3131
}
3232

3333
createTestSuite(testsuite: TestSuite): Promise<TestSuite> {

0 commit comments

Comments
 (0)