feat: assigned into PageCollection and WholeCollection

ftgibran · ftgibran · commit a230227fee2e · 2019-01-29T01:05:39.000-02:00
diff --git a/packages/@simpli/cli-scaffold/generator/index.js b/packages/@simpli/cli-scaffold/generator/index.js
@@ -55,7 +55,7 @@ module.exports = (api, options) => {
       'normalize-scss': '^7.0.1',
       'register-service-worker': '^1.5.2',
       'simple-line-icons': '^2.4.1',
-      'simpli-web-sdk': '^1.3.0',
+      'simpli-web-sdk': '^1.3.2',
       'vue': '^2.5.21',
       'vue-router': '^3.0.1',
       'vue-chartjs': '^3.4.0',
diff --git a/packages/@simpli/cli-scaffold/generator/injected/src/views/list/ListTemplateView.vue b/packages/@simpli/cli-scaffold/generator/injected/src/views/list/ListTemplateView.vue
@@ -81,15 +81,13 @@
 <script lang="ts">
   import {Component, Prop, Watch, Mixins, Vue} from 'vue-property-decorator'
   <%-model.injectIntoDependence().build()%>
-  import PagedResp from '@/model/collection/PagedResp'
-  import All from '@/model/collection/All'
-  import {$, MixinQueryRouter, pushByName} from '@/simpli'
+  import {$, PageCollection, WholeCollection, MixinQueryRouter, pushByName} from '@/simpli'
 
   @Component({
     mixins: [MixinQueryRouter],
   })
   export default class List<%-model.name%>View extends Mixins<MixinQueryRouter>() {
-    collection = new PagedResp(<%-model.name%>)
+    collection = new PageCollection(<%-model.name%>)
 <%_ if (model.resource.deletable) { _%>
     toRemove = new <%-model.name%>()
 <%_ } _%>
@@ -114,7 +112,7 @@
 
 <%_ } _%>
     async downloadCsv() {
-      const csv = new All(<%-model.name%>)
+      const csv = new WholeCollection(<%-model.name%>)
 
       const fetch = async () => await csv.search()
       await $.await.run(fetch, 'downloadCsv')
diff --git a/packages/@simpli/cli-scaffold/generator/injected/src/views/persist/PersistTemplateView.vue b/packages/@simpli/cli-scaffold/generator/injected/src/views/persist/PersistTemplateView.vue
@@ -37,10 +37,7 @@
 <%_ for (var i in model.resolvedPersistDependencies) { var dependence = model.resolvedPersistDependencies[i] _%>
   <%-dependence.build()%>
 <%_ } _%>
-<%_ if (model.resolvedPersistDependencies.length) { _%>
-  import All from '@/model/collection/All'
-<%_ } _%>
-  import {$, successAndPush} from '@/simpli'
+  import {$, WholeCollection, successAndPush} from '@/simpli'
 
   @Component
   export default class Persist<%-model.name%>View extends Vue {
diff --git a/packages/@simpli/cli-scaffold/generator/template/_env.development b/packages/@simpli/cli-scaffold/generator/template/_env.development
@@ -1,4 +1,3 @@
 <%_ var config = rootOptions.scaffoldSetup _%>
-<%_ var appNameKebabCase = rootOptions.scaffoldSetup.kebabCase(rootOptions.scaffoldSetup.appName) _%>
 VUE_APP_API_URL=<%-config.apiUrlDev%>
-VUE_APP_SOCKET_URL=ws://localhost:8080/<%-appNameKebabCase%>/ws
+VUE_APP_SOCKET_URL=<%-config.socketUrlDev%>
diff --git a/packages/@simpli/cli-scaffold/generator/template/_env.production b/packages/@simpli/cli-scaffold/generator/template/_env.production
@@ -1,4 +1,3 @@
 <%_ var config = rootOptions.scaffoldSetup _%>
-<%_ var appNameKebabCase = rootOptions.scaffoldSetup.kebabCase(rootOptions.scaffoldSetup.appName) _%>
 VUE_APP_API_URL=<%-config.apiUrlProd%>
-VUE_APP_SOCKET_URL=ws://localhost:8080/<%-appNameKebabCase%>/ws
+VUE_APP_SOCKET_URL=<%-config.socketUrlProd%>
diff --git a/packages/@simpli/cli-scaffold/generator/template/src/components/modals/ModalRemove.vue b/packages/@simpli/cli-scaffold/generator/template/src/components/modals/ModalRemove.vue
@@ -19,8 +19,6 @@
 
 <script lang="ts">
   import {Component, Prop, Vue} from 'vue-property-decorator'
-  import {PageCollection, Resource} from '@/simpli'
-  import PagedResp from '@/model/collection/PagedResp'
 
   @Component
   export default class ModalRemove extends Vue {
diff --git a/packages/@simpli/cli-scaffold/generator/template/src/model/collection/All.ts b/packages/@simpli/cli-scaffold/generator/template/src/model/collection/All.ts
diff --git a/packages/@simpli/cli-scaffold/generator/template/src/model/collection/PagedResp.ts b/packages/@simpli/cli-scaffold/generator/template/src/model/collection/PagedResp.ts
diff --git a/packages/@simpli/cli-server/generator/index.js b/packages/@simpli/cli-server/generator/index.js
@@ -58,6 +58,9 @@ module.exports = (api, options) => {
     api.renderFrom('./injected', 'src/main/locale/EnUs.kt', `../java/${dir}/locale/EnUs.kt`)
     api.renderFrom('./injected', 'src/main/locale/PtBr.kt', `../java/${dir}/locale/PtBr.kt`)
 
+    // main/model/collection
+    api.renderFrom('./injected', 'src/main/model/collection/PageCollection.kt', `../../java/${dir}/model/collection/PageCollection.kt`)
+
     // main/param
     api.renderFrom('./injected', 'src/main/param/DefaultParam.kt', `../java/${dir}/param/DefaultParam.kt`)
 
@@ -109,17 +112,17 @@ module.exports = (api, options) => {
     // main/dao
     api.renderFrom('./injected', 'src/main/dao/TemplateDao.kt', `../java/${dir}/dao/${table.modelName}Dao.kt`, data)
 
-    // main/model
-    api.renderFrom('./injected', 'src/main/model/Template.kt', `../java/${dir}/model/${table.modelName}.kt`, data)
+    // main/model/resource
+    api.renderFrom('./injected', 'src/main/model/resource/Template.kt', `../../java/${dir}/model/resource/${table.modelName}.kt`, data)
 
     // main/module/process
     api.renderFrom('./injected', 'src/main/module/process/TemplateProcess.kt', `../../java/${dir}/${moduleName}/process/${table.modelName}Process.kt`, data)
 
     // main/module/router
     api.renderFrom('./injected', 'src/main/module/router/TemplateRouter.kt', `../../java/${dir}/${moduleName}/router/${table.modelName}Router.kt`, data)
 
-    // test/model
-    api.renderFrom('./injected', 'src/test/model/TemplateTest.kt', `../java/${dir}/model/${table.modelName}Test.kt`, data)
+    // test/model/resource
+    api.renderFrom('./injected', 'src/test/model/resource/TemplateTest.kt', `../../java/${dir}/model/resource/${table.modelName}Test.kt`, data)
 
     // test/module/process
     api.renderFrom('./injected', 'src/test/module/process/TemplateProcessTest.kt', `../../java/${dir}/${moduleName}/process/${table.modelName}ProcessTest.kt`, data)
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/dao/TemplateDao.kt b/packages/@simpli/cli-server/generator/injected/src/main/dao/TemplateDao.kt
@@ -2,7 +2,7 @@
 package <%-packageAddress%>.dao
 
 <%_ if (!table.isPivot) { _%>
-import <%-packageAddress%>.model.<%-table.modelName%>
+import <%-packageAddress%>.model.resource.<%-table.modelName%>
 import java.sql.Connection
 import java.util.ArrayList
 import java.util.Date
@@ -13,7 +13,7 @@ import br.com.simpli.sql.Dao
 <%_ var cache = [] _%>
 <%_ for (var i in table.foreignColumns) { var column = table.foreignColumns[i] _%>
 <%_ if (!cache.includes(column.foreign.referencedTableModelName)) { _%>
-import <%-packageAddress%>.model.<%-column.foreign.referencedTableModelName%>
+import <%-packageAddress%>.model.resource.<%-column.foreign.referencedTableModelName%>
 <%_ cache.push(column.foreign.referencedTableModelName) _%>
 <%_ } _%>
 <%_ } _%>
@@ -40,7 +40,7 @@ class <%-table.modelName%>Dao(con: Connection, lang: LanguageHolder) : Dao(con,
             """, { rs -> <%-table.modelName%>(rs) }, <%-table.primariesByComma(true)%>)
     }
 
-    fun list(): List<<%-table.modelName%>> {
+    fun list(): MutableList<<%-table.modelName%>> {
         // TODO: review generated method
         return selectList("""
             SELECT *
@@ -56,7 +56,8 @@ class <%-table.modelName%>Dao(con: Connection, lang: LanguageHolder) : Dao(con,
         page: Int?,
         limit: Int?,
         orderRequest: String?,
-        asc: Boolean?): List<<%-table.modelName%>> {
+        asc: Boolean?
+    ): MutableList<<%-table.modelName%>> {
         // TODO: review generated method
         val orderRequestAndColumn = HashMap<String, String>()
 
@@ -218,7 +219,7 @@ class <%-table.modelName%>Dao(con: Connection, lang: LanguageHolder) : Dao(con,
             <%-columnRef.name%>).affectedRows
     }
 
-    fun list<%-columnRef.foreign.referencedTableModelName%>Of<%-columnCross.foreign.referencedTableModelName%>(<%-columnCross.name%>: <%-columnCross.kotlinType%>): List<<%-columnRef.foreign.referencedTableModelName%>> {
+    fun list<%-columnRef.foreign.referencedTableModelName%>Of<%-columnCross.foreign.referencedTableModelName%>(<%-columnCross.name%>: <%-columnCross.kotlinType%>): MutableList<<%-columnRef.foreign.referencedTableModelName%>> {
         // TODO: review generated method
         return selectList("""
             SELECT *
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/model/collection/PageCollection.kt b/packages/@simpli/cli-server/generator/injected/src/main/model/collection/PageCollection.kt
@@ -0,0 +1,10 @@
+<%_ var packageAddress = options.serverSetup.packageAddress _%>
+package <%-packageAddress%>.model.collection
+
+/**
+ * PageCollection
+ * @author Simpli CLI generator
+ */
+open class PageCollection<T>(var items: List<T>) {
+    var total: Int = 0
+}
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/model/resource/Template.kt b/packages/@simpli/cli-server/generator/injected/src/main/model/resource/Template.kt
@@ -1,5 +1,5 @@
 <%_ var packageAddress = options.serverSetup.packageAddress _%>
-package <%-packageAddress%>.model
+package <%-packageAddress%>.model.resource
 
 import <%-packageAddress%>.dao.<%-table.modelName%>Dao
 import <%-packageAddress%>.exception.response.BadRequestException
@@ -43,7 +43,7 @@ class <%-table.modelName%> : ModelWrapper<<%-table.modelName%>Dao> {
 <%_ if (!relation.isManyToMany) { _%>
     var <%-relation.name%>: <%-relation.referencedTableModelName%>? = null
 <%_ } else { _%>
-    var <%-relation.name%>: List<<%-relation.referencedTableModelName%>>? = null
+    var <%-relation.name%>: MutableList<<%-relation.referencedTableModelName%>>? = null
 <%_ } _%>
 <%_ } _%>
 <%_ if (table.validRelations.length) { _%>
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/auth/AuthDao.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/auth/AuthDao.kt
@@ -5,7 +5,7 @@
 <%_ var passwordColumn = options.serverSetup.passwordColumn _%>
 package <%-packageAddress%>.<%-moduleName%>.auth
 
-import <%-packageAddress%>.model.<%-userTable.modelName%>
+import <%-packageAddress%>.model.resource.<%-userTable.modelName%>
 import br.com.simpli.model.LanguageHolder
 import br.com.simpli.sql.Dao
 import java.sql.Connection
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/auth/AuthProcess.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/auth/AuthProcess.kt
@@ -11,7 +11,7 @@ import <%-packageAddress%>.wrapper.ProcessWrapper
 import <%-packageAddress%>.exception.response.BadRequestException
 import <%-packageAddress%>.exception.response.NotFoundException
 import <%-packageAddress%>.exception.response.UnauthorizedException
-import <%-packageAddress%>.model.<%-userTable.modelName%>
+import <%-packageAddress%>.model.resource.<%-userTable.modelName%>
 import <%-packageAddress%>.app.Cast.classToJson
 import <%-packageAddress%>.app.Cast.jsonToClass
 import <%-packageAddress%>.<%-moduleName%>.mail.ResetPasswordMail
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/mail/ResetPasswordMail.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/mail/ResetPasswordMail.kt
@@ -5,7 +5,7 @@
 package <%-packageAddress%>.<%-moduleName%>.mail
 
 import <%-packageAddress%>.wrapper.MailWrapper
-import <%-packageAddress%>.model.<%-userTable.modelName%>
+import <%-packageAddress%>.model.resource.<%-userTable.modelName%>
 import br.com.simpli.model.LanguageHolder
 
 /**
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/process/TemplateProcess.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/process/TemplateProcess.kt
@@ -8,11 +8,11 @@ import <%-packageAddress%>.dao.<%-table.modelName%>Dao
 import <%-packageAddress%>.dao.<%-m2m.pivotModelName%>Dao
 <%_ } _%>
 <%_ } _%>
-import <%-packageAddress%>.model.<%-table.modelName%>
+import <%-packageAddress%>.model.collection.PageCollection
+import <%-packageAddress%>.model.resource.<%-table.modelName%>
 import <%-packageAddress%>.exception.response.BadRequestException
 import <%-packageAddress%>.exception.response.NotFoundException
 import <%-packageAddress%>.wrapper.ProcessWrapper
-import br.com.simpli.model.PagedResp
 
 /**
  * <%-table.modelName%> business logic
@@ -26,12 +26,12 @@ class <%-table.modelName%>Process : ProcessWrapper() {
         dao = <%-table.modelName%>Dao(con, lang)
     }
 
-    fun list(request: <%-table.modelName%>.ListParam): PagedResp<<%-table.modelName%>> {
+    fun list(request: <%-table.modelName%>.ListParam): PageCollection<<%-table.modelName%>> {
         // TODO: review generated method
         val list = dao.list(request.query, request.page, request.limit, request.orderRequest, request.asc)
 
-        val resp = PagedResp(list)
-        resp.recordsTotal = dao.count(request.query)
+        val resp = PageCollection(list)
+        resp.total = dao.count(request.query)
 
         return resp
     }
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/response/AuthResponse.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/response/AuthResponse.kt
@@ -4,7 +4,7 @@
 <%_ var accountColumn = options.serverSetup.accountColumn _%>
 package <%-packageAddress%>.<%-moduleName%>.response
 
-import <%-packageAddress%>.model.<%-userTable.modelName%>
+import <%-packageAddress%>.model.resource.<%-userTable.modelName%>
 import <%-packageAddress%>.<%-moduleName%>.socket.NotificationSocket
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/module/router/TemplateRouter.kt b/packages/@simpli/cli-server/generator/injected/src/main/module/router/TemplateRouter.kt
@@ -7,8 +7,8 @@ package <%-packageAddress%>.<%-moduleName%>.router
 import <%-packageAddress%>.<%-moduleName%>.gateway.AuthGateway
 import <%-packageAddress%>.<%-moduleName%>.process.<%-table.modelName%>Process
 import <%-packageAddress%>.wrapper.RouterWrapper
-import <%-packageAddress%>.model.<%-table.modelName%>
-import br.com.simpli.model.PagedResp
+import <%-packageAddress%>.model.collection.PageCollection
+import <%-packageAddress%>.model.resource.<%-table.modelName%>
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import javax.ws.rs.BeanParam
@@ -44,7 +44,7 @@ class <%-table.modelName%>Router : RouterWrapper() {
 
     @GET
     @ApiOperation(tags = ["<%-table.modelName%>"], value = "Lists the instances from <%-table.modelName%>")
-    fun list<%-table.modelName%>(@BeanParam param: <%-table.modelName%>.ListParam): PagedResp<<%-table.modelName%>> {
+    fun list<%-table.modelName%>(@BeanParam param: <%-table.modelName%>.ListParam): PageCollection<<%-table.modelName%>> {
         // TODO: review generated method
         return connection(authGateway).handle(process, param) {
 			it.list(param)
diff --git a/packages/@simpli/cli-server/generator/injected/src/main/wrapper/SocketWrapper.kt b/packages/@simpli/cli-server/generator/injected/src/main/wrapper/SocketWrapper.kt
@@ -2,13 +2,7 @@
 package <%-packageAddress%>.wrapper
 
 import <%-packageAddress%>.app.Cast.classToJson
-import <%-packageAddress%>.app.Env.DEBUG_MODE
-import <%-packageAddress%>.app.RequestLogger
-import <%-packageAddress%>.exception.response.NotFoundException
-import <%-packageAddress%>.wrapper.RouterWrapper
 import java.nio.ByteBuffer
-import java.util.logging.Level
-import java.util.logging.Logger
 import javax.websocket.Session
 
 /**
diff --git a/packages/@simpli/cli-server/generator/injected/src/test/model/resource/TemplateTest.kt b/packages/@simpli/cli-server/generator/injected/src/test/model/resource/TemplateTest.kt
@@ -1,5 +1,5 @@
 <%_ var packageAddress = options.serverSetup.packageAddress _%>
-package <%-packageAddress%>.model
+package <%-packageAddress%>.model.resource
 
 import <%-packageAddress%>.AppTest
 import <%-packageAddress%>.dao.<%-table.modelName%>Dao
diff --git a/packages/@simpli/cli-server/generator/injected/src/test/module/ProcessTest.kt b/packages/@simpli/cli-server/generator/injected/src/test/module/ProcessTest.kt
@@ -12,7 +12,7 @@ import <%-packageAddress%>.<%-moduleName%>.response.AuthResponse
 import <%-packageAddress%>.app.Env.TESTER_ID
 import <%-packageAddress%>.app.Env.TESTER_LOGIN
 import <%-packageAddress%>.app.Env.TESTER_PASSWORD
-import <%-packageAddress%>.model.<%-userTable.modelName%>
+import <%-packageAddress%>.model.resource.<%-userTable.modelName%>
 import br.com.simpli.tools.SecurityUtils.sha256
 
 /**
diff --git a/packages/@simpli/cli-server/generator/injected/src/test/module/process/TemplateProcessTest.kt b/packages/@simpli/cli-server/generator/injected/src/test/module/process/TemplateProcessTest.kt
@@ -6,10 +6,10 @@ package <%-packageAddress%>.<%-moduleName%>.process
 import <%-packageAddress%>.<%-moduleName%>.ProcessTest
 import <%-packageAddress%>.exception.response.BadRequestException
 import <%-packageAddress%>.exception.response.NotFoundException
-import <%-packageAddress%>.model.<%-table.modelName%>
+import <%-packageAddress%>.model.resource.<%-table.modelName%>
 <%_ for (var i in table.manyToMany) { var m2m = table.manyToMany[i] _%>
 <%_ if (m2m.crossRelationModelName !== table.modelName) { _%>
-import <%-packageAddress%>.model.<%-m2m.crossRelationModelName%>
+import <%-packageAddress%>.model.resource.<%-m2m.crossRelationModelName%>
 <%_ } _%>
 <%_ } _%>
 import java.util.Date
@@ -59,8 +59,8 @@ class <%-table.modelName%>ProcessTest : ProcessTest() {
     @Test
     fun testList() {
         val result = subject.list(Request.list)
-        assertFalse(result.list.isEmpty())
-        assertNotEquals(0, result.recordsTotal)
+        assertFalse(result.items.isEmpty())
+        assertNotEquals(0, result.total)
     }
 
     @Test
@@ -69,9 +69,9 @@ class <%-table.modelName%>ProcessTest : ProcessTest() {
         Request.list.limit = 1
 
         val result = subject.list(Request.list)
-        assertFalse(result.list.isEmpty())
-        assertNotEquals(0, result.recordsTotal)
-        assertTrue(result.list.size <= Request.list.limit ?: 0)
+        assertFalse(result.items.isEmpty())
+        assertNotEquals(0, result.total)
+        assertTrue(result.items.size <= Request.list.limit ?: 0)
     }
 
     @Test
diff --git a/packages/@simpli/cli-server/generator/template/pom.xml b/packages/@simpli/cli-server/generator/template/pom.xml
@@ -9,7 +9,7 @@
   <properties>
     <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <kotlin.version>1.2.51</kotlin.version>
+    <kotlin.version>1.2.71</kotlin.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/packages/@simpli/cli/lib/scaffold/Swagger.js b/packages/@simpli/cli/lib/scaffold/Swagger.js
@@ -316,7 +316,7 @@ module.exports = class Swagger {
   }
 
   static async requestSync (scaffoldSetup) {
-    const availableModels = scaffoldSetup.exceptPagedRespModels
+    const availableModels = scaffoldSetup.availableModels
 
     const { syncModelNames } = await inquirer.prompt([
       {
diff --git a/packages/@simpli/cli/lib/scaffold/defaultSwagger.json b/packages/@simpli/cli/lib/scaffold/defaultSwagger.json
@@ -347,7 +347,7 @@
           "200":{
             "description":"successful operation",
             "schema":{
-              "$ref":"#/definitions/PagedRespUser"
+              "$ref":"#/definitions/PageCollectionUser"
             }
           }
         }
@@ -539,7 +539,7 @@
         }
       }
     },
-    "PagedRespUser":{
+    "PageCollectionUser":{
       "type":"object",
       "properties":{
         "list":{
diff --git a/packages/@simpli/cli/lib/scaffold/setup/Model.js b/packages/@simpli/cli/lib/scaffold/setup/Model.js
diff --git a/packages/@simpli/cli/lib/scaffold/setup/ScaffoldSetup.js b/packages/@simpli/cli/lib/scaffold/setup/ScaffoldSetup.js
