Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SCRUM 4283 - Removing similarity, length and identity from Paralogy required fields #1661

Merged
merged 5 commits into from
Sep 9, 2024
Merged

SCRUM 4283 - Removing similarity, length and identity from Paralogy required fields #1661

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38419df
Removed required constraint for similarilty, identity and length fields
VarunReddy1111 Sep 6, 2024
3548b15
Removed required constraint for similarilty, identity and length fields
VarunReddy1111 Sep 6, 2024
3930876
Changes in Paralogy test case
VarunReddy1111 Sep 9, 2024
d066015
Merge branch 'SCRUM-4283' of github.com:alliance-genome/agr_curation …
VarunReddy1111 Sep 9, 2024
4aaeda5
Checkstyle fix
VarunReddy1111 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .../org/alliancegenome/curation_api/services/validation/dto/fms/ParalogyFmsDTOValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 2 additions & 5 deletions src/test/java/org/alliancegenome/curation_api/ParalogyBulkUploadFmsITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading