Hackathon commit

Author: sugant-testsigma

server/src/main/java/com/testsigma/controller/ReportsController.java

@@ -18,6 +18,7 @@
 import com.testsigma.mapper.ElementMapper;
 import com.testsigma.mapper.ReportsMapper;
 import com.testsigma.model.*;
+import com.testsigma.repository.ReportsRepository;
 import com.testsigma.service.*;
 import com.testsigma.specification.ElementSpecificationsBuilder;
 import com.testsigma.specification.ReportsSpecificationBuilder;
@@ -57,8 +58,17 @@ public class ReportsController {
 
     private final ReportsMapper reportsMapper;
 
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Object> show(@PathVariable("id") Long id) throws TestsigmaException,Exception {
+    private final ReportsRepository reportsRepository;
+
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public ReportsDTO show(@PathVariable("id") Long id) throws TestsigmaException,Exception {
+        Optional<Report> report = reportsRepository.findById(id);
+        return reportsMapper.map(report.get());
+    }
+
+    @RequestMapping(value = "/generate_report/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Object> generateReport(@PathVariable("id") Long id) throws TestsigmaException,Exception {
         JSONArray responseObject = reportsService.getReport(id);
         List<Map<String,Object>> entities = new ArrayList<Map<String,Object>>();
         for (int i=0;i<responseObject.length();i++) {

server/src/main/java/com/testsigma/dto/ReportsDTO.java

@@ -1,6 +1,7 @@
 package com.testsigma.dto;
 
 
+import com.testsigma.model.ReportConfiguration;
 import com.testsigma.model.ReportModule;
 import com.testsigma.model.ReportType;
 import com.testsigma.model.WorkspaceVersion;
@@ -14,5 +15,6 @@ public class ReportsDTO {
     private ReportType reportType;
     private ReportModule reportModule;
     private WorkspaceVersion workspaceVersion;
+    private ReportConfiguration reportConfiguration;
 }
 

server/src/main/java/com/testsigma/mapper/ReportsMapper.java

@@ -29,7 +29,9 @@
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface ReportsMapper {
+    @Mapping(target = "reportConfiguration.reportCriteriaMappings", ignore = true)
     ReportsDTO map(Report report);
 
+    @Mapping(target = "reportConfiguration.reportCriteriaMappings", ignore = true)
     List<ReportsDTO> mapDTOs(List<Report> reports);
 }

ui/src/app/app.module.ts

@@ -210,6 +210,7 @@ import {LoginFormComponent} from './components/login-form.component';
 import {RecaptchaModule} from 'ng-recaptcha';
 import {CommonModule} from "@angular/common";
 import {ElementMetadataComponent} from "./components/webcomponents/element-metadata.component";
+import {ReportConfiguration} from "./models/report-configuration.model";
 import {MantisIssueFormComponent} from './components/webcomponents/mantis-issue-form.component';
 import {MantisIssueDetailsComponent} from './components/webcomponents/mantis-issue-details.component';
 import {BackLogIssueFormComponent} from './components/webcomponents/backlog-issue-form.component';

ui/src/app/components/reports.component.ts

@@ -504,8 +504,10 @@ export class ReportsComponent implements OnInit {
   }
 
   openReport(id){
-    this.reportsService.show(id).subscribe((res)=>{
+    this.reportsService.show(id).subscribe((report)=>{
+    this.reportsService.generateReport(id).subscribe((res)=>{
       console.log(res);
+      let seriesData = this.convertToSeriesForPie(res,report);
       let chartOptions = {
         chart: {
           backgroundColor: 'transparent',
@@ -540,18 +542,10 @@ export class ReportsComponent implements OnInit {
           }
         },
         series: [{
-          name: 'Brands',
+          name: report.reportConfiguration["chartGroupField"]?.fieldName,
           colorByPoint: true,
           type:'pie',
-          data: [{
-            name: 'Chrome',
-            y: 70,
-            color:'#1FB47E'
-          },{
-            name: 'Internet Explorer',
-            y: 30,
-            color:'#1FA87E'
-          }]
+          data: seriesData
         }]
       };
       const dialogRef = this.matModal.open<CustomReportsPopupComponent>(CustomReportsPopupComponent, {
@@ -564,5 +558,35 @@ export class ReportsComponent implements OnInit {
         this.router.navigate(['reports','custom_reports']);
       })
     });
+    });
+  }
+
+  convertToSeriesForPie(res,report){
+    let series = [];
+    let colorMap = {
+      "DRAFT":'red',
+      "READY":'green'
+  }
+  let seriesCount = {} as any;
+    let i=0;
+    res.forEach((data)=> {
+      let key = report.reportConfiguration["chartGroupField"]?.fieldName;
+      let obj = {} as any;
+      obj.name = key;
+      obj.color = colorMap[data[key]];
+      if(seriesCount[key])
+        seriesCount[key]++;
+      else
+        seriesCount[key] = 1;
+      let flag=0;
+      series.forEach((sData)=>{
+        if(sData.name == key)
+          flag = 1;
+      });
+      obj.y = seriesCount[key];
+      if(flag==0)
+        series.push(obj);
+    });
+    return series;
   }
 }

ui/src/app/models/report-configuration.model.ts

@@ -0,0 +1,17 @@
+import {Base} from "../shared/models/base.model";
+import {PageObject} from "../shared/models/page-object";
+import {alias, custom, deserialize, object, optional, serializable, SKIP} from "serializr";
+import {ReportModule} from "./report-module.model";
+
+
+export class ReportConfiguration extends Base{
+
+  @serializable
+  public id: number;
+  @serializable
+  public chartType: String;
+
+  deserialize(input: any): this {
+    return Object.assign(this, deserialize(ReportConfiguration, input));
+  }
+}

ui/src/app/models/report.model.ts

@@ -2,6 +2,7 @@ import {Base} from "../shared/models/base.model";
 import {PageObject} from "../shared/models/page-object";
 import {alias, custom, deserialize, object, optional, serializable, SKIP} from "serializr";
 import {ReportModule} from "./report-module.model";
+import {ReportConfiguration} from "./report-configuration.model";
 
 
 export class Report extends Base implements PageObject {
@@ -16,6 +17,8 @@ export class Report extends Base implements PageObject {
   public reportType: String;
   @serializable(optional(object(ReportModule)))
   public reportModule:ReportModule;
+  @serializable(optional(object(ReportConfiguration)))
+  public reportConfiguration:ReportConfiguration;
 
   deserialize(input: any): this {
     return Object.assign(this, deserialize(Report, input));

ui/src/app/services/reports.service.ts

@@ -37,6 +37,15 @@ export class ReportsService{
     );
   }
 
+
+
+  public generateReport(id: number): Observable<any> {
+    return this.http.get<any>(this.URLConstants.reportsURL + "/generate_report/" + id, {headers: this.httpHeaders.contentTypeApplication}).pipe(
+      map(data => data),
+      catchError(() => throwError('Problem while getting reports::' + id))
+    );
+  }
+
   public getFlakyTests(versionId: number): Observable<any[]> {
     return this.http.get<any[]>(this.URLConstants.reportsURL + "/flaky_tests?versionId=" + versionId, {headers: this.httpHeaders.contentTypeApplication}).pipe(
       map(data => data),