improve how to check flow is existed

Author: gy2006

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

@@ -21,19 +21,21 @@
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author yang
  */
 @Repository
 public interface FlowDao extends MongoRepository<Flow, String> {
 
-    Flow findByName(String name);
+    Optional<Flow> findByName(String name);
 
     List<Flow> findAllByStatus(Status status);
 
     List<Flow> findAllByStatusAndCreatedBy(Status status, String createdBy);
 
-    List<Flow> findAllByIdInAndStatus(Iterable<String> id, Status status);
+    List<Flow> findAllByIdInAndStatus(Collection<String> id, Status status);
 }

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

@@ -141,27 +141,25 @@ public List<Flow> listByCredential(String secretName) {
 
     @Override
     public Boolean exist(String name) {
-        try {
-            Flow flow = get(name);
-            return flow.getStatus() != Status.PENDING;
-        } catch (NotFoundException e) {
+        Optional<Flow> optional = flowDao.findByName(name);
+        if (optional.isEmpty()) {
             return false;
         }
+        return optional.get().getStatus() == Status.CONFIRMED;
     }
 
     @Override
     public Flow create(String name) {
         Flow.validateName(name);
         String email = sessionManager.getUserEmail();
 
-        Flow flow = flowDao.findByName(name);
-        if (flow != null && flow.getStatus() == Status.CONFIRMED) {
+        if (exist(name)) {
             throw new DuplicateException("Flow {0} already exists", name);
         }
 
         // reuse from pending list
         List<Flow> pending = flowDao.findAllByStatusAndCreatedBy(Status.PENDING, email);
-        flow = pending.size() > 0 ? pending.get(0) : new Flow();
+        var flow = pending.size() > 0 ? pending.get(0) : new Flow();
 
         // set properties
         flow.setName(name);
@@ -231,11 +229,12 @@ public Flow confirm(String name, ConfirmOption option) {
 
     @Override
     public Flow get(String name) {
-        Flow flow = flowDao.findByName(name);
-        if (Objects.isNull(flow)) {
+        Optional<Flow> optional = flowDao.findByName(name);
+
+        if (optional.isEmpty()) {
             throw new NotFoundException("Flow {0} is not found", name);
         }
-        return flow;
+        return optional.get();
     }
 
     @Override
@@ -322,8 +321,13 @@ public void deleteUserFromFlow(UserDeletedEvent event) {
     @EventListener
     public void onGitHookEvent(GitHookEvent event) {
         GitTrigger trigger = event.getTrigger();
-        Flow flow = flowDao.findByName(event.getFlow());
+        Optional<Flow> optional = flowDao.findByName(event.getFlow());
+        if (optional.isEmpty()) {
+            log.warn("The flow {} doesn't exist", event.getFlow());
+            return;
+        }
 
+        var flow = optional.get();
         if (event.isPingEvent()) {
             GitPingTrigger ping = (GitPingTrigger) trigger;