Merge branch 'reports' of https://github.com/testsigmahq/testsigma into reports

Author: gayathri-testsigma

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

@@ -23,6 +23,7 @@
 import com.testsigma.specification.SearchOperation;
 import com.testsigma.web.request.ElementRequest;
 import com.testsigma.web.request.ElementScreenNameRequest;
+import com.testsigma.web.request.TestCaseRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.json.JSONArray;
@@ -89,4 +90,11 @@ public List<FailuresByCategoryDTO> getFailuresByCategory(@RequestParam("versionI
         return this.reportsService.getFailuresByCategory(versionId);
     }
 
+    @RequestMapping(value = "/generate_query_report", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseEntity<Object> update(@RequestBody String query) throws TestsigmaException, SQLException, CloneNotSupportedException {
+        List<Map<String,Object>> entities = this.reportsService.getQueryReport(query);
+        return new ResponseEntity<>(entities, HttpStatus.OK);
+    }
+
 }

server/src/main/java/com/testsigma/service/ReportsService.java

@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.testsigma.dto.*;
 import com.testsigma.dto.export.TestCaseCloudXMLDTO;
@@ -33,6 +34,8 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
@@ -49,6 +52,8 @@ public class ReportsService {
     private final TestCaseService testCaseService;
 
     private final TestCaseRepository testCaseRepository;
+
+    private final EntityManager entityManager;
     public JSONArray getReport(Long reportId){
         JSONArray reportObject = new JSONArray();
         Optional<Report> report = reportsRepository.findById(reportId);
@@ -117,4 +122,28 @@ public List<LingeredTestsDTO> getLingeredTests(Long versionId){
     public List<FailuresByCategoryDTO> getFailuresByCategory(Long versionId){
         return testCaseRepository.getFailuresByCategory(versionId);
     }
+
+    public List<Map<String,Object>> getQueryReport(String query){
+        try{
+        Query nativeQuery = entityManager.createNativeQuery(query);
+        List<Object> resultObject = nativeQuery.getResultList();
+        ObjectMapper objectMapper = new ObjectMapper();
+        List<Map<String,Object>> toBeReturned = new ArrayList<Map<String,Object>>();
+        Integer i = 0;
+        for(Object result:resultObject){
+            String queryResult = objectMapper.writeValueAsString(result);
+            queryResult = queryResult.substring(1); // index starts at zero
+            queryResult = queryResult.substring(0, queryResult.length() - 1);
+            List<Object> resultList = new ArrayList<Object>(Arrays.asList(queryResult.split(",")));
+            Map<String, Object> resultIndex = new HashMap<>();
+            resultIndex.put(i.toString(),resultList);
+            toBeReturned.add(resultIndex);
+            i++;
+        }
+        return toBeReturned;
+        } catch(Exception e){
+            log.error("This shouldnt come.....");
+            return new ArrayList<Map<String,Object>>();
+        }
+    }
 }

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

@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import {ActivatedRoute} from "@angular/router";
+import {ActivatedRoute, Router} from "@angular/router";
 import * as Highcharts from 'highcharts';
 import {ReportsService} from "../services/reports.service";
 import {AuthenticationGuard} from "../shared/guards/authentication.guard";
 import jspdf from 'jspdf';
 import html2canvas from 'html2canvas';
 import {TestDeviceResult} from "../models/test-device-result.model";
 import {TestSuiteResult} from "../models/test-suite-result.model";
+import {FormControl, FormGroup, Validators} from "@angular/forms";
 
 @Component({
   selector: 'app-reports',
@@ -18,6 +19,7 @@ import {TestSuiteResult} from "../models/test-suite-result.model";
 export class ReportsComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
+    public router: Router,
     public authGuard: AuthenticationGuard,
     public reportsService: ReportsService
   ) {
@@ -28,6 +30,36 @@ export class ReportsComponent implements OnInit {
   public topFailuresChartOptions : Highcharts.Options;
   public lingeredTestsChartOptions : Highcharts.Options;
   public failuresByCategoryChartOptions : Highcharts.Options;
+  public queryReportsForm: FormGroup;
+  public modules: any[] = [
+    {name:"TestCases"},
+    {name:"TestSuites"},
+    {name:"TestPlans"},
+  ];
+  public dataSource: any[];
+  public showTable = false;
+  public columns = [
+    {
+      columnDef: 'position',
+      header: 'No.',
+      cell: (element: any) => `${element}`,
+    },
+    {
+      columnDef: 'name',
+      header: 'Name',
+      cell: (element: any) => `${element}`,
+    },
+    {
+      columnDef: 'weight',
+      header: 'Weight',
+      cell: (element: any) => `${element}`,
+    },
+    {
+      columnDef: 'symbol',
+      header: 'Symbol',
+      cell: (element: any) => `${element}`,
+    },
+  ];
 
 
   ngOnInit(): void {
@@ -36,6 +68,13 @@ export class ReportsComponent implements OnInit {
     this.populateTopFailuresChartOptions();
     this.populateLingeredTestsChartOptions();
     this.populateFailuresByCategoryChartOptions();
+    this.isDashboard();
+    this.router.onSameUrlNavigation = 'reload';
+    this.queryReportsForm = new FormGroup({
+      name: new FormControl("", [Validators.required, Validators.minLength(4), Validators.maxLength(250)]),
+      description: new FormControl(""),
+      module: new FormControl("")
+    })
   }
 
   populateFlakyTestsChartOptions() {
@@ -396,4 +435,25 @@ export class ReportsComponent implements OnInit {
     obj.categories = categories;
     return obj;
   }
+
+  isDashboard(){
+    return this.router.url.indexOf("analytics")!=-1;
+  }
+
+  goToPage(url){
+    this.router.routeReuseStrategy.shouldReuseRoute = function () {
+      return false;
+    }
+    this.router.onSameUrlNavigation = 'reload';
+    this.router.navigate(['/reports', url]);
+  }
+
+  getQueryReport(){
+    let query = this.queryReportsForm.controls["description"].value;
+    this.reportsService.runQueryReport(query).subscribe((res)=>{
+      console.log(res);
+      this.dataSource = res;
+      this.showTable = true;
+    });
+  }
 }

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

@@ -93,4 +93,13 @@ export class ReportsService{
     );
   }
 
+  public runQueryReport(any: any): Observable<any> {
+    return this.http.post<any>(this.URLConstants.reportsURL+"/generate_query_report", any, {
+      headers: this.httpHeaders.contentTypeApplication
+    }).pipe(
+      map(data => data),
+      catchError((error) => throwError(error))
+    );
+  }
+
 }