avniproject/avni-media#139 - filter out voided media concepts.

avniproject · Jul 31, 2023 · 203ef9b · 203ef9b
1 parent fbb4b4b
commit 203ef9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/dao/ConceptRepository.java b/avni-server-api/src/main/java/org/avni/server/dao/ConceptRepository.java
@@ -17,7 +17,7 @@
 public interface ConceptRepository extends ReferenceDataRepository<Concept>, FindByLastModifiedDateTime<Concept> {
  Page<Concept> findByIsVoidedFalseAndNameIgnoreCaseContaining(String name, Pageable pageable);
  List<Concept> findAllByDataType(String dataType);
- List<Concept> findAllByDataTypeIn(List<String> conceptDataTypes);
+ List<Concept> findAllByDataTypeInAndIsVoidedFalse(List<String> conceptDataTypes);
  List<Concept> findByIsVoidedFalseAndDataType(String dataType);
 
  List<Concept> findByIsVoidedFalseAndActiveTrueAndNameIgnoreCaseContains(String name);

diff --git a/avni-server-api/src/main/java/org/avni/server/web/ConceptController.java b/avni-server-api/src/main/java/org/avni/server/web/ConceptController.java
@@ -160,7 +160,7 @@ public List<ConceptContract> dashboardFilterSearch(@RequestParam String namePart
  @RequestMapping(value = "/web/concept/media", method = RequestMethod.GET)
  public List<ConceptContract> getMediaConcepts() {
  List<String> mediaDataTypesNames = ConceptDataType.mediaDataTypes.stream().map(Enum::name).collect(Collectors.toList());
- List<Concept> concepts = conceptRepository.findAllByDataTypeIn(mediaDataTypesNames);
+ List<Concept> concepts = conceptRepository.findAllByDataTypeInAndIsVoidedFalse(mediaDataTypesNames);
  return concepts.stream().map(ConceptContract::createForSearchResult).collect(Collectors.toList());
  }
 }