add cascade delete constraints for study foreign keys

Author: dmeidlin

src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java

@@ -11,7 +11,6 @@
 import org.brapi.test.BrAPITestServer.service.DateUtility;
 import org.brapi.test.BrAPITestServer.service.SearchService;
 import org.brapi.test.BrAPITestServer.service.core.TrialService;
-import org.hibernate.SessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -30,14 +29,12 @@ public class TrialsApiController extends BrAPIController implements TrialsApi {
 	private final HttpServletRequest request;
 	private final TrialService trialService;
 	private final SearchService searchService;
-	private final SessionFactory sessionFactory;
 
 	@org.springframework.beans.factory.annotation.Autowired
-	public TrialsApiController(TrialService trialService, SearchService searchService, HttpServletRequest request, SessionFactory sessionFactory) {
+	public TrialsApiController(TrialService trialService, SearchService searchService, HttpServletRequest request) {
 		this.trialService = trialService;
 		this.searchService = searchService;
 		this.request = request;
-        this.sessionFactory = sessionFactory;
     }
 
 	@CrossOrigin

src/main/java/org/brapi/test/BrAPITestServer/factory/BrAPIComponent.java

@@ -11,7 +11,6 @@
 public interface BrAPIComponent<T, R extends SearchRequest> {
     List<T> findEntities(@Valid R request, Metadata metadata);
     BatchTypes getBatchType();
-    SearchRequestEntity.SearchRequestTypes getSearchType();
     List<String> collectDbIds(List<T> entities);
     void deleteBatchData(List<String> dbIds);
     void softDeleteBatchData(List<String> dbIds);

src/main/java/org/brapi/test/BrAPITestServer/factory/core/ListComponent.java

@@ -33,10 +33,6 @@ public BatchTypes getBatchType() {
         return BatchTypes.LISTS;
     }
 
-    @Override
-    public SearchRequestEntity.SearchRequestTypes getSearchType() {
-        return SearchRequestEntity.SearchRequestTypes.LISTS;
-    }
 
     @Override
     public List<String> collectDbIds(List<ListSummary> entities) {

src/main/java/org/brapi/test/BrAPITestServer/factory/core/TrialComponent.java

@@ -32,10 +32,6 @@ public BatchTypes getBatchType() {
         return BatchTypes.TRIALS;
     }
 
-    @Override
-    public SearchRequestEntity.SearchRequestTypes getSearchType() {
-        return SearchRequestEntity.SearchRequestTypes.TRIALS;
-    }
 
     @Override
     public List<String> collectDbIds(List<Trial> entities) {

src/main/java/org/brapi/test/BrAPITestServer/factory/geno/SampleComponent.java

@@ -32,10 +32,6 @@ public BatchTypes getBatchType() {
         return BatchTypes.SAMPLES;
     }
 
-    @Override
-    public SearchRequestEntity.SearchRequestTypes getSearchType() {
-        return SearchRequestEntity.SearchRequestTypes.SAMPLES;
-    }
 
     @Override
     public List<String> collectDbIds(List<Sample> entities) {

src/main/java/org/brapi/test/BrAPITestServer/factory/germ/GermplasmComponent.java

@@ -33,10 +33,6 @@ public BatchTypes getBatchType() {
         return BatchTypes.GERMPLASM;
     }
 
-    @Override
-    public SearchRequestEntity.SearchRequestTypes getSearchType() {
-        return SearchRequestEntity.SearchRequestTypes.GERMPLASM;
-    }
 
     @Override
     public List<String> collectDbIds(List<Germplasm> entities) {

src/main/java/org/brapi/test/BrAPITestServer/repository/core/TraitRepository.java

@@ -2,12 +2,6 @@
 
 import org.brapi.test.BrAPITestServer.model.entity.pheno.TraitEntity;
 import org.brapi.test.BrAPITestServer.repository.BrAPIRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 public interface TraitRepository extends BrAPIRepository<TraitEntity, String> {
 }

src/main/java/org/brapi/test/BrAPITestServer/service/core/BatchService.java

@@ -110,9 +110,7 @@ private BatchDetails convertToDetails(BatchEntity entity) {
 		BatchDetails details = new BatchDetails();
 		details = (BatchDetails) convertToBaseFields(entity, details);
 		details.setBatchDbId(entity.getId());
-		details.setData(entity.getData().stream().map((e) -> {
-			return e.getItem();
-		}).collect(Collectors.toList()));
+		details.setData(entity.getData().stream().map((e) -> e.getItem()).collect(Collectors.toList()));
 
 		return details;
 	}

src/main/java/org/brapi/test/BrAPITestServer/service/geno/SampleService.java

@@ -77,7 +77,7 @@ public List<Sample> findBatchDeleteSamples(String batchDeleteDbId, Metadata meta
 		if (details.getData().isEmpty()) {
 			return new ArrayList<>();
 		}
-		
+
 		// Get the list summaries referenced in the batch delete
 		SampleSearchRequest request = new SampleSearchRequest();
 		details.getData().forEach(request::addSampleDbIdsItem);

src/main/resources/db/migration/V002.009__cascade_delete_observation_unit_position.sql

@@ -0,0 +1,12 @@
+-- This migration will delete an observation unit position that references a deleted observation unit
+
+-- First, drop the existing foreign key constraint
+ALTER TABLE ONLY public.observation_unit_position
+DROP CONSTRAINT IF EXISTS fk2mpgvaq1ppb8kjp3jk0ecpdyr;
+
+-- Then, recreate the constraint with ON DELETE CASCADE
+ALTER TABLE ONLY public.observation_unit_position
+    ADD CONSTRAINT fk2mpgvaq1ppb8kjp3jk0ecpdyr
+         FOREIGN KEY (observation_unit_id)
+             REFERENCES public.observation_unit(id)
+             ON DELETE CASCADE;