KON-14 Merged from Develop
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactController.java b/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactController.java
index 445ced3..1a29808 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactController.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactController.java
@@ -61,21 +61,4 @@
pageable);
}
-
- @ApiOperation(value = "Anzeigen aller gespeicherten Kontakte")
- @ApiResponses(value = {@ApiResponse(code = 200, message = "Erfolgreich durchgeführt")})
- @ResponseStatus(HttpStatus.OK)
- @Secured({"ROLE_KON-READER", "ROLE_KON-WRITER", "ROLE_KON-ADMIN"})
- @GetMapping(value = "/searchByModulName")
- public Page<VwDetailedContact> findContacts(
- @RequestParam( "modulName") Optional<String> modulName,
- @RequestParam( "searchText" ) Optional<String> searchText,
- @PageableDefault( sort = {"id"}, size = 20, direction = ASC) Pageable pageable ) {
- return contactService.findDetailedContactsByModulName(
- modulName.orElse(null),
- searchText.orElse(null),
- pageable);
- }
-
-
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java b/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
index bff9760..a3000e9 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/repository/DetailedContactRepository.java
@@ -26,7 +26,6 @@
public interface DetailedContactRepository extends PagingAndSortingRepository<VwDetailedContact, Long> {
Page<VwDetailedContact> findAll(Pageable pageable);
-
@Query( "select dc from VwDetailedContact dc "
+ "left outer join TblAssignmentModulContact ass on"
+ " ass.tblContact.id = dc.fkContactId"
@@ -42,14 +41,5 @@
@Param("moduleName") String moduleName,
@Param("withoutModule") boolean withoutModule,
Pageable pageable);
-
-
- @Query( "select dc from VwDetailedContact AS dc"
- + ", TblContact AS c "
- + "inner join c.assignments a where "
- + "dc.fkContactId = c.id and"
- + "(COALESCE(:modulName) is null or COALESCE(:modulName) is not null AND a.modulName =:modulName) and"
- + "(COALESCE(:searchText) is null or COALESCE(:searchText) is not null AND dc.searchfield LIKE CONCAT ('%', :searchText , '%'))")
- Page<VwDetailedContact> findByModulName(@Param("modulName")String modulName, @Param("searchText")String searchText, Pageable pageable);
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/service/ContactService.java b/src/main/java/org/eclipse/openk/contactbasedata/service/ContactService.java
index 56f6be3..de09d97 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/service/ContactService.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/service/ContactService.java
@@ -60,8 +60,4 @@
}
}
- public Page<VwDetailedContact> findDetailedContactsByModulName(String modulName, String searchText, Pageable pageable) {
- return detailedContactRepository.findByModulName(modulName, searchText, pageable);
- }
-
}
