From 0fb4e669fb4ca95a7e53e5bb320d4aa63df77c77 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Wed, 22 Jan 2025 18:07:00 +0100 Subject: [PATCH 01/11] SCRUM-4667 make AgmAgmAssociation live under the general AgmAssociation load job --- .../curation_api/jobs/executors/BulkLoadJobExecutor.java | 2 -- .../curation_api/model/entities/AffectedGenomicModel.java | 2 +- .../associations/agmAssociations/AgmAgmAssociation.java | 2 +- .../agmAssociations/AgmAgmAssociationService.java | 2 +- .../agmAssociations/AgmAgmAssociationDTOValidator.java | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/alliancegenome/curation_api/jobs/executors/BulkLoadJobExecutor.java b/src/main/java/org/alliancegenome/curation_api/jobs/executors/BulkLoadJobExecutor.java index cba074a37..82cb498f3 100644 --- a/src/main/java/org/alliancegenome/curation_api/jobs/executors/BulkLoadJobExecutor.java +++ b/src/main/java/org/alliancegenome/curation_api/jobs/executors/BulkLoadJobExecutor.java @@ -107,8 +107,6 @@ public void process(BulkLoadFileHistory bulkLoadFileHistory, Boolean cleanUp) th if (loadType == AGM_ASSOCIATION || loadType == FULL_INGEST) { agmStrAssociationExecutor.execLoad(bulkLoadFileHistory, cleanUp); agmAlleleAssociationExecutor.execLoad(bulkLoadFileHistory, cleanUp); - } - if (loadType == AGM_AGM_ASSOCIATION || loadType == FULL_INGEST) { agmAgmAssociationExecutor.execLoad(bulkLoadFileHistory, cleanUp); } diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java index d121afc95..6db8b7ff4 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java @@ -117,7 +117,7 @@ public class AffectedGenomicModel extends GenomicEntity { "agmAssociationObject.secondaryIdentifiers", "agmAssociationObject.secondaryIdentifiers_keyword" }) - @OneToMany(mappedBy = "agmAssociationObject", cascade = CascadeType.ALL, orphanRemoval = true) + @OneToMany(mappedBy = "agmAgmAssociationObject", cascade = CascadeType.ALL, orphanRemoval = true) @JsonView({View.FieldsAndLists.class, View.AffectedGenomicModelDetailView.class}) private List agmAgmObjectAssociations; diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java b/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java index 4b1faf1b0..bf5488dbc 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java @@ -61,5 +61,5 @@ public class AgmAgmAssociation extends Association { @ManyToOne @JsonView({View.FieldsOnly.class}) @JsonIgnoreProperties({"agmAgmAssociations", "agmAgmObjectAssociations", "agmSequenceTargetingReagentAssociations"}) - private AffectedGenomicModel agmAssociationObject; + private AffectedGenomicModel agmAgmAssociationObject; } diff --git a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java index 208036e67..210c3ae1c 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java +++ b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java @@ -144,7 +144,7 @@ private void addAssociationToAgm(AgmAgmAssociation association) { } private void addAssociationToStr(AgmAgmAssociation association) { - AffectedGenomicModel str = association.getAgmAssociationObject(); + AffectedGenomicModel str = association.getAgmAgmAssociationObject(); List currentAssociations = str.getAgmAgmAssociations(); if (currentAssociations == null) { currentAssociations = new ArrayList<>(); diff --git a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java index 0f5bb81f3..7fd3859d3 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java +++ b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java @@ -84,7 +84,7 @@ public AgmAgmAssociation validateAgmAgmAssociationDTO(AgmAgmAssociationDTO dto, } } - if (association.getAgmAssociationObject() == null && !StringUtils.isBlank(dto.getAgmObjectIdentifier())) { + if (association.getAgmAgmAssociationObject() == null && !StringUtils.isBlank(dto.getAgmObjectIdentifier())) { AffectedGenomicModel object = agmService.findByIdentifierString(dto.getAgmObjectIdentifier()); if (object == null) { @@ -92,7 +92,7 @@ public AgmAgmAssociation validateAgmAgmAssociationDTO(AgmAgmAssociationDTO dto, } else if (beDataProvider != null && !object.getDataProvider().getAbbreviation().equals(beDataProvider.sourceOrganization)) { response.addErrorMessage("agm_object_identifier", ValidationConstants.INVALID_MESSAGE + " for " + beDataProvider.name() + " load (" + dto.getAgmObjectIdentifier() + ")"); } else { - association.setAgmAssociationObject(object); + association.setAgmAgmAssociationObject(object); } } association = validateAuditedObjectDTO(association, dto); From 343c0469921bc69cc9b5de92e0c91088b3650791 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 23 Jan 2025 13:01:16 +0100 Subject: [PATCH 02/11] SCRUM-4667 fix renaming fallout --- .../model/entities/AffectedGenomicModel.java | 12 ++++++------ .../agmAssociations/AgmAgmAssociationService.java | 2 +- .../AgmAgmAssociationDTOValidator.java | 2 +- .../v0.38.0.29__agm_agm_association_loads_2.sql | 8 ++++++++ .../AgmAgmAssociationBulkUploadITCase.java | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java index 6db8b7ff4..499618324 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java @@ -110,12 +110,12 @@ public class AffectedGenomicModel extends GenomicEntity { private List agmAgmAssociations; @IndexedEmbedded(includePaths = { - "agmAssociationObject.name", - "agmAssociationObject.name_keyword", - "agmAssociationObject.synonyms", - "agmAssociationObject.synonyms_keyword", - "agmAssociationObject.secondaryIdentifiers", - "agmAssociationObject.secondaryIdentifiers_keyword" + "agmAgmAssociationObject.name", + "agmAgmAssociationObject.name_keyword", + "agmAgmAssociationObject.synonyms", + "agmAgmAssociationObject.synonyms_keyword", + "agmAgmAssociationObject.secondaryIdentifiers", + "agmAgmAssociationObject.secondaryIdentifiers_keyword" }) @OneToMany(mappedBy = "agmAgmAssociationObject", cascade = CascadeType.ALL, orphanRemoval = true) @JsonView({View.FieldsAndLists.class, View.AffectedGenomicModelDetailView.class}) diff --git a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java index 210c3ae1c..907f8a112 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java +++ b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java @@ -112,7 +112,7 @@ public ObjectResponse getAssociation(Long agmId, String relat Map params = new HashMap<>(); params.put("agmAssociationSubject.id", agmId); params.put("relation.name", relationName); - params.put("agmAssociationObject.id", strId); + params.put("agmAgmAssociationObject.id", strId); SearchResponse resp = agmAgmAssociationDAO.findByParams(params); if (resp != null && resp.getSingleResult() != null) { diff --git a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java index 7fd3859d3..d2506e47c 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java +++ b/src/main/java/org/alliancegenome/curation_api/services/validation/dto/associations/agmAssociations/AgmAgmAssociationDTOValidator.java @@ -57,7 +57,7 @@ public AgmAgmAssociation validateAgmAgmAssociationDTO(AgmAgmAssociationDTO dto, params.put("agmAssociationSubject.id", subjectIds.get(0)); params.put("relation.name", dto.getRelationName()); - params.put("agmAssociationObject.id", objectIds.get(0)); + params.put("agmAgmAssociationObject.id", objectIds.get(0)); SearchResponse searchResponse = agmAgmAssociationDAO.findByParams(params); if (searchResponse != null && searchResponse.getResults().size() == 1) { diff --git a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql new file mode 100644 index 000000000..c5ca01663 --- /dev/null +++ b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql @@ -0,0 +1,8 @@ +ALTER TABLE agmagmassociation + add column + agmAgmAssociationObject_id bigint +; + +alter table agmagmassociation + DROP agmassociationobject_id +; \ No newline at end of file diff --git a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java index 49eaead4a..c17ae5f27 100644 --- a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java @@ -62,7 +62,7 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { then(). statusCode(200). body("entity.relation.name", is(relationName)). - body("entity.agmAssociationObject.primaryExternalId", is(agmObjectCurie)). + body("entity.agmAgmAssociationObject.primaryExternalId", is(agmObjectCurie)). body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). body("entity.internal", is(false)). body("entity.obsolete", is(false)). @@ -79,7 +79,7 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { body("entity.agmAgmAssociations", hasSize(1)). body("entity.agmAgmAssociations[0].relation.name", is(relationName)). body("entity.agmAgmAssociations[0].agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). - body("entity.agmAgmAssociations[0].agmAssociationSubject", not(hasKey("agmAssociationObject"))); + body("entity.agmAgmAssociations[0].agmAssociationSubject", not(hasKey("agmAgmAssociationObject"))); RestAssured.given(). when(). From 0f218ad837134b465bf3f1b0b5ca4e679fb0ac0c Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 23 Jan 2025 14:26:46 +0100 Subject: [PATCH 03/11] SCRUM-4667 removing individual bulkload tables entries --- ...0.38.0.29__agm_agm_association_loads_2.sql | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql index c5ca01663..9f7696b03 100644 --- a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql +++ b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql @@ -5,4 +5,29 @@ ALTER TABLE agmagmassociation alter table agmagmassociation DROP agmassociationobject_id -; \ No newline at end of file +; + +delete +from bulkscheduledload +where id in (SELECT id + FROM bulkload + WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); +delete +from bulkload +WHERE group_id in (select id from bulkloadgroup where name = 'Direct (LinkML) AGM AGM Association Loads'); +delete +from bulkloadgroup +where name = 'Direct (LinkML) AGM AGM Association Loads'; + +delete +from bulkmanualload +where id in (SELECT id + FROM bulkload + WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); + +SELECT id, 'ZFIN' +FROM bulkload +WHERE name = 'ZFIN AGM AGM Association Load'; + +select * +from bulkmanualload \ No newline at end of file From 5c4b65428f9a27fdde0eb83d95fa102cfbc257b1 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 23 Jan 2025 14:41:43 +0100 Subject: [PATCH 04/11] SCRUM-4667 fix sql query ordering --- ...0.38.0.29__agm_agm_association_loads_2.sql | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql index 9f7696b03..5b0d7f2d3 100644 --- a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql +++ b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql @@ -12,12 +12,6 @@ from bulkscheduledload where id in (SELECT id FROM bulkload WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); -delete -from bulkload -WHERE group_id in (select id from bulkloadgroup where name = 'Direct (LinkML) AGM AGM Association Loads'); -delete -from bulkloadgroup -where name = 'Direct (LinkML) AGM AGM Association Loads'; delete from bulkmanualload @@ -25,9 +19,12 @@ where id in (SELECT id FROM bulkload WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); -SELECT id, 'ZFIN' -FROM bulkload -WHERE name = 'ZFIN AGM AGM Association Load'; +delete +from bulkload +WHERE group_id in (select id from bulkloadgroup where name = 'Direct (LinkML) AGM AGM Association Loads'); + +delete +from bulkloadgroup +where name = 'Direct (LinkML) AGM AGM Association Loads'; + -select * -from bulkmanualload \ No newline at end of file From 2692fdc31a128cde07e239d7cfb9f22e5dd731fd Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Fri, 24 Jan 2025 20:58:51 +0100 Subject: [PATCH 05/11] SCRUM-4667 fix review suggestions --- .../model/entities/AffectedGenomicModel.java | 16 +------ .../agmAssociations/AgmAgmAssociation.java | 8 ++-- .../AgmAgmAssociationService.java | 8 ++-- ...0.38.0.30__agm_agm_association_loads_2.sql | 4 ++ .../AgmAgmAssociationBulkUploadITCase.java | 45 +++++++------------ ...D_01_update_all_except_default_fields.json | 4 +- 6 files changed, 33 insertions(+), 52 deletions(-) create mode 100644 src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java index 499618324..86689442a 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java @@ -97,18 +97,6 @@ public class AffectedGenomicModel extends GenomicEntity { @JsonView({View.FieldsAndLists.class, View.AffectedGenomicModelDetailView.class}) private List components; - @IndexedEmbedded(includePaths = { - "agmAssociationSubject.name", - "agmAssociationSubject.name_keyword", - "agmAssociationSubject.synonyms", - "agmAssociationSubject.synonyms_keyword", - "agmAssociationSubject.secondaryIdentifiers", - "agmAssociationSubject.secondaryIdentifiers_keyword" - }) - @OneToMany(mappedBy = "agmAssociationSubject", cascade = CascadeType.ALL, orphanRemoval = true) - @JsonView({View.FieldsAndLists.class, View.AffectedGenomicModelDetailView.class}) - private List agmAgmAssociations; - @IndexedEmbedded(includePaths = { "agmAgmAssociationObject.name", "agmAgmAssociationObject.name_keyword", @@ -117,8 +105,8 @@ public class AffectedGenomicModel extends GenomicEntity { "agmAgmAssociationObject.secondaryIdentifiers", "agmAgmAssociationObject.secondaryIdentifiers_keyword" }) - @OneToMany(mappedBy = "agmAgmAssociationObject", cascade = CascadeType.ALL, orphanRemoval = true) + @OneToMany(mappedBy = "agmAssociationSubject", cascade = CascadeType.ALL, orphanRemoval = true) @JsonView({View.FieldsAndLists.class, View.AffectedGenomicModelDetailView.class}) - private List agmAgmObjectAssociations; + private List parentalPopulations; } diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java b/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java index bf5488dbc..15fba8303 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/associations/agmAssociations/AgmAgmAssociation.java @@ -43,10 +43,10 @@ public class AgmAgmAssociation extends Association { @IndexedEmbedded(includePaths = { "curie", "name", "curie_keyword", "name_keyword", - "primaryExternalId", "perimaryExternalId_keyword", "modInternalId", "modInternalId_keyword"}) + "primaryExternalId", "primaryExternalId_keyword", "modInternalId", "modInternalId_keyword"}) @ManyToOne @JsonView({View.FieldsOnly.class}) - @JsonIgnoreProperties({"agmAgmAssociations", "agmAgmObjectAssociations", "agmSequenceTargetingReagentAssociations"}) + @JsonIgnoreProperties({"parentalPopulations", "agmSequenceTargetingReagentAssociations"}) @Fetch(FetchMode.JOIN) private AffectedGenomicModel agmAssociationSubject; @@ -56,10 +56,10 @@ public class AgmAgmAssociation extends Association { @JsonView({View.FieldsOnly.class}) private VocabularyTerm relation; - @IndexedEmbedded(includePaths = {"name", "synonyms", "secondaryIdentifiers"}) + @IndexedEmbedded(includePaths = {"name", "synonyms"}) @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW) @ManyToOne @JsonView({View.FieldsOnly.class}) - @JsonIgnoreProperties({"agmAgmAssociations", "agmAgmObjectAssociations", "agmSequenceTargetingReagentAssociations"}) + @JsonIgnoreProperties({"parentalPopulations", "agmSequenceTargetingReagentAssociations"}) private AffectedGenomicModel agmAgmAssociationObject; } diff --git a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java index 907f8a112..2b517f17c 100644 --- a/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java +++ b/src/main/java/org/alliancegenome/curation_api/services/associations/agmAssociations/AgmAgmAssociationService.java @@ -127,10 +127,10 @@ public ObjectResponse getAssociation(Long agmId, String relat private void addAssociationToAgm(AgmAgmAssociation association) { AffectedGenomicModel agm = association.getAgmAssociationSubject(); - List currentAssociations = agm.getAgmAgmAssociations(); + List currentAssociations = agm.getParentalPopulations(); if (currentAssociations == null) { currentAssociations = new ArrayList<>(); - agm.setAgmAgmAssociations(currentAssociations); + agm.setParentalPopulations(currentAssociations); } List currentAssociationIds = new ArrayList<>(); @@ -145,10 +145,10 @@ private void addAssociationToAgm(AgmAgmAssociation association) { private void addAssociationToStr(AgmAgmAssociation association) { AffectedGenomicModel str = association.getAgmAgmAssociationObject(); - List currentAssociations = str.getAgmAgmAssociations(); + List currentAssociations = str.getParentalPopulations(); if (currentAssociations == null) { currentAssociations = new ArrayList<>(); - str.setAgmAgmAssociations(currentAssociations); + str.setParentalPopulations(currentAssociations); } List currentAssociationIds = new ArrayList<>(); diff --git a/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql new file mode 100644 index 000000000..841b6d8e0 --- /dev/null +++ b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql @@ -0,0 +1,4 @@ +drop INDEX agmagmassociation_agmassocobject_in; +ALTER TABLE public.agmagmassociation DROP CONSTRAINT agmstrassociation_agmassociationobject_fk; +CREATE INDEX agmagmassociation_agmassocobject_in ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); +ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationobject_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES public.affectedgenomicmodel(id); diff --git a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java index c17ae5f27..dea4ed731 100644 --- a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java @@ -26,8 +26,12 @@ public class AgmAgmAssociationBulkUploadITCase extends BaseITCase { private AffectedGenomicModel agmSubject; private AffectedGenomicModel agmObject; + private AffectedGenomicModel agmSubject2; + private AffectedGenomicModel agmObject2; private String agmSubjectCurie = "AMGTEST:AffectedGenomicModel0010"; private String agmObjectCurie = "AMGTEST:AffectedGenomicModel0020"; + private String agmSubjectCurie2 = "AMGTEST:AffectedGenomicModel00102"; + private String agmObjectCurie2 = "AMGTEST:AffectedGenomicModel00202"; private String relationName = "has_parental_population"; @BeforeEach @@ -55,14 +59,15 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { loadRequiredEntities(); checkSuccessfulBulkLoad(agmAgmAssociationBulkPostEndpoint, agmAgmAssociationTestFilePath + "AF_01_all_fields.json"); - + + String s = agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject.getId(); + System.out.println(s); RestAssured.given(). when(). - get(agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject.getId()). + get(s). then(). statusCode(200). body("entity.relation.name", is(relationName)). - body("entity.agmAgmAssociationObject.primaryExternalId", is(agmObjectCurie)). body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). body("entity.internal", is(false)). body("entity.obsolete", is(false)). @@ -76,22 +81,14 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { get(agmGetEndpoint + agmSubjectCurie). then(). statusCode(200). - body("entity.agmAgmAssociations", hasSize(1)). - body("entity.agmAgmAssociations[0].relation.name", is(relationName)). - body("entity.agmAgmAssociations[0].agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). - body("entity.agmAgmAssociations[0].agmAssociationSubject", not(hasKey("agmAgmAssociationObject"))); + body("entity.parentalPopulations", hasSize(1)). + body("entity.parentalPopulations[0].relation.name", is(relationName)). + body("entity.parentalPopulations[0].agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). + body("entity.parentalPopulations[0].agmAssociationSubject", not(hasKey("agmAgmAssociationObject"))); - RestAssured.given(). - when(). - get(agmGetEndpoint + agmObjectCurie). - then(). - statusCode(200). - body("entity.agmAgmObjectAssociations", hasSize(1)). - body("entity.agmAgmObjectAssociations[0].relation.name", is(relationName)). - body("entity.agmAgmObjectAssociations[0].agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). - body("entity.agmAgmObjectAssociations[0].agmAgmAssociationObject", not(hasKey("agmAgmAssociations"))); } + @Test @Order(2) public void agmAgmAssociationBulkUploadUpdateCheckFields() throws Exception { @@ -99,12 +96,11 @@ public void agmAgmAssociationBulkUploadUpdateCheckFields() throws Exception { RestAssured.given(). when(). - get(agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject.getId()). + get(agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject2.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject2.getId()). then(). statusCode(200). body("entity.relation.name", is(relationName)). - body("entity.agmAgmAssociationObject.primaryExternalId", is(agmObjectCurie)). - body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). + body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie2)). body("entity.internal", is(true)). body("entity.obsolete", is(true)). body("entity.createdBy.uniqueId", is("AGMTEST:Person0001")). @@ -115,17 +111,10 @@ public void agmAgmAssociationBulkUploadUpdateCheckFields() throws Exception { RestAssured.given(). when(). - get(agmGetEndpoint + agmSubjectCurie). - then(). - statusCode(200). - body("entity.agmSequenceTargetingReagentAssociations", hasSize(1)); - - RestAssured.given(). - when(). - get(agmGetEndpoint + agmObjectCurie). + get(agmGetEndpoint + agmSubjectCurie2). then(). statusCode(200). - body("entity.agmSequenceTargetingReagentAssociations", hasSize(1)); + body("entity.agmAgmAssociations", hasSize(1)); } @Test diff --git a/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json b/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json index 58d0c4956..c5b20a345 100644 --- a/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json +++ b/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json @@ -1,8 +1,8 @@ [ { - "agm_subject_identifier": "AMGTEST:AffectedGenomicModel0010", + "agm_subject_identifier": "AMGTEST:AffectedGenomicModel00102", "relation_name": "has_parental_population", - "agm_object_identifier": "AMGTEST:AffectedGenomicModel0020", + "agm_object_identifier": "AMGTEST:AffectedGenomicModel00202", "internal": true, "obsolete": true, "created_by_curie": "AGMTEST:Person0001", From 8ae2cbeefa4b412c5138e98cc181141361ea389b Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Sat, 25 Jan 2025 07:11:15 +0100 Subject: [PATCH 06/11] SCRUM-4667 fix checkstyle --- .../db/migration/v0.38.0.30__agm_agm_association_loads_2.sql | 2 -- .../curation_api/AgmAgmAssociationBulkUploadITCase.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql index 841b6d8e0..ab0a25803 100644 --- a/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql +++ b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql @@ -1,4 +1,2 @@ -drop INDEX agmagmassociation_agmassocobject_in; -ALTER TABLE public.agmagmassociation DROP CONSTRAINT agmstrassociation_agmassociationobject_fk; CREATE INDEX agmagmassociation_agmassocobject_in ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationobject_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES public.affectedgenomicmodel(id); diff --git a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java index dea4ed731..376a84c29 100644 --- a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java @@ -61,7 +61,6 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { checkSuccessfulBulkLoad(agmAgmAssociationBulkPostEndpoint, agmAgmAssociationTestFilePath + "AF_01_all_fields.json"); String s = agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject.getId(); - System.out.println(s); RestAssured.given(). when(). get(s). From 7cb42249df08d7721698d1a19359f09cd891af33 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Mon, 27 Jan 2025 12:37:39 +0100 Subject: [PATCH 07/11] SCRUM-4667 fix test errors --- .../model/entities/AffectedGenomicModel.java | 2 +- .../AgmAgmAssociationBulkUploadITCase.java | 13 ++++--------- .../UD_01_update_all_except_default_fields.json | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java index 86689442a..484b8c7d3 100644 --- a/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java +++ b/src/main/java/org/alliancegenome/curation_api/model/entities/AffectedGenomicModel.java @@ -27,7 +27,7 @@ @Entity @Data @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true) -@ToString(exclude = {"agmDiseaseAnnotations", "agmPhenotypeAnnotations", "constructGenomicEntityAssociations", "agmSecondaryIds", "agmSequenceTargetingReagentAssociations", "components"}, callSuper = true) +@ToString(exclude = {"agmDiseaseAnnotations", "agmPhenotypeAnnotations", "constructGenomicEntityAssociations", "agmSecondaryIds", "agmSequenceTargetingReagentAssociations", "components", "parentalPopulations"}, callSuper = true) @Schema(name = "AffectedGenomicModel", description = "POJO that represents the AGM") @AGRCurationSchemaVersion(min = "1.5.0", max = LinkMLSchemaConstants.LATEST_RELEASE, dependencies = {GenomicEntity.class}, partial = true) public class AffectedGenomicModel extends GenomicEntity { diff --git a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java index 376a84c29..6a90df2c2 100644 --- a/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/AgmAgmAssociationBulkUploadITCase.java @@ -26,12 +26,8 @@ public class AgmAgmAssociationBulkUploadITCase extends BaseITCase { private AffectedGenomicModel agmSubject; private AffectedGenomicModel agmObject; - private AffectedGenomicModel agmSubject2; - private AffectedGenomicModel agmObject2; private String agmSubjectCurie = "AMGTEST:AffectedGenomicModel0010"; private String agmObjectCurie = "AMGTEST:AffectedGenomicModel0020"; - private String agmSubjectCurie2 = "AMGTEST:AffectedGenomicModel00102"; - private String agmObjectCurie2 = "AMGTEST:AffectedGenomicModel00202"; private String relationName = "has_parental_population"; @BeforeEach @@ -90,16 +86,15 @@ public void agmAgmAssociationBulkUploadCheckFields() throws Exception { @Test @Order(2) public void agmAgmAssociationBulkUploadUpdateCheckFields() throws Exception { - checkSuccessfulBulkLoad(agmAgmAssociationBulkPostEndpoint, agmAgmAssociationTestFilePath + "UD_01_update_all_except_default_fields.json"); RestAssured.given(). when(). - get(agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject2.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject2.getId()). + get(agmAgmAssociationGetEndpoint + "?agmSubjectId=" + agmSubject.getId() + "&relationName=" + relationName + "&agmObjectId=" + agmObject.getId()). then(). statusCode(200). body("entity.relation.name", is(relationName)). - body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie2)). + body("entity.agmAssociationSubject.primaryExternalId", is(agmSubjectCurie)). body("entity.internal", is(true)). body("entity.obsolete", is(true)). body("entity.createdBy.uniqueId", is("AGMTEST:Person0001")). @@ -110,10 +105,10 @@ public void agmAgmAssociationBulkUploadUpdateCheckFields() throws Exception { RestAssured.given(). when(). - get(agmGetEndpoint + agmSubjectCurie2). + get(agmGetEndpoint + agmSubjectCurie). then(). statusCode(200). - body("entity.agmAgmAssociations", hasSize(1)); + body("entity.parentalPopulations", hasSize(1)); } @Test diff --git a/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json b/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json index c5b20a345..58d0c4956 100644 --- a/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json +++ b/src/test/resources/bulk/AGMA01_agm_agm_association/UD_01_update_all_except_default_fields.json @@ -1,8 +1,8 @@ [ { - "agm_subject_identifier": "AMGTEST:AffectedGenomicModel00102", + "agm_subject_identifier": "AMGTEST:AffectedGenomicModel0010", "relation_name": "has_parental_population", - "agm_object_identifier": "AMGTEST:AffectedGenomicModel00202", + "agm_object_identifier": "AMGTEST:AffectedGenomicModel0020", "internal": true, "obsolete": true, "created_by_curie": "AGMTEST:Person0001", From f604d772da79d7649bf645880680e60fcfcdd73d Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 30 Jan 2025 18:35:47 +0100 Subject: [PATCH 08/11] SCRUM-4667 rename indexes and FK constraints --- .../v0.38.0.31__agm_agm_association_loads_3.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql diff --git a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql new file mode 100644 index 000000000..840223e7b --- /dev/null +++ b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql @@ -0,0 +1,11 @@ +--alter TABLE agmagmassociation ADD COLUMN agmAgmAssociationObject_id bigint; +--alter TABLE agmagmassociation drop agmAssociationObject_id; + +CREATE INDEX agmagmassociation_agmassociationsubject_index ON public.agmagmassociation USING btree (agmassociationsubject_id); +CREATE INDEX agmagmassociation_agmagmassocicationobject_index ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); + +drop index agmagmassociation_agmassocobject_in; +drop index agmagmassociation_agmassocsubject_in; + +ALTER TABLE agmagmassociation ADD CONSTRAINT agmagmassociation_agmagmassociationobject_id_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES affectedgenomicmodel(id); +ALTER TABLE agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationsubject_id_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES affectedgenomicmodel(id); From d5c72476318aaa8012d1a284ce0fe9bb5c63e042 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Mon, 3 Feb 2025 18:01:45 +0100 Subject: [PATCH 09/11] fix typo --- .../db/migration/v0.38.0.31__agm_agm_association_loads_3.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql index 840223e7b..78a4a01a8 100644 --- a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql +++ b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql @@ -1,8 +1,8 @@ --alter TABLE agmagmassociation ADD COLUMN agmAgmAssociationObject_id bigint; --alter TABLE agmagmassociation drop agmAssociationObject_id; -CREATE INDEX agmagmassociation_agmassociationsubject_index ON public.agmagmassociation USING btree (agmassociationsubject_id); -CREATE INDEX agmagmassociation_agmagmassocicationobject_index ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); +CREATE INDEX AgmAgmAssociation_agmAssociationSubject_index ON public.agmagmassociation USING btree (agmassociationsubject_id); +CREATE INDEX AgmAgmAssociation_AgmAgmAssociationObject_index ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); drop index agmagmassociation_agmassocobject_in; drop index agmagmassociation_agmassocsubject_in; From 63ef2a2eca4419a8a3289ea99be5d76bb4b90ef4 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Thu, 6 Feb 2025 16:17:30 +0100 Subject: [PATCH 10/11] more naming adjustments --- .../v0.38.0.31__agm_agm_association_loads_3.sql | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql index 78a4a01a8..752558edf 100644 --- a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql +++ b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql @@ -7,5 +7,15 @@ CREATE INDEX AgmAgmAssociation_AgmAgmAssociationObject_index ON public.agmagmass drop index agmagmassociation_agmassocobject_in; drop index agmagmassociation_agmassocsubject_in; +ALTER TABLE agmagmassociation DROP CONSTRAINT agmstrassociation_agmassocsubject_fk; +ALTER TABLE agmagmassociation DROP CONSTRAINT agmagmassociation_agmassociationobject_fk; +ALTER TABLE agmagmassociation DROP CONSTRAINT agmstrassociation_createdby_fk; +ALTER TABLE agmagmassociation DROP CONSTRAINT agmstrassociation_relation_fk; +ALTER TABLE agmagmassociation DROP CONSTRAINT agmstrassociation_updatedby_fk; + ALTER TABLE agmagmassociation ADD CONSTRAINT agmagmassociation_agmagmassociationobject_id_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES affectedgenomicmodel(id); -ALTER TABLE agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationsubject_id_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES affectedgenomicmodel(id); +ALTER TABLE agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationsubject_id_fk FOREIGN KEY (agmassociationsubject_id) REFERENCES affectedgenomicmodel(id); + +ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_relation_fk FOREIGN KEY (relation_id) REFERENCES public.vocabularyterm(id); +ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_updatedby_fk FOREIGN KEY (updatedby_id) REFERENCES public.person(id); +ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_createdby_fk FOREIGN KEY (createdby_id) REFERENCES public.person(id); From 40f649f18df276b9eeb20357e1ddd67d57df6e7c Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Fri, 7 Feb 2025 10:37:59 +0100 Subject: [PATCH 11/11] rename FW scripts --- ...0.38.0.29__agm_agm_association_loads_2.sql | 30 ----------------- ...0.38.0.30__agm_agm_association_loads_2.sql | 32 +++++++++++++++++-- ...0.38.0.31__agm_agm_association_loads_2.sql | 2 ++ ....38.0.32__agm_agm_association_loads_3.sql} | 0 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql create mode 100644 src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_2.sql rename src/main/resources/db/migration/{v0.38.0.31__agm_agm_association_loads_3.sql => v0.38.0.32__agm_agm_association_loads_3.sql} (100%) diff --git a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql deleted file mode 100644 index 5b0d7f2d3..000000000 --- a/src/main/resources/db/migration/v0.38.0.29__agm_agm_association_loads_2.sql +++ /dev/null @@ -1,30 +0,0 @@ -ALTER TABLE agmagmassociation - add column - agmAgmAssociationObject_id bigint -; - -alter table agmagmassociation - DROP agmassociationobject_id -; - -delete -from bulkscheduledload -where id in (SELECT id - FROM bulkload - WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); - -delete -from bulkmanualload -where id in (SELECT id - FROM bulkload - WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); - -delete -from bulkload -WHERE group_id in (select id from bulkloadgroup where name = 'Direct (LinkML) AGM AGM Association Loads'); - -delete -from bulkloadgroup -where name = 'Direct (LinkML) AGM AGM Association Loads'; - - diff --git a/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql index ab0a25803..5b0d7f2d3 100644 --- a/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql +++ b/src/main/resources/db/migration/v0.38.0.30__agm_agm_association_loads_2.sql @@ -1,2 +1,30 @@ -CREATE INDEX agmagmassociation_agmassocobject_in ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); -ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationobject_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES public.affectedgenomicmodel(id); +ALTER TABLE agmagmassociation + add column + agmAgmAssociationObject_id bigint +; + +alter table agmagmassociation + DROP agmassociationobject_id +; + +delete +from bulkscheduledload +where id in (SELECT id + FROM bulkload + WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); + +delete +from bulkmanualload +where id in (SELECT id + FROM bulkload + WHERE backendbulkloadtype = 'AGM_AGM_ASSOCIATION'); + +delete +from bulkload +WHERE group_id in (select id from bulkloadgroup where name = 'Direct (LinkML) AGM AGM Association Loads'); + +delete +from bulkloadgroup +where name = 'Direct (LinkML) AGM AGM Association Loads'; + + diff --git a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_2.sql b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_2.sql new file mode 100644 index 000000000..ab0a25803 --- /dev/null +++ b/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_2.sql @@ -0,0 +1,2 @@ +CREATE INDEX agmagmassociation_agmassocobject_in ON public.agmagmassociation USING btree (agmAgmAssociationObject_id); +ALTER TABLE ONLY public.agmagmassociation ADD CONSTRAINT agmagmassociation_agmassociationobject_fk FOREIGN KEY (agmAgmAssociationObject_id) REFERENCES public.affectedgenomicmodel(id); diff --git a/src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql b/src/main/resources/db/migration/v0.38.0.32__agm_agm_association_loads_3.sql similarity index 100% rename from src/main/resources/db/migration/v0.38.0.31__agm_agm_association_loads_3.sql rename to src/main/resources/db/migration/v0.38.0.32__agm_agm_association_loads_3.sql