v1.3.0 Release

v1.3.0 Release

Author: vikram-chaitanya

agent/pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.testsigma</groupId>
   <artifactId>testsigma-agent</artifactId>
-  <version>1.1.0</version>
+  <version>1.3.0</version>
   <packaging>jar</packaging>
   <name>Testsigma Agent</name>
   <parent>

agent/src/main/java/com/testsigma/agent/request/MobileInspectionRequest.java

@@ -16,7 +16,7 @@ public class MobileInspectionRequest {
   private ExecutionLabType executionLabType;
   private Long platformDeviceId;
   private String appActivity;
-  private Long appUploadId;
+  private Long uploadVersionId;
   private String sessionId;
   private Timestamp startedAt;
   private Timestamp finishedAt;

agent/src/main/resources/agent.properties

@@ -9,4 +9,4 @@
 cloud.url=${CLOUD_URL:https://local.testsigmaos.com}
 local.server.url=${LOCAL_SERVER_URL:http://localhost:9090}
 local.agent.register=${LOCAL_AGENT_REGISTER:true}
-agent.version=1.1.0
+agent.version=1.3.0

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

@@ -122,6 +122,7 @@ public ResponseEntity<String> markAsDelete(@PathVariable("id") Long id) throws R
     if(testCaseCountByPreRequisite==0){
       TestCase testCase = testCaseService.find(id);
       testCase.setDeleted(true);
+      testCase.setIsActive(null);
       testCaseService.update(testCase);
       return new ResponseEntity<>("", HttpStatus.OK);
     }

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

@@ -70,9 +70,13 @@ public TestSuiteDTO create(@RequestBody TestSuiteRequest request) throws Testsig
   @ResponseStatus(HttpStatus.ACCEPTED)
   public TestSuiteDTO update(@PathVariable(value = "id") Long id, @RequestBody TestSuiteRequest request) throws TestsigmaException {
     TestSuite testSuite = this.testSuiteService.find(id);
+    Long preRequisiteId = testSuite.getPreRequisite();
     testSuiteMapper.merge(request, testSuite);
     testSuite.setUpdatedDate(new Timestamp(Calendar.getInstance().getTimeInMillis()));
     testSuite = this.testSuiteService.update(testSuite);
+    if(testSuite.getPreRequisite()!=null && !testSuite.getPreRequisite().equals(preRequisiteId)) {
+      testSuiteService.handlePrequisiteChange(testSuite);
+    }
     return testSuiteMapper.mapToDTO(testSuite);
   }
 

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

@@ -0,0 +1,75 @@
+/*
+ *
+ * ****************************************************************************
+ *  * Copyright (C) 2019 Testsigma Inc.
+ *  * All rights reserved.
+ *  ****************************************************************************
+ *
+ */
+
+package com.testsigma.controller;
+
+
+import com.testsigma.dto.UploadVersionDTO;
+import com.testsigma.exception.ResourceNotFoundException;
+import com.testsigma.mapper.UploadMapper;
+import com.testsigma.model.UploadVersion;
+import com.testsigma.service.UploadVersionService;
+import com.testsigma.specification.SearchCriteria;
+import com.testsigma.specification.UploadVersionSpecificationsBuilder;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/upload_versions")
+@Log4j2
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+public class UploadVersionsController {
+
+  private final UploadMapper uploadMapper;
+  private final UploadVersionService uploadVersionService;
+
+  @GetMapping
+  public Page<UploadVersionDTO> index(UploadVersionSpecificationsBuilder builder, Pageable pageable) {
+    Specification<UploadVersion> spec = builder.build();
+    Page<UploadVersion> versions = uploadVersionService.findAll(spec, pageable);
+    Long deviceId = null;
+    for (SearchCriteria searchCriteria : builder.params)
+      if (searchCriteria.getKey().equals("deviceId"))
+        deviceId = Long.parseLong(searchCriteria.getValue().toString());
+    List<UploadVersion> uploadList = uploadVersionService.setSignedFlag(versions.getContent(), deviceId);
+    List<UploadVersionDTO> uploadDTOS = uploadMapper.mapVersions(uploadList);
+    return new PageImpl<>(uploadDTOS, pageable, versions.getTotalElements());
+  }
+
+  @RequestMapping(path = "/{id}", method = RequestMethod.GET)
+  public UploadVersionDTO show(@PathVariable("id") Long id) throws ResourceNotFoundException {
+    return uploadMapper.mapVersion(uploadVersionService.find(id));
+  }
+
+  @DeleteMapping(path = "/{id}")
+  @ResponseStatus(HttpStatus.OK)
+  public void delete(@PathVariable("id") Long id) throws ResourceNotFoundException {
+    uploadVersionService.delete(uploadVersionService.find(id));
+  }
+
+
+  @GetMapping(value = "/{id}/download")
+  public void download(@PathVariable("id") Long id, HttpServletResponse response) throws ResourceNotFoundException, IOException {
+    UploadVersion version = this.uploadVersionService.find(id);
+    String preSignedURL = this.uploadVersionService.getPreSignedURL(version);
+    response.sendRedirect(preSignedURL);
+  }
+
+}

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

@@ -49,7 +49,6 @@ public Page<UploadDTO> index(UploadSpecificationsBuilder builder, Pageable pagea
     Specification<Upload> spec = builder.build();
     Page<Upload> uploads = uploadService.findAll(spec, pageable);
     List<UploadDTO> uploadDTOS = uploadMapper.map(uploads.getContent());
-    uploadDTOS = uploadService.setSignedFlag(uploadDTOS, builder);
     return new PageImpl<>(uploadDTOS, pageable, uploads.getTotalElements());
   }
 
@@ -87,12 +86,4 @@ public void bulkDelete(@RequestParam(value = "ids[]") Long[] ids) throws Resourc
       uploadService.delete(uploadService.find(id));
     }
   }
-
-  @GetMapping(value = "/{id}/download")
-  public void download(@PathVariable("id") Long id, HttpServletResponse response) throws ResourceNotFoundException, IOException {
-    Upload upload = this.uploadService.find(id);
-    String preSignedURL = this.uploadService.getPreSignedURL(upload);
-    response.sendRedirect(preSignedURL);
-  }
-
 }

