merge

TheOpenCloudEngine · Jan 6, 2020 · 3bb3d3b · 3bb3d3b
2 parents b6035c2 + c9c3917
commit 3bb3d3b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "json2yaml": "^1.1.0",
     "jszip": "^3.2.2",
     "mustache": "^3.1.0",
+    "pluralize": "^8.0.0",
     "pusher": "^2.2.0",
     "pusher-js": "^4.4.0",
     "register-service-worker": "^1.5.2",

diff --git a/public/static/image/logo_change.png b/public/static/image/logo_change.png
diff --git a/public/static/templates/spring-boot/for-model/gateway/src/main/resources/application.yml b/public/static/templates/spring-boot/for-model/gateway/src/main/resources/application.yml
@@ -11,7 +11,7 @@ spring:
         - id: {{name}}
           uri: http://localhost:{{portGenerated}}
           predicates:
-            - Path={{#aggregates}}/{{name}}s/**{{/aggregates}}
+            - Path={{#aggregates}}/{{namePlural}}/**{{/aggregates}}
         {{/boundedContexts}}
       globalcors:
         corsConfigurations:
@@ -35,7 +35,7 @@ spring:
         - id: {{name}}
           uri: http://{{name}}:8080
           predicates:
-            - Path={{#aggregates}}/{{name}}s/**{{/aggregates}}
+            - Path={{#aggregates}}/{{namePlural}}/**{{/aggregates}}
         {{/boundedContexts}}
       globalcors:
         corsConfigurations:

diff --git a/public/static/templates/spring-boot/src/main/java/com/eventstorming/Entity.java b/public/static/templates/spring-boot/src/main/java/com/eventstorming/Entity.java
@@ -19,16 +19,6 @@ public class {{namePascalCase}} {
     private {{className}} {{nameCamelCase}};
     {{/aggregateRoot.fieldDescriptors}}
 
-    {{#aggregateRoot.fieldDescriptors}}
-    public {{className}} get{{namePascalCase}}() {
-        return {{nameCamelCase}};
-    }
-
-    public void set{{namePascalCase}}({{className}} {{nameCamelCase}}) {
-        this.{{nameCamelCase}} = {{nameCamelCase}};
-    }
-    {{/aggregateRoot.fieldDescriptors}}
-
 
 {{#events}}
     {{trigger}}
@@ -40,4 +30,14 @@ public class {{namePascalCase}} {
     }
 {{/events}}
 
+{{#aggregateRoot.fieldDescriptors}}
+    public {{className}} get{{namePascalCase}}() {
+        return {{nameCamelCase}};
+    }
+
+    public void set{{namePascalCase}}({{className}} {{nameCamelCase}}) {
+        this.{{nameCamelCase}} = {{nameCamelCase}};
+    }
+{{/aggregateRoot.fieldDescriptors}}
+
 }
diff --git a/src/components/designer/class-modeling/elements/AggregateDefinition.vue b/src/components/designer/class-modeling/elements/AggregateDefinition.vue
@@ -82,6 +82,7 @@
                 return {
                     _type: this.className(),
                     name: '',
+                    namePlural: '',
                     namePascalCase: '',
                     nameCamelCase: '',
                     elementView: {

diff --git a/src/components/designer/class-modeling/elements/BoundedContext.vue b/src/components/designer/class-modeling/elements/BoundedContext.vue
@@ -60,6 +60,7 @@
                     description_text: '이벤트의 내용을 정의하고 시스템의 경계를 구분\n.',
                     _type: this.className(),
                     name: 'BoundedContext'+x,
+                    namePlural: '',
                     aggregates:[],
                     elementView: {
                         '_type': this.className(),

diff --git a/src/components/designer/class-modeling/elements/CommandDefinition.vue b/src/components/designer/class-modeling/elements/CommandDefinition.vue
@@ -85,6 +85,7 @@
                         '(UI 혹은 API)',
                     _type: this.className(),
                     name: '',
+                    namePlural: '',
                     namePascalCase: '',
                     nameCamelCase:'',
                     aggregate: [] ,

diff --git a/src/components/designer/class-modeling/elements/DomainEventDefinition.vue b/src/components/designer/class-modeling/elements/DomainEventDefinition.vue
@@ -82,7 +82,6 @@
             className() {
                 return 'org.uengine.model.Event'
             },
-
             createNew(elementId, x, y, width, height, angle) {
                 return {
                     description_text: '도메인 전문가가 정의함. \n' +
@@ -108,6 +107,7 @@
                     checkValue: false,
                     drawer: false,
                     selected: false,
+                    namePlural: '',
                     editing: false,
                     eventToPolicy: '',
                     trigger: '@PrePersist',

diff --git a/src/components/designer/class-modeling/elements/PolicyDefinition.vue b/src/components/designer/class-modeling/elements/PolicyDefinition.vue
@@ -90,6 +90,7 @@
                     namePascalCase: '',
                     aggregate:[],
                     aggregateId: '',
+                    namePlural: '',
                     boundedContext: '',
                     elementView: {
                         '_type': this.className(),

diff --git a/src/components/designer/class-modeling/elements/ViewDefinition.vue b/src/components/designer/class-modeling/elements/ViewDefinition.vue
@@ -82,6 +82,7 @@
                     aggregateId:'',
                     aggregate:[],
                     namePascalCase: '',
+                    namePlural: '',
                     elementView: {
                         '_type': this.className(),
                         'id': elementId,

diff --git a/src/components/designer/modeling/ModelingPropertyPanel.vue b/src/components/designer/modeling/ModelingPropertyPanel.vue
@@ -324,7 +324,8 @@
 <script>
     var _ = require('lodash')
     var googleTranslate = require('google-translate')(process.env.VUE_APP_TRANSLATE_KEY);
-    var changeCase = require('change-case')
+    var changeCase = require('change-case');
+    var pluralize = require('pluralize');
     //https://www.npmjs.com/package/change-case
 
     export default {
@@ -560,6 +561,8 @@
                     if (me.value._type == 'org.uengine.model.Event' || me.value._type == 'org.uengine.model.Command' || me.value._type == 'org.uengine.model.Policy' || me.value._type == 'org.uengine.model.Aggregate') {
                         me.value.namePascalCase = changeCase.pascalCase(newVal)
                         me.value.nameCamelCase = changeCase.camelCase(newVal)
+                        me.value.namePlural = pluralize(newVal);
+                        console.log(me.value.namePlural, me.value.namePascalCase, me.value.nameCamelCase)
                     }
                 }, 200
             ),