feat: Criar filtro de pesquisa para as chamas GET (getAll) e ordenação

danielso2007 · danielso2007 · commit 26b9021764fa · 2020-04-27T05:03:24.000-03:00
por campo (#11).
diff --git a/src/main/java/br/com/virtuallibrary/commons/services/IBaseService.java b/src/main/java/br/com/virtuallibrary/commons/services/IBaseService.java
@@ -8,6 +8,9 @@
 import javax.validation.ValidationException;
 
 import org.springframework.data.domain.Page;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import br.com.virtuallibrary.commons.entities.BaseEntity;
@@ -17,6 +20,21 @@ public interface IBaseService<E extends BaseEntity, ID extends Serializable, R e
 
 	List<E> findAll();
 
+	/**
+	 * and – operador lógico AND
+	 * or – operador lógico OR
+	 * not – operador lógico NOT
+	 * gt = maior que
+	 * lt = menor que
+	 * gte = maior ou igual
+	 * lte = menor ou igual
+	 * ne = diferente de
+	 * in = todos os documentos cujo atributo possui um dos valores especificados (no SQL operador IN)
+	 * nin = todos os documentos cujo atributo não possui um dos valores especificados (no SQL operador NOT IN)
+	 * @param page A página a ser pesquisada.
+	 * @param size A quantidade de registro por página.
+	 * @return O resultado paginado.
+	 */
 	Page<E> findPaginated(int page, int size);
 	
 	Optional<E> findById(ID id);
@@ -31,4 +49,10 @@ public interface IBaseService<E extends BaseEntity, ID extends Serializable, R e
 
 	UserDetails getUser();
 
+	MongoTemplate getTemplate();
+
+	Criteria getCriteriaByFilter(Query query, String filter, Object value);
+
+	Page<E> findAll(Query query, int page, int size);
+
 }
diff --git a/src/main/java/br/com/virtuallibrary/commons/services/impl/BaseServiceImpl.java b/src/main/java/br/com/virtuallibrary/commons/services/impl/BaseServiceImpl.java
@@ -16,9 +16,14 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.repository.support.PageableExecutionUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
@@ -41,6 +46,9 @@ public class BaseServiceImpl<E extends BaseEntity, ID extends Serializable, R ex
 	private final String ANONYMOUS = "Anonymous";
 	private final R repository;
 	private final Class<E> entityClass;
+	
+	@Autowired
+	private MongoTemplate mongoTemplate;
 
 	@Override
 	public UserDetails getUser() {
@@ -64,6 +72,20 @@ protected R getRepository() {
 	protected Class<E> getEntityClass() {
 		return entityClass;
 	}
+	
+	@Override
+	public MongoTemplate getTemplate() {
+		return mongoTemplate;
+	}
+	
+	@Override
+	public Page<E> findAll(Query query, final int page, final int size) {
+		if (query == null) {
+			query = new Query();
+		}
+        List<E> results = getTemplate().find(query, getEntityClass());
+		return getPage(results, PageRequest.of(page, size), query);
+	}
 
 	@Override
 	public List<E> findAll() {
@@ -189,5 +211,25 @@ private void checkAuditedEntity(E entity) {
 			}
 		}
 	}
-
+	
+	public Page<E> getPage(List<E> results, Pageable pageable, Query query) {
+		query.with(pageable);
+		return PageableExecutionUtils.getPage(results, pageable, () -> getTemplate().count(query, entityClass));
+	}
+	
+	@Override
+	public Criteria getCriteriaByFilter(final Query query, final String filter, final Object value) {
+		if (filter.equalsIgnoreCase("gt")) {
+			return new Criteria("stars").gt(value);	
+		} else if (filter.equalsIgnoreCase("lt")) {
+			return new Criteria("stars").lt(value);
+		} else if (filter.equalsIgnoreCase("gte")) {
+			return new Criteria("stars").gte(value);
+		} else if (filter.equalsIgnoreCase("lte")) {
+			return new Criteria("stars").lte(value);
+		} else {
+			throw new IllegalArgumentException(String.format("Não foi possível usar o filtro %s.", filter));
+		}
+	}
+	
 }
