Стабильная версия

src/main/java/com/tsc/bitbucketbot/domain/change/ChangeType.java

@@ -2,6 +2,6 @@ package com.tsc.bitbucketbot.domain.change;
 
 public enum ChangeType {
 
-    STATUS_PR, UPDATE_PR, REVIEWERS, NEW_PR
+    STATUS_PR, UPDATE_PR, REVIEWERS, NEW_PR, CONFLICT_PR
 
 }

src/main/java/com/tsc/bitbucketbot/domain/change/ConflictPrChange.java

@@ -0,0 +1,21 @@
+package com.tsc.bitbucketbot.domain.change;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Singular;
+
+import java.util.Set;
+
+@Getter
+public class ConflictPrChange extends PrChange {
+
+    @Builder
+    private ConflictPrChange(
+            @Singular("telegramId") Set<Long> telegramId,
+            String name,
+            String url
+    ) {
+        super(ChangeType.CONFLICT_PR, telegramId, name, url);
+    }
+
+}

src/main/java/com/tsc/bitbucketbot/domain/entity/PullRequest.java

@@ -86,4 +86,7 @@ public class PullRequest {
     @Column(name = "update_date")
     private LocalDateTime updateDate;
 
+    @Column(name = "conflict")
+    private boolean conflict;
+
 }

src/main/java/com/tsc/bitbucketbot/dto/bitbucket/MergeResult.java

@@ -0,0 +1,10 @@
+package com.tsc.bitbucketbot.dto.bitbucket;
+
+import lombok.Data;
+
+@Data
+public class MergeResult {
+
+    private Outcome outcome;
+
+}

src/main/java/com/tsc/bitbucketbot/dto/bitbucket/Outcome.java

@@ -0,0 +1,8 @@
+package com.tsc.bitbucketbot.dto.bitbucket;
+
+public enum Outcome {
+
+    CONFLICTED,
+    CLEAN
+
+}

src/main/java/com/tsc/bitbucketbot/dto/bitbucket/Properties.java

@@ -0,0 +1,10 @@
+package com.tsc.bitbucketbot.dto.bitbucket;
+
+import lombok.Data;
+
+@Data
+public class Properties {
+
+    private MergeResult mergeResult;
+
+}

src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestJson.java

@@ -31,5 +31,6 @@ public class PullRequestJson {
     private UserDecisionJson author;
     private List<UserDecisionJson> reviewers;
     private FromRefJson fromRef;
+    private Properties properties;
 
 }

src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerChangeParsing.java

@@ -1,6 +1,7 @@
 package com.tsc.bitbucketbot.scheduler;
 
 import com.tsc.bitbucketbot.domain.change.Change;
+import com.tsc.bitbucketbot.domain.change.ConflictPrChange;
 import com.tsc.bitbucketbot.domain.change.NewPrChange;
 import com.tsc.bitbucketbot.domain.change.ReviewersPrChange;
 import com.tsc.bitbucketbot.domain.change.StatusPrChange;
@@ -59,6 +60,9 @@ public class SchedulerChangeParsing {
             case UPDATE_PR:
                 message = Message.generate(((UpdatePrChange) change));
                 break;
+            case CONFLICT_PR:
+                message = Message.generate(((ConflictPrChange) change));
+                break;
             default:
                 throw new NotFoundException("Нет обработчика для типа " + change.getType().name());
         }

src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerPullRequest.java

@@ -4,6 +4,7 @@ import com.tsc.bitbucketbot.config.BitbucketConfig;
 import com.tsc.bitbucketbot.domain.IdAndStatusPr;
 import com.tsc.bitbucketbot.domain.PullRequestStatus;
 import com.tsc.bitbucketbot.domain.ReviewerStatus;
+import com.tsc.bitbucketbot.domain.change.ConflictPrChange;
 import com.tsc.bitbucketbot.domain.change.NewPrChange;
 import com.tsc.bitbucketbot.domain.change.ReviewersPrChange;
 import com.tsc.bitbucketbot.domain.change.StatusPrChange;
