TOS-507 Test steps are not getting imported appropriately in OS to OS imports

Author: siva-testsigma

server/src/main/java/com/testsigma/repository/UploadRepository.java

@@ -25,5 +25,5 @@ public interface UploadRepository extends BaseRepository<Upload, Long> {
 
     List<Upload> findAllByWorkspaceId(Long applicationVersionId);
 
-    Upload findByImportedIdAndWorkspaceId(Long importedId, Long applicationId);
+    Optional<Upload> findByImportedIdAndWorkspaceId(Long importedId, Long applicationId);
 }

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

@@ -56,8 +56,13 @@ public Upload find(Long id) throws ResourceNotFoundException {
     Upload upload = this.uploadRepository.findById(id)
       .orElseThrow(() -> new ResourceNotFoundException("Couldn't find upload version with " +
         "id: " + id));
+    try{
     upload.getLatestVersion().setPreSignedURL(uploadVersionService.getPreSignedURL(upload.getLatestVersion()));
-    return upload;
+    }
+    catch (Exception e){
+      log.error(e.getMessage());
+    }
+  return upload;
   }
 
   public Page<Upload> findAll(Specification<Upload> specification, Pageable pageable) {
@@ -236,8 +241,8 @@ public boolean isEntityAlreadyImported(Optional<Upload> previous, Upload current
     return previous.isPresent() && previous.get().getImportedId() != null && previous.get().getImportedId().equals(current.getId());
   }
 
-  public Upload findByImportedIdAndWorkspaceId(Long importedId,
-                                                 Long applicationId) {
+  public Optional<Upload> findByImportedIdAndWorkspaceId(Long importedId,
+                                                         Long applicationId) {
     return uploadRepository.findByImportedIdAndWorkspaceId(importedId,applicationId);
   }
 

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

@@ -311,9 +311,9 @@ public UploadVersion processBeforeSave(Optional<UploadVersion> previous, UploadV
     } else {
       present.setId(null);
     }
-    Upload importedUpload = uploadService.findByImportedIdAndWorkspaceId(present.getUploadId(),importDTO.getWorkspaceId());
-    present.setUploadId(importedUpload.getId());
-    present.setUpload(importedUpload);
+    Optional<Upload> importedUpload = uploadService.findByImportedIdAndWorkspaceId(present.getUploadId(),importDTO.getWorkspaceId());
+    present.setUploadId(importedUpload.get().getId());
+    present.setUpload(importedUpload.get());
     return present;
   }
 
@@ -339,7 +339,10 @@ public Optional<UploadVersion> getRecentImportedEntity(BackupDTO importDTO, Long
 
   @Override
   public Optional<UploadVersion> findImportedEntityHavingSameName(Optional<UploadVersion> previous, UploadVersion current, BackupDTO importDTO) throws ResourceNotFoundException {
-    return uploadVersionRepository.findByNameAndUploadId(current.getName(), current.getUploadId());
+   Optional<Upload> upload= uploadService.findByImportedIdAndWorkspaceId(current.getUploadId(), importDTO.getWorkspaceId());
+   if (upload.isPresent())
+    return uploadVersionRepository.findByNameAndUploadId(current.getName(), upload.get().getId());
+   else return Optional.empty();
   }
 
   @Override

server/src/main/resources/db/bootstrap/V24__test_devices.sql

@@ -31,10 +31,8 @@ CREATE TABLE `test_devices`
   `updated_date`                  DATETIME              DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `index_test_devices_on_test_plan_id` (`test_plan_id`),
-  KEY `index_test_devices_on_app_upload_id` (`app_upload_id`),
   KEY `index_test_devices_on_agent_id` (`agent_id`),
   CONSTRAINT `fk_test_plan_id_in_test_devices_to_test_plans` FOREIGN KEY (`test_plan_id`) REFERENCES `test_plans` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `fk_app_upload_id_in_test_devices_to_uploads` FOREIGN KEY (`app_upload_id`) REFERENCES `uploads` (`id`) ON DELETE RESTRICT ON UPDATE NO ACTION,
   CONSTRAINT `fk_agent_id_in_test_devices_to_uploads` FOREIGN KEY (`agent_id`) REFERENCES `agents` (`id`) ON DELETE RESTRICT ON UPDATE NO ACTION
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 59

server/src/main/resources/db/migration/V35__drop_uploads_related_constraints.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `test_devices` DROP FOREIGN KEY `fk_app_upload_id_in_test_devices_to_uploads`;
+ALTER TABLE `test_devices` DROP INDEX `index_test_devices_on_app_upload_id`;