search features now pageable compliant

Author: AVE-cesar

src/main/celerio/angularjs/assets/js/entity/EntityController.e.vm.js

@@ -113,6 +113,32 @@ scope.refreshByPage = function (page, size, addMode) {
 	scope.selectAll = false;
 };
 
+/** Executes the search with criteria on the server side */
+scope.startSearch = function(item) {
+	log.info("startSearch, criteria: " + scope.item);
+
+	// call search on the server side and refresh the grid
+	${entity.model.var}RestService.search(item, function success(result){
+		log.info("receiving info from server side");
+		
+		// refresh data and so the grid
+		scope.data = result.content;
+		
+		// fill pagination variables
+		scope.pagination.first = result.first;
+		scope.pagination.last = result.last;
+		scope.pagination.totalElements = result.totalElements;
+		scope.pagination.totalPages = result.totalPages;
+		scope.pagination.number = result.number;
+		
+		log.info("data post refresh:" + scope.data.length);
+		log.info("page number: " + scope.pagination.number);
+	});
+	
+	// close the search aside
+	hideForm(searchAside);
+};
+
 /** Gets first page */
 scope.first = function () {
 	log.info("call method first inside ${entity.model.type}Controller for page: 0");
@@ -177,23 +203,6 @@ scope.searchItem = function() {
 	showForm(searchAside);
 };
 
-/** Executes the classical search on the server side */
-scope.startSearch = function(item) {
-	log.info("startSearch, criteria: " + scope.item);
-
-	// call search on the server side and refresh the grid
-	${entity.model.var}RestService.search(item, function success(result){
-		log.info("receiving info from server side");
-		
-		// refresh data and so the grid
-		scope.data = result;
-		log.info("data post refresh:" + result);
-	});
-	
-	// close the search aside
-	hideForm(searchAside);
-};
-
 /** Executes the Elastic search on the server side */
 scope.startElasticSearch = function(item) {
 	// get criteria
@@ -479,12 +488,7 @@ app.factory('${entity.model.type}RestService', function (${dollar}resource) {
 		'create': { method:'POST', url: 'api/${entity.model.vars}/$str6'},
 		'update': { method:'PUT', url: 'api/${entity.model.vars}/$str6'},
 		'delete': { method:'DELETE', url: 'api/${entity.model.vars}/$str6' },
-		'search': { method: 'POST', url: 'api/${entity.model.vars}/search/', isArray: true,  
-			transformResponse: function (data) {
-				data = angular.fromJson(data);
-				return data;
-			}
-		}
+		'search': { method: 'POST', url: 'api/${entity.model.vars}/search/', isArray: false}
 ## dedicated method for system entities
 #if ($entity.model.type == "AppParameter")
 		,'getParameter': {method: 'GET',

src/main/celerio/springboot/src/main/java/rest/EntityResource.e.vm.java

@@ -56,6 +56,7 @@
 $output.require("java.util.ArrayList")##
 $output.require("org.springframework.jdbc.core.BeanPropertyRowMapper")##
 $output.require("org.springframework.beans.factory.annotation.Autowired")##
+$output.require("org.springframework.data.domain.PageImpl")##
 
 @RestController
 @RequestMapping("/api/${entity.model.vars}")
@@ -376,14 +377,15 @@ public ResponseEntity<Boolean> exists($str3) throws URISyntaxException {
     /**
      * Search $entity.model.vars.
      */
-// FIXME must return a Page like in method findAllByPage
     @RequestMapping(value = "/search",
             method = RequestMethod.POST,
             produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<List<$entity.model.type>> search(@RequestBody $entity.model.type $entity.model.var, Pageable pageable) throws URISyntaxException {
+    public Page<$entity.model.type> search(@RequestBody $entity.model.type $entity.model.var, Pageable pageable) throws URISyntaxException {
         log.debug("Search $entity.model.vars, page: " + pageable.getPageNumber() + ", size: " + pageable.getPageSize());
         log.debug("$entity.model.var: " + $entity.model.var);
         
+        long total = ${entity.model.var}Repository.count();
+        
         String sqlMainPart = "select * from (select $str10 from $entity.getTableName() where 1=1"; 
         String sqlSecondaryPart = "";
         
@@ -411,7 +413,9 @@ public ResponseEntity<Boolean> exists($str3) throws URISyntaxException {
         		values.toArray(), 
         		new BeanPropertyRowMapper<$entity.model.type>(${entity.model.type}.class));
         
-        return new ResponseEntity<>($entity.model.vars, new HttpHeaders(), HttpStatus.OK);
+        Page<$entity.model.type> page = new PageImpl<$entity.model.type>($entity.model.vars, pageable, total);
+        
+        return page;
     }
 
 ## dedicated method for system entities