server/src/main/java/com/testsigma/controller/api/v1/TestPlanResultsController.java

@@ -57,6 +57,9 @@ public APITestPlanResultDTO create(@RequestBody TestPlanResultRequest testPlanRe
       JSONObject runtimeDataObject = new JSONObject(testPlanResultRequest.getRuntimeData());
       runTimeData.put("runtime_data", runtimeDataObject);
     }
+    if(testPlanResultRequest.getUploadVersions() != null){
+      runTimeData.put("uploadVersions", testPlanResultRequest.getUploadVersions());
+    }
     agentExecutionService.setRunTimeData(runTimeData);
     agentExecutionService.setTriggeredType(ExecutionTriggeredType.API);
     agentExecutionService.start();

server/src/main/java/com/testsigma/controller/api/v1/UploadVersionsController.java

@@ -0,0 +1,53 @@
+/*
+ *
+ * ****************************************************************************
+ *  * Copyright (C) 2019 Testsigma Inc.
+ *  * All rights reserved.
+ *  ****************************************************************************
+ *
+ */
+
+package com.testsigma.controller.api.v1;
+
+
+import com.testsigma.dto.UploadVersionDTO;
+import com.testsigma.mapper.UploadMapper;
+import com.testsigma.model.UploadVersion;
+import com.testsigma.service.UploadVersionService;
+import com.testsigma.specification.SearchCriteria;
+import com.testsigma.specification.UploadVersionSpecificationsBuilder;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController(value = "apiUploadVersionsController")
+@RequestMapping(path = "/api/v1/upload_versions")
+@Log4j2
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+public class UploadVersionsController {
+
+  private final UploadMapper uploadMapper;
+  private final UploadVersionService uploadVersionService;
+
+  @GetMapping
+  public Page<UploadVersionDTO> index(UploadVersionSpecificationsBuilder builder, Pageable pageable) {
+    Specification<UploadVersion> spec = builder.build();
+    Page<UploadVersion> versions = uploadVersionService.findAll(spec, pageable);
+    Long deviceId = null;
+    for (SearchCriteria searchCriteria : builder.params)
+      if (searchCriteria.getKey().equals("deviceId"))
+        deviceId = Long.parseLong(searchCriteria.getValue().toString());
+    List<UploadVersion> uploadList = uploadVersionService.setSignedFlag(versions.getContent(), deviceId);
+    List<UploadVersionDTO> uploadDTOS = uploadMapper.mapVersions(uploadList);
+    return new PageImpl<>(uploadDTOS, pageable, versions.getTotalElements());
+  }
+}

server/src/main/java/com/testsigma/controller/api/v1/UploadsController.java

@@ -41,6 +41,8 @@ public class UploadsController {
   @RequestMapping(method = RequestMethod.POST)
   public APIUploadDTO create(@ModelAttribute @Valid UploadRequest uploadRequest)
     throws TestsigmaException {
+    if(uploadRequest.getVersion() == null)
+      uploadRequest.setVersion(uploadRequest.getName());
     Upload upload = uploadService.create(uploadRequest);
     return uploadMapper.mapApi(upload);
   }
@@ -62,6 +64,8 @@ public APIUploadDTO show(@PathVariable("id") Long id) throws ResourceNotFoundExc
   public APIUploadDTO update(@PathVariable("id") Long id, @ModelAttribute UploadRequest uploadRequest)
     throws TestsigmaException {
     Upload upload = uploadService.find(id);
+    if(uploadRequest.getVersion() == null)
+      uploadRequest.setVersion(upload.getLatestVersion().getName()+".1");
     upload = uploadService.update(upload, uploadRequest);
     return uploadMapper.mapApi(upload);
   }