Merge from BI Server

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

@@ -119,7 +119,8 @@ public ResponseEntity<TrialSingleResponse> trialsTrialDbIdDelete(
 			 return responseOK(new TrialSingleResponse(), null);
 		 }
 
-		return null;
+		trialService.softDeleteTrial(trialDbId);
+		return responseOK(new TrialSingleResponse(), null);
 	}
 
 	@CrossOrigin

src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/TrialEntity.java

@@ -8,9 +8,11 @@
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "trial")
+@Where(clause = "soft_deleted = false")
 public class TrialEntity extends BrAPIPrimaryEntity {
 	@Column
 	private Boolean active;
@@ -35,6 +37,8 @@ public class TrialEntity extends BrAPIPrimaryEntity {
 	private String trialName;
 	@Column
 	private String trialPUI;
+	@Column(name = "soft_deleted")
+	private boolean softDeleted;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	private CropEntity crop;
@@ -140,5 +144,6 @@ public List<StudyEntity> getStudies() {
 	public void setStudies(List<StudyEntity> studies) {
 		this.studies = studies;
 	}
-
+	public boolean getSoftDeleted() { return softDeleted; }
+	public void setSoftDeleted(boolean sofDeleted) { this.softDeleted = sofDeleted; }
 }

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

@@ -2,10 +2,14 @@
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
 import org.brapi.test.BrAPITestServer.repository.BrAPIRepository;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 public interface TrialRepository extends BrAPIRepository<TrialEntity, String> {
 
@@ -21,4 +25,14 @@ Page<TrialEntity> findBySearch(
 			@Param("applyActiveFilter") boolean applyActiveFilter, 
 			@Param("active") boolean active, Pageable pageReq);
 
+	@Modifying
+	@Transactional
+	@Query("UPDATE TrialEntity t SET t.softDeleted = :softDeleted WHERE t.id = :trialId")
+	int updateSoftDeletedStatus(@Param("trialId") String trialId, @Param("softDeleted") boolean softDeleted);
+
+	@Modifying
+	@Transactional
+	@Query("UPDATE TrialEntity t SET t.softDeleted = :softDeleted WHERE t.id IN :trialIds")
+	int updateSoftDeletedStatusBatch(@Param("trialIds") List<String> trialIds, @Param("softDeleted") boolean softDeleted);
+
 }

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

@@ -155,6 +155,13 @@ public List<Trial> saveTrials(@Valid List<TrialNewRequest> body) throws BrAPISer
 		return savedTrials;
 	}
 
+	public void softDeleteTrial(String trialDbId) throws BrAPIServerDbIdNotFoundException {
+		int updatedCount = trialRepository.updateSoftDeletedStatus(trialDbId, true);
+		if (updatedCount == 0) {
+			throw new BrAPIServerDbIdNotFoundException("Trial with id " + trialDbId + " not found", HttpStatus.NOT_FOUND);
+		}
+	}
+
 	public void deleteTrial(String trialDbId) throws BrAPIServerException {
 		trialRepository.deleteAllByIdInBatch(Arrays.asList(trialDbId));
 	}