diff --git a/src/main/java/br/com/virtuallibrary/rest/controllers/impl/BookController.java b/src/main/java/br/com/virtuallibrary/rest/controllers/impl/BookController.java
@@ -48,16 +48,33 @@ public BookController(BookService service, BookModelAssembler modelAssembler) {
 
 	@ResponseStatus(HttpStatus.OK)
 	@GetMapping(produces = { IConstants.APPLICATION_JSON_UTF_8, IConstants.APPLICATION_XML_UTF_8 })
-	@Operation(summary = "Obter lista de Book paginado", description = "Retorna a lista de Books paginado.", tags = { "Book" })
+	@Operation(summary = "Obter lista de Book paginado",
+	description = "Retorna a lista de Books paginado.<br/>"
+			+ "Os filtros são por default contains e ignoreCase.<br/>"
+			+ "Segue os filtros:<br/>"
+			+ "Por título;<br/>"
+			+ "Por autor;<br/>"
+			+ "Os filtros podem ser combinados.",
+	tags = { "Book" })
 	@ApiResponses(value = {
 			@ApiResponse(responseCode = "200", description = "Registros listados com sucesso"),
 			@ApiResponse(responseCode = "400", description = "Erro na obtenção dos dados"),
-			@ApiResponse(responseCode = "500", description = "Erro interno do servidor") })
+			@ApiResponse(responseCode = "500", description = "Erro interno do servidor")})
 	public ResponseEntity<CollectionModel<BookModel>> findAll(
-			@Parameter(description="Número da página, default é 0") @RequestParam(value = "page", required = false, defaultValue = IConstants.defaultPage) int page,
-			@Parameter(description="Quantidade de registros por página, default é 5") @RequestParam(value = "size", required = false, defaultValue = IConstants.defaultSize) int size) {
+			@Parameter(description="Número da página.") @RequestParam(value = "page", required = false, defaultValue = IConstants.defaultPage) int page,
+			@Parameter(description="Quantidade de registros por página.") @RequestParam(value = "size", required = false, defaultValue = IConstants.defaultSize) int size,
+			@Parameter(description="Filtro pelo título do livro.") @RequestParam(value = "title", required = false) String title,
+			@Parameter(description="Filtro pelo autor do livro.") @RequestParam(value = "author", required = false) String author) {
+		
+		PagedModel<BookModel> collModel = null;
+		
+		if (title == null && author == null) {
+			collModel = pagedResourcesAssembler.toModel(getService().findPaginated(page, size), getModelAssembler());
+		} else{
+			
+			collModel = pagedResourcesAssembler.toModel(getService().findPaginated(title, author, page, size), getModelAssembler());
+		}
 		
-		PagedModel<BookModel> collModel = pagedResourcesAssembler.toModel(getService().findPaginated(page, size), getModelAssembler());
 		
 		return ResponseEntity.ok().body(collModel);
 	}
