diff --git a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/fms/ParalogyFmsDTOValidator.java b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/fms/ParalogyFmsDTOValidator.java index 6a6d611f2..68247c5d3 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/fms/ParalogyFmsDTOValidator.java +++ b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/fms/ParalogyFmsDTOValidator.java @@ -162,19 +162,13 @@ public GeneToGeneParalogy validateParalogyFmsDTO(ParalogyFmsDTO dto) throws Obje } paralogyData.setConfidence(confidence); - if (dto.getSimilarity() == null) { - paralogyResponse.addErrorMessage("Similarity", ValidationConstants.REQUIRED_MESSAGE); - } else { + if (dto.getSimilarity() != null) { paralogyData.setSimilarity(dto.getSimilarity()); } - if (dto.getIdentity() == null) { - paralogyResponse.addErrorMessage("Identity", ValidationConstants.REQUIRED_MESSAGE); - } else { + if (dto.getIdentity() != null) { paralogyData.setIdentity(dto.getIdentity()); } - if (dto.getLength() == null) { - paralogyResponse.addErrorMessage("Length", ValidationConstants.REQUIRED_MESSAGE); - } else { + if (dto.getLength() != null) { paralogyData.setLength(dto.getLength()); } if (dto.getRank() == null) { diff --git a/src/test/java/org/alliancegenome/curation_api/ParalogyBulkUploadFmsITCase.java b/src/test/java/org/alliancegenome/curation_api/ParalogyBulkUploadFmsITCase.java index e70784e4e..a295c0a59 100644 --- a/src/test/java/org/alliancegenome/curation_api/ParalogyBulkUploadFmsITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/ParalogyBulkUploadFmsITCase.java @@ -31,8 +31,8 @@ @QuarkusTestResource(TestContainerResource.Initializer.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) -@DisplayName("605 - Paralogy bulk upload - FMS") -@Order(605) +@DisplayName("607 - Paralogy bulk upload - FMS") +@Order(607) public class ParalogyBulkUploadFmsITCase extends BaseITCase { @BeforeEach @@ -89,10 +89,7 @@ public void paralogyBulkUploadMissingRequiredFields() throws Exception { checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_02_no_gene2.json"); checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_03_no_species.json"); checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_04_no_confidence.json"); - checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_05_no_identity.json"); - checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_06_no_length.json"); checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_07_no_rank.json"); - checkFailedBulkLoad(paralogyBulkPostEndpoint, paralogyTestFilePath + "MR_08_no_similarity.json"); } @Test