Add general findByIdIn to BrAPIRepository to be used by importer

Author: jloux-brapi

src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepository.java

@@ -10,6 +10,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.NoRepositoryBean;
 
 @NoRepositoryBean
@@ -30,4 +31,6 @@ public interface BrAPIRepository<T extends BrAPIPrimaryEntity, ID extends Serial
 	public <S extends T> void refresh(S entity);
 
 	public void fetchXrefs(Page<T> page, Class<T> searchClass) throws InvalidPagingException;
+
+	List<T> findByIdIn(List<ID> ids);
 }

src/main/java/org/brapi/test/BrAPITestServer/repository/BrAPIRepositoryImpl.java

@@ -119,6 +119,10 @@ public Optional<T> findById(ID id) {
 		return response;
 	}
 
+	public List<T> findByIdIn(List<ID> ids) {
+		return super.findAllById(ids);
+	}
+
 	public <S extends T> S save(S entity) {
 		entity.setAuthUserId(SecurityUtils.getCurrentUserId());
 		return super.save(entity);

src/main/java/org/brapi/test/BrAPITestServer/repository/germ/BreedingMethodRepository.java

@@ -3,9 +3,5 @@
 import org.brapi.test.BrAPITestServer.model.entity.germ.BreedingMethodEntity;
 import org.brapi.test.BrAPITestServer.repository.BrAPIRepository;
 
-import java.util.List;
-import java.util.Set;
-
-public interface BreedingMethodRepository extends BrAPIRepository<BreedingMethodEntity, String>{
-    public List<BreedingMethodEntity> findByIdIn(List<String> id);
+public interface BreedingMethodRepository extends BrAPIRepository<BreedingMethodEntity, String> {
 }

src/main/java/org/brapi/test/BrAPITestServer/repository/germ/CrossingProjectRepository.java

@@ -4,5 +4,4 @@
 import org.brapi.test.BrAPITestServer.repository.BrAPIRepository;
 
 public interface CrossingProjectRepository extends BrAPIRepository<CrossingProjectEntity, String> {
-
 }

src/main/java/org/brapi/test/BrAPITestServer/repository/germ/GermplasmRepository.java

@@ -20,7 +20,5 @@ public interface GermplasmRepository extends BrAPIRepository<GermplasmEntity, St
     @Query("UPDATE GermplasmEntity g SET g.softDeleted = :softDeleted WHERE g.id IN :germplasmIds")
     int updateSoftDeletedStatusBatch(@Param("germplasmIds") List<String> germplasmIds, @Param("softDeleted") boolean softDeleted);
 
-    List<GermplasmEntity> findByIdIn(List<String> ids);
-
     List<GermplasmEntity> findByGermplasmNameIn(List<String> germplasmNames);
 }

src/main/java/org/brapi/test/BrAPITestServer/service/germ/CrossingProjectService.java

@@ -70,25 +70,8 @@ public List<CrossingProject> findCrossingProjects(String crossingProjectDbId, St
 		return crossingProjects;
 	}
 
-	public List<CrossingProjectEntity> findCrossingProjectsByIds(List<String> crossingProjectIds)
-		throws BrAPIServerException {
-		Metadata metadata = new Metadata().pagination(new IndexPagination());
-		Pageable pageReq = PagingUtility.getPageRequest(metadata);
-
-		SearchQueryBuilder<CrossingProjectEntity> searchQuery = new SearchQueryBuilder<CrossingProjectEntity>(
-				CrossingProjectEntity.class);
-
-		if (crossingProjectIds != null && !crossingProjectIds.isEmpty()) {
-			searchQuery = searchQuery.appendList(crossingProjectIds, "id");
-		}
-
-		Page<CrossingProjectEntity> page = crossingProjectRepository.findAllBySearchAndPaginate(searchQuery, pageReq);
-
-		if (page.hasContent()) {
-			return page.getContent();
-		}
-
-		return null;
+	public List<CrossingProjectEntity> findCrossingProjectsByIds(List<String> crossingProjectIds) {
+		return crossingProjectRepository.findByIdIn(crossingProjectIds);
 	}
 
 	public CrossingProject getCrossingProject(String crossingProjectDbId) throws BrAPIServerException {