@@ -12,6 +13,7 @@ import com.tsc.bitbucketbot.domain.entity.PullRequest;
 import com.tsc.bitbucketbot.domain.entity.Reviewer;
 import com.tsc.bitbucketbot.domain.entity.User;
 import com.tsc.bitbucketbot.domain.util.ReviewerChange;
+import com.tsc.bitbucketbot.dto.bitbucket.PullRequestJson;
 import com.tsc.bitbucketbot.dto.bitbucket.sheet.PullRequestSheetJson;
 import com.tsc.bitbucketbot.service.ChangeService;
 import com.tsc.bitbucketbot.service.PullRequestsService;
@@ -56,7 +58,7 @@ public class SchedulerPullRequest {
     private final BitbucketConfig bitbucketConfig;
 
     @Scheduled(fixedRate = 30000)
-    public void checkOldPullRequest() {
+    public void checkPullRequest() {
         final Set<Long> existsId = pullRequestsService.getAllId(STATUSES).stream()
                 .map(IdAndStatusPr::getId)
                 .collect(Collectors.toSet());
@@ -97,29 +99,17 @@ public class SchedulerPullRequest {
             Optional<PullRequestSheetJson> sheetJson = Utils.urlToJson(bitbucketConfig.getUrlPullRequestClose(), user.getToken(), PullRequestSheetJson.class);
             while (sheetJson.isPresent() && sheetJson.get().getValues() != null && !sheetJson.get().getValues().isEmpty()) {
                 final PullRequestSheetJson bitbucketSheet = sheetJson.get();
-                final List<PullRequest> newPrs = bitbucketSheet.getValues().stream()
+                final Map<Long, PullRequest> existsPr = getExistsPr(bitbucketSheet.getValues());
-                        .map(jsonPr -> conversionService.convert(jsonPr, PullRequest.class))
+                final Set<PullRequest> pullRequests = pullRequestsService.getAllById(existsPr.keySet());
-                        .peek(pullRequest -> pullRequestsService.getIdByBitbucketIdAndReposId(pullRequest.getBitbucketId(), pullRequest.getRepositoryId()).ifPresent(pullRequest::setId))
+                if (!existsPr.isEmpty() && !pullRequests.isEmpty()) {
-                        .filter(pullRequest -> pullRequest.getId() != null)
+                    processingUpdateClosePr(existsPr, pullRequests);
-                        .collect(Collectors.toList());
+                    ids.addAll(
-                for (PullRequest pullRequest : newPrs) {
+                            pullRequestsService.updateAll(existsPr.values()).stream()
-                    changeService.add(
+                                    .map(PullRequest::getId)
-                            StatusPrChange.builder()
+                                    .collect(Collectors.toSet())
-                                    .name(pullRequest.getName())
-                                    .url(pullRequest.getUrl())
-                                    .oldStatus(pullRequest.getStatus())
-                                    .newStatus(OPEN)
-                                    .telegramId(pullRequest.getAuthor().getTelegramId())
-                                    .build()
                     );
                 }
 
-                ids.addAll(
-                        pullRequestsService.updateAll(newPrs).stream()
-                                .map(PullRequest::getId)
-                                .collect(Collectors.toSet())
-                );
-
                 if (bitbucketSheet.getNextPageStart() != null) {
                     sheetJson = Utils.urlToJson(bitbucketConfig.getUrlPullRequestClose() + bitbucketSheet.getNextPageStart(), bitbucketConfig.getToken(), PullRequestSheetJson.class);
                 } else {
@@ -137,15 +127,10 @@ public class SchedulerPullRequest {
             Optional<PullRequestSheetJson> sheetJson = Utils.urlToJson(bitbucketConfig.getUrlPullRequestOpen(), user.getToken(), PullRequestSheetJson.class);
             while (sheetJson.isPresent() && sheetJson.get().getValues() != null && !sheetJson.get().getValues().isEmpty()) {
                 final PullRequestSheetJson jsonSheet = sheetJson.get();
-                final Map<Long, PullRequest> existsPr = jsonSheet.getValues().stream()
+                final Map<Long, PullRequest> existsPr = getExistsPr(jsonSheet.getValues());
-                        .filter(Objects::nonNull)
-                        .map(pullRequestJson -> conversionService.convert(pullRequestJson, PullRequest.class))
-                        .peek(pullRequest -> pullRequestsService.getIdByBitbucketIdAndReposId(pullRequest.getBitbucketId(), pullRequest.getRepositoryId()).ifPresent(pullRequest::setId))
-                        .filter(pullRequest -> pullRequest.getId() != null)
-                        .collect(Collectors.toMap(PullRequest::getId, pullRequest -> pullRequest));
                 final Set<PullRequest> pullRequests = pullRequestsService.getAllById(existsPr.keySet());
                 if (!existsPr.isEmpty() && !pullRequests.isEmpty()) {
-                    processingUpdate(existsPr, pullRequests);
+                    processingUpdateOpenPr(existsPr, pullRequests);
                     ids.addAll(
                             pullRequestsService.updateAll(existsPr.values()).stream()
                                     .map(PullRequest::getId)
@@ -163,12 +148,44 @@ public class SchedulerPullRequest {
         return ids;
     }
 
+    private Map<Long, PullRequest> getExistsPr(List<PullRequestJson> pullRequestJsons) {
+        return pullRequestJsons.stream()
+                .filter(Objects::nonNull)
+                .map(pullRequestJson -> conversionService.convert(pullRequestJson, PullRequest.class))
+                .peek(pullRequest -> pullRequestsService.getIdByBitbucketIdAndReposId(pullRequest.getBitbucketId(), pullRequest.getRepositoryId()).ifPresent(pullRequest::setId))
+                .filter(pullRequest -> pullRequest.getId() != null)
+                .collect(Collectors.toMap(PullRequest::getId, pullRequest -> pullRequest));
+    }
+
     @NonNull
-    private void processingUpdate(Map<Long, PullRequest> newPullRequests, Set<PullRequest> pullRequests) {
+    private void processingUpdateOpenPr(Map<Long, PullRequest> newPullRequests, Set<PullRequest> pullRequests) {
         for (PullRequest pullRequest : pullRequests) {
             PullRequest newPullRequest = newPullRequests.get(pullRequest.getId());
-            processingAuthor(pullRequest, newPullRequest);
+            changeStatusPR(pullRequest, newPullRequest);
+            changeReviewersPR(pullRequest, newPullRequest);
             processingReviewer(pullRequest, newPullRequest);
+            conflictPr(pullRequest, newPullRequest);
+        }
+    }
+
+    @NonNull
+    private void processingUpdateClosePr(Map<Long, PullRequest> newPullRequests, Set<PullRequest> pullRequests) {
+        for (PullRequest pullRequest : pullRequests) {
+            PullRequest newPullRequest = newPullRequests.get(pullRequest.getId());
+            changeStatusPR(pullRequest, newPullRequest);
+        }
+    }
+
+    @NonNull
+    private void conflictPr(PullRequest pullRequest, PullRequest newPullRequest) {
+        if (newPullRequest.isConflict() && !pullRequest.isConflict()) {
+            changeService.add(
+                    ConflictPrChange.builder()
+                            .name(pullRequest.getName())
+                            .url(pullRequest.getUrl())
+                            .telegramId(pullRequest.getAuthor().getTelegramId())
+                            .build()
+            );
         }
     }
 
@@ -189,12 +206,6 @@ public class SchedulerPullRequest {
         }
     }
 
-    @NonNull
-    private void processingAuthor(PullRequest pullRequest, PullRequest newPullRequest) {
-        changeStatusPR(pullRequest, newPullRequest);
-        changeReviewersPR(pullRequest, newPullRequest);
-    }
-
     @NonNull
     private boolean isUpdatePr(PullRequest pullRequest, PullRequest newPullRequest) {
         LocalDateTime oldDate = pullRequest.getUpdateDate();

src/main/java/com/tsc/bitbucketbot/service/converter/PullRequestJsonConverter.java

@@ -5,6 +5,8 @@ import com.tsc.bitbucketbot.domain.ReviewerStatus;
 import com.tsc.bitbucketbot.domain.entity.PullRequest;
 import com.tsc.bitbucketbot.domain.entity.Reviewer;
 import com.tsc.bitbucketbot.domain.entity.User;
+import com.tsc.bitbucketbot.dto.bitbucket.Outcome;
+import com.tsc.bitbucketbot.dto.bitbucket.Properties;
 import com.tsc.bitbucketbot.dto.bitbucket.PullRequestJson;
 import com.tsc.bitbucketbot.dto.bitbucket.PullRequestState;
 import com.tsc.bitbucketbot.dto.bitbucket.UserDecisionJson;
@@ -32,6 +34,7 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
                 .version(json.getVersion())
                 .createDate(json.getCreatedDate())
                 .updateDate(json.getUpdatedDate())
+                .conflict(convertConflict(json.getProperties()))
                 .description(convertDescription(json.getDescription()))
                 .repositoryId(json.getFromRef().getRepository().getId())
                 .author(this.convertUser(json.getAuthor().getUser()))
@@ -44,6 +47,13 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
                 .build();
     }
 
+    private boolean convertConflict(Properties properties) {
+        return properties != null
+                && properties.getMergeResult() != null
+                && properties.getMergeResult().getOutcome() != null
+                && Outcome.CONFLICTED.equals(properties.getMergeResult().getOutcome());
+    }
+
     private String convertDescription(String description) {
         if (description != null) {
             return description.length() > 180 ? description.substring(0, 180) + "..." : description;

src/main/java/com/tsc/bitbucketbot/utils/Message.java

@@ -1,5 +1,6 @@
 package com.tsc.bitbucketbot.utils;
 
+import com.tsc.bitbucketbot.domain.change.ConflictPrChange;
 import com.tsc.bitbucketbot.domain.change.NewPrChange;
 import com.tsc.bitbucketbot.domain.change.ReviewersPrChange;
 import com.tsc.bitbucketbot.domain.change.StatusPrChange;
@@ -98,6 +99,11 @@ public class Message {
                 Smile.TWO_BR;
     }
 
+    public static String generate(@NonNull ConflictPrChange change) {
+        return Smile.DANGEROUS + "*Внимание конфлик в ПР*" + Smile.HR +
+                link(change.getName(), change.getUrl()) + Smile.TWO_BR;
+    }
+
     @NonNull
     public static String goodMorningStatistic(List<PullRequest> pullRequestsReviews, List<PullRequest> pullRequestsNeedWork) {
         StringBuilder message = new StringBuilder().append(Smile.SUN).append(" Доброе утро ").append(Smile.SUN).append(Smile.HR);

src/main/resources/liquibase/change-log.xml

@@ -7,5 +7,6 @@
     <include file="liquibase/change-set/v1.2.0.xml"/>
     <include file="liquibase/change-set/v1.3.0.xml"/>
     <include file="liquibase/change-set/v1.4.0.xml"/>
+    <include file="liquibase/change-set/v2.0.0.xml"/>
 
 </databaseChangeLog>

src/main/resources/liquibase/change-set/v2.0.0.xml

@@ -0,0 +1,18 @@
+<databaseChangeLog
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet id="add-column-pr-conflict" author="upagge">
+        <addColumn tableName="pull_request" schemaName="public" catalogName="pg_catalog">
+            <column name="conflict" type="boolean"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="default-pr-conflict" author="upagge">
+        <update tableName="pull_request" schemaName="public" catalogName="pg_catalog">
+            <column name="conflict" value="false" type="boolean"/>
+        </update>
+    </changeSet>
+
+</databaseChangeLog>