[app-platform] 修复模板相关逻辑 (#258)

Co-authored-by: lizhichao51 <[email protected]>

Author: lizhichao51

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/converters/impl/AppVersionToTemplateConverter.java

@@ -36,20 +36,26 @@ public Class<AppTemplate> target() {
     public AppTemplate convert(Object appVersion) {
         return Optional.ofNullable(appVersion)
                 .map(ObjectUtils::<AppVersion>cast)
-                .map(s -> AppTemplate.builder()
-                        .id(s.getData().getId())
-                        .name(s.getData().getName())
-                        .builtType(s.getData().getAppBuiltType())
-                        .appType(s.getData().getAppType())
-                        .category(s.getData().getAppCategory())
-                        .attributes(s.getAttributes())
+                .map(appVersionObj -> AppTemplate.builder()
+                        .id(appVersionObj.getData().getId())
+                        .name(appVersionObj.getData().getName())
+                        .builtType(appVersionObj.getData().getAppBuiltType())
+                        .appType(appVersionObj.getData().getAppType())
+                        .category(appVersionObj.getData().getAppCategory())
+                        .attributes(appVersionObj.getAttributes())
                         .like(0)
                         .collection(0)
                         .usage(0)
                         .version("1.0.0")
-                        .configId(s.getData().getConfigId())
-                        .flowGraphId(s.getData().getFlowGraphId())
-                        .createBy(s.getData().getCreateBy())
+                        .configId(appVersionObj.getData().getConfigId())
+                        .flowGraphId(appVersionObj.getData().getFlowGraphId())
+                        .createBy(appVersionObj.getData().getCreateBy())
+                        .createAt(appVersionObj.getData().getCreateAt())
+                        .updateBy(appVersionObj.getData().getUpdateBy())
+                        .updateAt(appVersionObj.getData().getUpdateAt())
+                        .config(appVersionObj.getConfig())
+                        .flowGraph(appVersionObj.getFlowGraph())
+                        .formProperties(appVersionObj.getFormProperties())
                         .build())
                 .orElse(null);
     }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/AppVersion.java

@@ -771,10 +771,7 @@ public TemplateInfoDto publishTemplate(TemplateAppCreateDto createDto, Operation
         this.data.setAppId(newAppID);
 
         // 只保留模板相关的属性.
-        this.attributes = this.attributes.entrySet()
-                .stream()
-                .filter(e -> TEMPLATE_DEFAULT_ATTRIBUTE_KEYS.contains(e.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        this.attributes.keySet().retainAll(TEMPLATE_DEFAULT_ATTRIBUTE_KEYS);
 
         // 创建参数设置.
         if (createDto != null) {
@@ -806,6 +803,7 @@ public TemplateInfoDto publishTemplate(TemplateAppCreateDto createDto, Operation
         graph.setUpdateAt(now);
 
         AppTemplate template = this.converterFactory.convert(this, AppTemplate.class);
+        this.templateFactory.setRepositories(template);
         this.templateFactory.save(template);
         String icon = this.getIcon();
         if (StringUtils.isNotBlank(icon)) {

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/service/impl/AppVersionServiceImpl.java

@@ -237,8 +237,10 @@ public AppVersion createByTemplate(AppTemplate template, OperationContext contex
         AppVersion appVersion = this.appVersionFactory.create(new AppBuilderAppPo(), this.repository);
         appVersion.getData().setConfigId(template.getConfigId());
         appVersion.getData().setFlowGraphId(template.getFlowGraphId());
+        appVersion.getData().setId(template.getId());
         appVersion.cloneVersion(TemplateUtils.toAppCreateDTO(template), DEFAULT_APP_VERSION, AppTypeEnum.APP.name(),
                 context);
+        appVersion.getData().setState(AppState.INACTIVE.getName());
         this.save(appVersion);
         return appVersion;
     }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/util/TemplateUtils.java

@@ -95,7 +95,7 @@ public static AppBuilderApp convertToAppBuilderApp(AppTemplate template) {
                 .name(template.getName())
                 .configId(template.getConfigId())
                 .flowGraphId(template.getFlowGraphId())
-                .type(AppTypeEnum.TEMPLATE.code())
+                .type(AppTypeEnum.APP.code())
                 .appType(template.getAppType())
                 .version(INIT_VERSION)
                 .attributes(template.getAttributes())

app-builder/jane/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/util/TemplateUtilsTest.java

@@ -54,6 +54,6 @@ void testAppTemplateConvertToAppBuilderApp() {
         assertThat(app).extracting(AppBuilderApp::getId,
                 AppBuilderApp::getVersion,
                 AppBuilderApp::getState,
-                AppBuilderApp::getType).containsExactly("123456789", "1.0.0", "inactive", "template");
+                AppBuilderApp::getType).containsExactly("123456789", "1.0.0", "inactive", "app");
     }
 }