diff --git a/src/main/java/br/com/virtuallibrary/rest/controllers/impl/RatingController.java b/src/main/java/br/com/virtuallibrary/rest/controllers/impl/RatingController.java
@@ -47,22 +47,31 @@ public RatingController(RatingService service, RatingModelAssembler modelAssembl
 
 	@ResponseStatus(HttpStatus.OK)
 	@GetMapping(produces = { IConstants.APPLICATION_JSON_UTF_8, IConstants.APPLICATION_XML_UTF_8 })
-	@Operation(summary = "Obter lista de Rating paginado", description = "Retorna a lista de Rating paginado. Quando passado %bookId%, retorna todos os Ratings associado ao livro.", tags = { "Rating" })
+	@Operation(summary = "Obter lista de Rating paginado", description = 
+	    "Retorna a lista de Rating paginado. Quando passado <b>bookId</b>, retorna todos os Ratings associado ao livro.<br/>"
+	    + "O filtro padrão é o igual, mas você pode usar:<br/>"
+	    + "Maior que \"gt:2\"<br/>"
+	    + "Menor que \"lt:2\"<br/>"
+	    + "Maior ou igual \"gte:2\"<br/>"
+	    + "Menor ou igual \"lte:2\"<br/>"
+	    + "Também é possível combinar dois filtros: gt:1:lt:5",
+	    tags = { "Rating" })
 	@ApiResponses(value = { 
 			@ApiResponse(responseCode = "200", description = "Registros listados com sucesso"),
 			@ApiResponse(responseCode = "400", description = "Erro na obtenção dos dados"),
 			@ApiResponse(responseCode = "500", description = "Erro interno do servidor") })
 	public ResponseEntity<PagedModel<RatingModel>> findAll(
-			@Parameter(description="O código do livro, deafult é \"\"") @RequestParam(value = "bookId", required = false, defaultValue = IConstants.BLANK) String bookId,
-			@Parameter(description="Número da página, default é 0") @RequestParam(value = "page", required = false, defaultValue = IConstants.defaultPage) int page, 
-			@Parameter(description="Quantidade de registros por página, default é 5") @RequestParam(value = "size", required = false, defaultValue = IConstants.defaultSize) int size) {
+			@Parameter(description="Número da página, default é 0.") @RequestParam(value = "page", required = false, defaultValue = IConstants.defaultPage) int page, 
+			@Parameter(description="Quantidade de registros por página, default é 5.") @RequestParam(value = "size", required = false, defaultValue = IConstants.defaultSize) int size,
+			@Parameter(description="O código do livro.") @RequestParam(value = "bookId", required = false) String bookId,
+			@Parameter(description="Por classificação.") @RequestParam(value = "stars", required = false) String stars) {
 
 		PagedModel<RatingModel> collModel = null;
 		
-		if (bookId.isBlank()) {
+		if (bookId == null && stars == null) {
 			collModel = pagedResourcesAssembler.toModel(getService().findPaginated(page, size), getModelAssembler());
 		} else {
-			collModel = pagedResourcesAssembler.toModel(getService().findPaginated(bookId, page, size), getModelAssembler());
+			collModel = pagedResourcesAssembler.toModel(getService().findPaginated(bookId, stars, page, size), getModelAssembler());
 		}
 		
 		return ResponseEntity.ok().body(collModel);
diff --git a/src/main/java/br/com/virtuallibrary/services/BookService.java b/src/main/java/br/com/virtuallibrary/services/BookService.java
@@ -1,9 +1,13 @@
 package br.com.virtuallibrary.services;
 
+import org.springframework.data.domain.Page;
+
 import br.com.virtuallibrary.commons.services.IBaseService;
 import br.com.virtuallibrary.entity.Book;
 import br.com.virtuallibrary.repositories.BookRepository;
 
 public interface BookService extends IBaseService<Book, String, BookRepository> {
 
+	Page<Book> findPaginated(String title, String author, int page, int size);
+
 }
diff --git a/src/main/java/br/com/virtuallibrary/services/RatingService.java b/src/main/java/br/com/virtuallibrary/services/RatingService.java
@@ -11,5 +11,5 @@
 public interface RatingService extends IBaseService<Rating, String, RatingRepository> {
 
 	List<Rating> findByBookId(String bookId);
-	Page<Rating> findPaginated(String bookI, int page, int size);
+	Page<Rating> findPaginated(String bookI, String stars, int page, int size);
 }
diff --git a/src/main/java/br/com/virtuallibrary/services/impl/BookServicesImpl.java b/src/main/java/br/com/virtuallibrary/services/impl/BookServicesImpl.java
@@ -1,6 +1,9 @@
 package br.com.virtuallibrary.services.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import br.com.virtuallibrary.commons.services.impl.BaseServiceImpl;
@@ -16,4 +19,18 @@ public BookServicesImpl(BookRepository repository) {
 		super(repository);
 	}
 
+	@Override
+	public Page<Book> findPaginated(String title, String author, int page, int size) {
+		Query query = new Query();
+		
+		if (title != null) {
+			query.addCriteria(new Criteria("title").regex(String.format(".*%s.*", title)));
+		}
+		if (author != null) {
+			query.addCriteria(new Criteria("author").regex(String.format(".*%s.*", author)));
+		}
+		
+		return findAll(query, page, size);
+	}
+
 }
diff --git a/src/main/java/br/com/virtuallibrary/services/impl/RatingServiceImpl.java b/src/main/java/br/com/virtuallibrary/services/impl/RatingServiceImpl.java
@@ -6,8 +6,13 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.repository.support.PageableExecutionUtils;
 import org.springframework.stereotype.Service;
 
+import com.mongodb.BasicDBList;
+
 import br.com.virtuallibrary.commons.services.impl.BaseServiceImpl;
 import br.com.virtuallibrary.entity.Rating;
 import br.com.virtuallibrary.repositories.RatingRepository;
@@ -27,12 +32,30 @@ public List<Rating> findByBookId(String bookId) {
 	}
 	
 	@Override
-	public Page<Rating> findPaginated(String bookId, int page, int size) {
-		Pageable pageable = PageRequest.of(page, size);
+	public Page<Rating> findPaginated(String bookId, String stars, int page, int size) {
+		Query query = new Query();
+		
 		if (bookId != null) {
-			return getRepository().findByBookId(bookId, pageable);
+			query.addCriteria(new Criteria("bookId").is(bookId));
+		}
+		
+		//FIXME: Melhorar o código abaixo.
+		if (stars != null) {
+			String[] filters = stars.split(":");
+			
+			if (filters.length == 2) {
+				query.addCriteria(getCriteriaByFilter(query, filters[0], Integer.valueOf(filters[1])));
+			} else if (filters.length == 4) {
+				BasicDBList bsonList = new BasicDBList();
+				bsonList.add(getCriteriaByFilter(query, filters[0], Integer.valueOf(filters[1])).getCriteriaObject());
+				bsonList.add(getCriteriaByFilter(query, filters[2], Integer.valueOf(filters[3])).getCriteriaObject());
+				query.addCriteria(new Criteria("$and").is(bsonList));
+			} else {
+				query.addCriteria(new Criteria("stars").is(Integer.parseInt(stars)));
+			}
 		}
-		return getRepository().findAll(pageable);
+
+		return findAll(query, page, size);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`public interface RatingService extends IBaseService<Rating, String, RatingRepository> {`
`12`	`12`
`13`	`13`	`List<Rating> findByBookId(String bookId);`
`14`		`- Page<Rating> findPaginated(String bookI, int page, int size);`
	`14`	`+ Page<Rating> findPaginated(String bookI, String stars, int page, int size);`
`15`	`15`	`}`