enable to load flow group

Author: gy2006

core/src/main/java/com/flowci/core/flow/controller/FlowController.java

@@ -43,15 +43,19 @@ public class FlowController {
 
     private final FlowService flowService;
 
+    private final FlowGroupService flowGroupService;
+
     private final FlowItemService flowItemService;
 
     public FlowController(List<Template> templates,
                           UserService userService,
                           FlowService flowService,
+                          FlowGroupService flowGroupService,
                           FlowItemService flowItemService) {
         this.templates = templates;
         this.userService = userService;
         this.flowService = flowService;
+        this.flowGroupService = flowGroupService;
         this.flowItemService = flowItemService;
     }
 
@@ -69,8 +73,12 @@ public List<Template> getTemplates() {
 
     @GetMapping(value = "/{name}")
     @Action(FlowAction.GET)
-    public Flow get(@PathVariable String name) {
-        return flowService.get(name);
+    public Flow get(@PathVariable String name, @RequestParam boolean group) {
+        var flow = flowService.get(name);
+        if (group && flow.hasParentId()) {
+            flow.setParent(flowGroupService.getById(flow.getParentId()));
+        }
+        return flow;
     }
 
     @GetMapping(value = "/{name}/exist")

core/src/main/java/com/flowci/core/flow/domain/Flow.java

@@ -17,6 +17,7 @@
 package com.flowci.core.flow.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.flowci.core.common.domain.Variables;
 import com.flowci.domain.StringVars;
 import com.flowci.domain.VarValue;
@@ -29,6 +30,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Objects;
@@ -84,6 +86,10 @@ public static void validateName(String name) {
 
     private WebhookStatus webhookStatus;
 
+    @JsonInclude()
+    @Transient
+    private FlowGroup parent;
+
     public Flow() {
         this.type = Type.Flow;
     }

core/src/main/java/com/flowci/core/flow/domain/FlowItem.java

@@ -40,7 +40,7 @@ public enum Type {
     protected String parentId = ROOT_ID;
 
     public boolean hasParentId() {
-        return StringHelper.hasValue(parentId);
+        return StringHelper.hasValue(parentId) && !parentId.equals(ROOT_ID);
     }
 
     public boolean hasRootParent() {

core/src/main/java/com/flowci/core/flow/service/FlowGroupService.java

@@ -9,6 +9,8 @@ public interface FlowGroupService {
 
     FlowGroup get(String name);
 
+    FlowGroup getById(String id);
+
     List<Flow> flows(String id);
 
     FlowGroup create(String name);

core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java

@@ -49,6 +49,15 @@ public FlowGroup get(String name) {
         return optional.get();
     }
 
+    @Override
+    public FlowGroup getById(String id) {
+        Optional<FlowGroup> optional = flowGroupDao.findById(id);
+        if (optional.isEmpty()) {
+            throw new NotFoundException("Group {0} not found", id);
+        }
+        return optional.get();
+    }
+
     @Override
     public FlowGroup create(String name) {
         var email = sessionManager.getUserEmail();