You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ir...@apache.org on 2020/06/10 16:30:27 UTC

[ignite-teamcity-bot] branch master updated: Cleanup team tags if issue on board is partially fixed - Fixes #164.

This is an automated email from the ASF dual-hosted git repository.

irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/master by this push:
     new 4194d17  Cleanup team tags if issue on board is partially fixed - Fixes #164.
4194d17 is described below

commit 4194d17fce37bf039362539b54770c14ad4f45a3
Author: sergeyuttsel <ut...@gmail.com>
AuthorDate: Wed Jun 10 19:30:05 2020 +0300

    Cleanup team tags if issue on board is partially fixed - Fixes #164.
    
    Signed-off-by: Ivan Rakov <iv...@gmail.com>
---
 .../java/org/apache/ignite/tcbot/engine/board/BoardService.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
index 9042e1e..809f686 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -112,7 +113,6 @@ public class BoardService {
             Map<Integer, DefectFirstBuild> build = next.buildsInvolved();
             for (DefectFirstBuild cause : build.values()) {
                 FatBuildCompacted firstBuild = cause.build();
-                defectUi.addTags(SingleBuildRunCtx.getBuildTagsFromParameters(cfg, compactor, firstBuild));
                 FatBuildCompacted fatBuild = fatBuildDao.getFatBuild(next.tcSrvId(), firstBuild.id());
 
                 List<Future<FatBuildCompacted>> futures = buildChainProcessor.replaceWithRecent(fatBuild, allBuildsMap, tcIgn);
@@ -124,9 +124,12 @@ public class BoardService {
 
                 rebuild = !freshRebuild.isEmpty() ? freshRebuild.stream().findFirst() : Optional.empty();
 
+                Set<String> tags = SingleBuildRunCtx.getBuildTagsFromParameters(cfg, compactor, firstBuild);
+
                 for (DefectIssue issue : cause.issues()) {
                     BoardDefectIssueUi issueUi = processIssue(tcIgn, rebuild, issue, firstBuild.buildTypeId());
-
+                    if (issueUi.status() != IssueResolveStatus.FIXED)
+                        defectUi.addTags(tags);
                     defectUi.addIssue(issueUi);
                 }
             }