Issue #1711 Pipeline Runs shall not be deleted with parent Pipeline -…

… fix pipelineName for pause/resume operations
epam · Apr 22, 2021 · 280db60 · 280db60
1 parent c3c8012
commit 280db60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/api/src/main/java/com/epam/pipeline/manager/notification/NotificationAspect.java b/api/src/main/java/com/epam/pipeline/manager/notification/NotificationAspect.java
@@ -16,11 +16,9 @@
 
 package com.epam.pipeline.manager.notification;
 
-import com.epam.pipeline.entity.pipeline.Pipeline;
 import com.epam.pipeline.entity.pipeline.PipelineRun;
 import com.epam.pipeline.entity.pipeline.run.RunStatus;
 import com.epam.pipeline.entity.utils.DateUtils;
-import com.epam.pipeline.manager.pipeline.PipelineManager;
 import com.epam.pipeline.manager.pipeline.RunStatusManager;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -40,9 +38,6 @@ public class NotificationAspect {
     private static final Logger LOGGER = LoggerFactory.getLogger(NotificationAspect.class);
     public static final String RESUME_RUN_FAILED = "Resume run failed.";
 
-    @Autowired
-    private PipelineManager pipelineManager;
-
     @Autowired
     private NotificationManager notificationManager;
 
@@ -78,20 +73,9 @@ public void notifyRunStatusChanged(JoinPoint joinPoint, PipelineRun run) {
                           run.getVersion(), run.getStatus());
             return;
         }
-
-        if (run.getPipelineName() == null) {
-            if (run.getPipelineId() != null) {
-                Pipeline pipeline = pipelineManager.load(run.getPipelineId());
-                run.setPipelineName(pipeline.getName());
-            } else {
-                run.setPipelineName("pipeline");
-            }
-        }
-
         LOGGER.debug("Notify all about pipelineRun status changed {} {} {}: {}",
                      run.getPodId(), run.getPipelineName(), run.getVersion(), run.getStatus());
         notificationManager.notifyRunStatusChanged(run);
     }
-
 }
 
diff --git a/api/src/main/java/com/epam/pipeline/mapper/PipelineRunMapper.java b/api/src/main/java/com/epam/pipeline/mapper/PipelineRunMapper.java
@@ -22,6 +22,7 @@
 import com.epam.pipeline.config.JsonMapper;
 import com.epam.pipeline.entity.pipeline.PipelineRun;
 import com.epam.pipeline.entity.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public final class PipelineRunMapper {
     private static final int SECONDS_IN_MINUTE = 60;
@@ -41,6 +42,10 @@ public static Map<String, Object> map(PipelineRun run, Long threshold, Long dura
         Map<String, Object> params = mapper.convertValue(run, mapper.getTypeFactory()
             .constructParametricType(Map.class, String.class, Object.class));
 
+        if (StringUtils.isBlank(run.getPipelineName())) {
+            params.put("pipelineName", PipelineRun.DEFAULT_PIPELINE_NAME);
+        }
+
         if (threshold != null) {
             params.put("timeThreshold", threshold / SECONDS_IN_MINUTE);
         }