create flow item service to handle loading list

Author: gy2006

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

@@ -17,18 +17,15 @@
 package com.flowci.core.flow.controller;
 
 import com.flowci.core.auth.annotation.Action;
-import com.flowci.core.flow.domain.ConfirmOption;
-import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Flow.Status;
-import com.flowci.core.flow.domain.FlowAction;
-import com.flowci.core.flow.domain.Template;
+import com.flowci.core.flow.domain.*;
+import com.flowci.core.flow.service.FlowGroupService;
+import com.flowci.core.flow.service.FlowItemService;
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.user.service.UserService;
 import com.flowci.domain.SimpleAuthPair;
 import com.flowci.domain.SimpleKeyPair;
 import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -40,19 +37,32 @@
 @RequestMapping("/flows")
 public class FlowController {
 
-    @Autowired
-    private List<Template> templates;
+    private final List<Template> templates;
 
-    @Autowired
-    private UserService userService;
+    private final UserService userService;
 
-    @Autowired
-    private FlowService flowService;
+    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;
+    }
 
     @GetMapping
     @Action(FlowAction.LIST)
-    public List<Flow> list() {
-        return flowService.list(Status.CONFIRMED);
+    public List<FlowItem> list() {
+        return flowItemService.list();
     }
 
     @GetMapping("/templates")
@@ -70,23 +80,13 @@ public Flow get(@PathVariable String name) {
     @GetMapping(value = "/{name}/exist")
     @Action(FlowAction.CHECK_NAME)
     public Boolean exist(@PathVariable String name) {
-        return flowService.exist(name);
+        return flowItemService.existed(name);
     }
 
     @PostMapping(value = "/{name}")
     @Action(FlowAction.CREATE)
-    public Flow create(@PathVariable String name,
-                       @RequestParam(required = false) String groupId) {
-        if (groupId != null) {
-            return flowService.create(name, groupId);
-        }
-        return flowService.create(name);
-    }
-
-    @PostMapping(value = "/{name}/confirm")
-    @Action(FlowAction.CONFIRM)
-    public Flow confirm(@PathVariable String name, @RequestBody ConfirmOption option) {
-        return flowService.confirm(name, option);
+    public Flow create(@PathVariable String name, @RequestBody CreateOption option) {
+        return flowService.create(name, option);
     }
 
     @DeleteMapping("/{name}")

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

@@ -8,9 +8,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Set;
-
 @RestController
 @RequestMapping("/flow_groups")
 public class FlowGroupController {
@@ -30,12 +27,6 @@ public FlowGroup create(@PathVariable String name) {
         return flowGroupService.create(name);
     }
 
-    @PostMapping
-    @Action(FlowAction.GROUP_READ)
-    public List<FlowGroup> list(@RequestBody Set<String> ids) {
-        return flowGroupService.list(ids);
-    }
-
     @PostMapping("/{groupName}/{flowName}")
     @Action(FlowAction.GROUP_UPDATE)
     public void addToGroup(@PathVariable String groupName, @PathVariable String flowName) {

core/src/main/java/com/flowci/core/flow/dao/FlowDao.java

@@ -17,7 +17,6 @@
 package com.flowci.core.flow.dao;
 
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Flow.Status;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
@@ -33,11 +32,7 @@ public interface FlowDao extends MongoRepository<Flow, String> {
 
     Optional<Flow> findByName(String name);
 
-    List<Flow> findAllByStatus(Status status);
-
     List<Flow> findAllByParentId(String parentId);
 
-    List<Flow> findAllByStatusAndCreatedBy(Status status, String createdBy);
-
-    List<Flow> findAllByIdInAndStatus(Collection<String> id, Status status);
+    List<Flow> findAllByIdIn(Collection<String> id);
 }

core/src/main/java/com/flowci/core/flow/dao/FlowItemDao.java

@@ -0,0 +1,16 @@
+package com.flowci.core.flow.dao;
+
+import com.flowci.core.flow.domain.FlowItem;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+
+@Repository
+public interface FlowItemDao extends MongoRepository<FlowItem, String> {
+
+    List<FlowItem> findAllByIdInOrderByCreatedAt(Collection<String> ids);
+
+    boolean existsByName(String name);
+}

core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java renamed to core/src/main/java/com/flowci/core/flow/domain/CreateOption.java

@@ -26,42 +26,18 @@
  */
 @Data
 @Accessors(chain = true)
-public class ConfirmOption {
+public class CreateOption {
 
-    private static final String BlankTitle = "_blank_";
+    private String groupName;
 
-    private String gitUrl;
-
-    private String secret;
-
-    /**
-     * Yaml in base64
-     */
-    private String yaml = StringHelper.EMPTY;
-
-    /**
-     * Template name (desc), yaml property will be ignored if it is defined
-     */
     @JsonProperty("title")
     private String templateTitle;
 
-    public boolean hasGitUrl() {
-        return StringHelper.hasValue(gitUrl);
-    }
-
-    public boolean hasSecret() {
-        return StringHelper.hasValue(secret);
-    }
-
-    public boolean hasYml() {
-        return StringHelper.hasValue(yaml);
+    public boolean hasGroupName() {
+        return StringHelper.hasValue(groupName);
     }
 
     public boolean hasTemplateTitle() {
         return StringHelper.hasValue(templateTitle);
     }
-
-    public boolean hasBlankTemplate() {
-        return BlankTitle.equalsIgnoreCase(templateTitle);
-    }
 }

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

@@ -44,7 +44,12 @@
 public final class Flow extends FlowItem implements Pathable {
 
     private static final Set<String> reservedFlowNames = ImmutableSet.<String>builder()
+            .add("flow")
             .add("flows")
+            .add("group")
+            .add("groups")
+            .add("template")
+            .add("templates")
             .build();
 
     public static Pathable path(String id) {
@@ -64,14 +69,6 @@ public static void validateName(String name) {
         }
     }
 
-    public enum Status {
-        PENDING,
-
-        CONFIRMED
-    }
-
-    private Status status = Status.PENDING;
-
     private boolean isYamlFromRepo;
 
     private String yamlRepoBranch = "master";

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

@@ -27,8 +27,6 @@ public abstract class FlowAction {
 
     public static final String CHECK_NAME = "check_name";
 
-    public static final String CONFIRM = "confirm_flow";
-
     public static final String UPDATE = "update_flow_settings";
 
     public static final String DELETE = "delete_flow";
@@ -63,7 +61,6 @@ public abstract class FlowAction {
     public static final List<String> ALL = ImmutableList.of(
             CREATE,
             CHECK_NAME,
-            CONFIRM,
             DELETE,
             UPDATE,
             LIST,

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

@@ -9,11 +9,13 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = true)
-public abstract class FlowItem extends Mongoable {
+@Document("flow")
+public class FlowItem extends Mongoable {
 
     public enum Type {
         Flow,

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

@@ -0,0 +1,15 @@
+package com.flowci.core.flow.service;
+
+import com.flowci.core.flow.domain.FlowItem;
+
+import java.util.List;
+
+/**
+ * The service used to list all flow items that available for current user
+ */
+public interface FlowItemService {
+
+    List<FlowItem> list();
+
+    boolean existed(String name);
+}

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

@@ -0,0 +1,37 @@
+package com.flowci.core.flow.service;
+
+import com.flowci.core.common.manager.SessionManager;
+import com.flowci.core.flow.dao.FlowItemDao;
+import com.flowci.core.flow.dao.FlowUserDao;
+import com.flowci.core.flow.domain.FlowItem;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FlowItemServiceImpl implements FlowItemService {
+
+    private final FlowItemDao flowItemDao;
+
+    private final FlowUserDao flowUserDao;
+
+    private final SessionManager sessionManager;
+
+    public FlowItemServiceImpl(FlowItemDao flowItemDao, FlowUserDao flowUserDao, SessionManager sessionManager) {
+        this.flowItemDao = flowItemDao;
+        this.flowUserDao = flowUserDao;
+        this.sessionManager = sessionManager;
+    }
+
+    @Override
+    public List<FlowItem> list() {
+        var email = sessionManager.getUserEmail();
+        List<String> flows = flowUserDao.findAllFlowsByUserEmail(email);
+        return flowItemDao.findAllByIdInOrderByCreatedAt(flows);
+    }
+
+    @Override
+    public boolean existed(String name) {
+        return flowItemDao.existsByName(name);
+    }
+}