Replace * by explicit column list

AVE-cesar · AVE-cesar · commit 5b9833a82ed4 · 2016-04-28T21:22:59.000+02:00
diff --git a/src/main/celerio/angularjs/assets/js/applicationStates.p.vm.js b/src/main/celerio/angularjs/assets/js/applicationStates.p.vm.js
@@ -11,9 +11,10 @@ $output.webapp("assets\js", "applicationStates.js")##
 ## str7: {{item.id.keyPart1}}:{{item.id.keyPart2}}
 ## str8: {keyPart1: item.id.keyPart1, keyPart2: item.id.keyPart2}
 ## str9: { "column1": true, "column2": true, ... }
+## str10: column1, column2, ... 
 #########################################################################################
 ##
-## Be careful: this method is call several times; be sure to change all calls when you add a parameter
+## Be careful: this method below is call several times; be sure to change all calls when you add a parameter
 ## calls: 
 ##			3 inside this file
 ##			1 in EntityController.e.vm.js
@@ -23,7 +24,7 @@ $output.webapp("assets\js", "applicationStates.js")##
 ##			1 in EntityResource.e.vm.java
 ##	
 ##
-#macro(generateSimpleOrCompositeKeyForURL $str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $list)
+#macro(generateSimpleOrCompositeKeyForURL $str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $list)
 #set ($compositeCall = false) 
 	#foreach ($attribute in $list)
 		#if ($attribute.isInCpk() == true)
@@ -51,8 +52,10 @@ $output.webapp("assets\js", "applicationStates.js")##
 		
 		#if ($str9 == "") 
 			#set ($str9 = "{ \"$attribute.name\": true")
+			#set ($str10 = "$attribute.name")
 		#else
 			#set ($str9 = "$str9, \"$attribute.name\": true")
+			#set ($str10 = "$str10, $attribute.name")
 		#end
 	#end
 	
@@ -121,7 +124,8 @@ app.config(function(${dollar}stateProvider, ${dollar}urlRouterProvider) {
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 	${dollar}stateProvider
 		.state('$entity.name.toLowerCase()', {
 	    	url: "/$entity.name.toLowerCase()",
@@ -153,7 +157,8 @@ app.config(function(${dollar}stateProvider, ${dollar}urlRouterProvider) {
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 	${dollar}stateProvider
 		.state('edit${entity.name}', {
 			url: "/${entity.name.toLowerCase()}/${str1}",
@@ -183,7 +188,8 @@ app.config(function(${dollar}stateProvider, ${dollar}urlRouterProvider) {
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 	${dollar}stateProvider
 		.state('view${entity.name}', {
 			url: "/${entity.name.toLowerCase()}/view/${str1}",
diff --git a/src/main/celerio/angularjs/assets/js/entity/EntityController.e.vm.js b/src/main/celerio/angularjs/assets/js/entity/EntityController.e.vm.js
@@ -452,7 +452,8 @@ scope.${dollar}on("${dollar}destroy", function() {
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 /** main REST client for managing (4 CRUD calls) ${entity.model.type} entity */
 app.factory('${entity.model.type}RestService', function (${dollar}resource) {
 	return ${dollar}resource('api/${entity.model.vars}/bypage/?page=:page&size=:size', {}, {
diff --git a/src/main/celerio/angularjs/assets/js/entity/EntityEditController.e.vm.js b/src/main/celerio/angularjs/assets/js/entity/EntityEditController.e.vm.js
@@ -9,7 +9,8 @@ $output.webapp("assets\js\entity", "${entity.model.var}EditController.js")##
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 
 app.controller("${entity.model.type}EditController", ["${dollar}scope", "${dollar}window", "${dollar}aside", 
 "${dollar}log", "${entity.model.type}RestService", 
diff --git a/src/main/celerio/angularjs/assets/tpl/apps/entity.e.vm.html b/src/main/celerio/angularjs/assets/tpl/apps/entity.e.vm.html
@@ -9,7 +9,8 @@
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 
 <section>
   <div class="page-header">
diff --git a/src/main/celerio/springboot/src/main/java/domain/CompositePk.cpk.vm.java b/src/main/celerio/springboot/src/main/java/domain/CompositePk.cpk.vm.java
@@ -46,7 +46,8 @@ public class $output.currentClass implements Comparable<$output.currentRootClass
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $primaryKey.entity.attributes.list)    
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $primaryKey.entity.attributes.list)    
     /**
      * Constructor with each part of the composite key as a parameter.
      */
diff --git a/src/main/celerio/springboot/src/main/java/rest/EntityResource.e.vm.java b/src/main/celerio/springboot/src/main/java/rest/EntityResource.e.vm.java
@@ -143,7 +143,8 @@ public class $output.currentClass{
 #set ($str7 = "")
 #set ($str8 = "")
 #set ($str9 = "")
-#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $entity.attributes.list)
+#set ($str10 = "")
+#generateSimpleOrCompositeKeyForURL($str1 $str2 $str3 $str4 $str5 $str6 $str7 $str8 $str9 $str10 $entity.attributes.list)
 #if (($entity.hasSimplePk()))
     /**
      * Find by id $entity.model.type (for simple key).
@@ -375,15 +376,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 {
         log.debug("Search $entity.model.vars, page: " + pageable.getPageNumber() + ", size: " + pageable.getPageSize());
         log.debug("$entity.model.var: " + $entity.model.var);
         
-        // FIXME replace second * by column names
-        String sqlMainPart = "select * from (select * from $entity.getTableName() where 1=1"; 
+        String sqlMainPart = "select * from (select $str10 from $entity.getTableName() where 1=1"; 
         String sqlSecondaryPart = "";
         
         List<Object> values = new ArrayList<Object>();
