From 42ab851117f036ac336b3dae4c909a8a2a9ac742 Mon Sep 17 00:00:00 2001
From: upagge <upagge@icloud.com>
Date: Wed, 16 Sep 2020 06:35:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=8F=D0=B2=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/pullrequest/ReviewersPrChange.java |  4 ++--
 .../service/impl/CommentServiceImpl.java      |  2 +-
 .../service/impl/PullRequestsServiceImpl.java | 24 ++++++++++++++++++-
 .../service/impl/TaskServiceImpl.java         |  2 +-
 .../v.2.0.0/2020-09-06-create-table.xml       |  2 +-
 .../v.2.0.0/2020-09-06-cumulative.xml         |  1 +
 .../v.2.0.0/2020-09-15-fix-task-comments.xml  | 24 +++++++++++++++++++
 7 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml

diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ReviewersPrChange.java b/src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ReviewersPrChange.java
index cb9c72e..1723667 100644
--- a/src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ReviewersPrChange.java
+++ b/src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ReviewersPrChange.java
@@ -63,9 +63,9 @@ public class ReviewersPrChange extends PrChange {
                     );
         }
         final String createMessage = stringBuilder.toString();
-        return Smile.PEN + " *Изменения ревьюверов вашего ПР*" +
+        return Smile.PEN + " *Изменения ревьюверов PullRequest*" +
                 Smile.HR +
-                "[" + title + "](" + url + ")\n" +
+                "[" + title + "](" + url + ")" + Smile.HR +
                 createMessage;
     }
 }
diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/CommentServiceImpl.java b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/CommentServiceImpl.java
index 60e4bba..9be3b29 100644
--- a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/CommentServiceImpl.java
+++ b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/CommentServiceImpl.java
@@ -125,7 +125,7 @@ public class CommentServiceImpl extends AbstractSimpleManagerService<Comment, Lo
     private void updateAnswer(Comment oldComment, Comment newComment) {
         final Set<Long> oldAnswerIds = oldComment.getAnswers();
         final Set<Long> newAnswerIds = newComment.getAnswers();
-        if (!newAnswerIds.isEmpty()) {
+        if (!oldAnswerIds.equals(newAnswerIds)) {
             final Set<Long> existsNewAnswersIds = commentRepository.existsById(newAnswerIds);
             final List<Comment> newAnswers = commentRepository.findAllById(existsNewAnswersIds).stream()
                     .filter(comment -> !oldAnswerIds.contains(comment.getId()))
diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/PullRequestsServiceImpl.java b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/PullRequestsServiceImpl.java
index 71ad4a3..fc4f9e4 100644
--- a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/PullRequestsServiceImpl.java
+++ b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/PullRequestsServiceImpl.java
@@ -14,6 +14,7 @@ import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
 import org.sadtech.bot.bitbucketbot.domain.change.pullrequest.ConflictPrChange;
 import org.sadtech.bot.bitbucketbot.domain.change.pullrequest.NewPrChange;
 import org.sadtech.bot.bitbucketbot.domain.change.pullrequest.ReviewersPrChange;
+import org.sadtech.bot.bitbucketbot.domain.change.pullrequest.StatusPrChange;
 import org.sadtech.bot.bitbucketbot.domain.change.pullrequest.UpdatePrChange;
 import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
 import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
@@ -104,8 +105,8 @@ public class PullRequestsServiceImpl extends AbstractSimpleManagerService<PullRe
         oldPullRequest.setConflict(pullRequest.isConflict());
         oldPullRequest.setTitle(pullRequest.getTitle());
         oldPullRequest.setDescription(pullRequest.getDescription());
-        oldPullRequest.setStatus(pullRequest.getStatus());
         updateReviewers(oldPullRequest, pullRequest);
+        updateStatus(oldPullRequest, pullRequest);
 
         final PullRequest newPullRequest = pullRequestsRepository.save(oldPullRequest);
         if (!pullRequest.getBitbucketVersion().equals(newPullRequest.getBitbucketVersion())) {
@@ -122,6 +123,27 @@ public class PullRequestsServiceImpl extends AbstractSimpleManagerService<PullRe
         return newPullRequest;
     }
 
+    private void updateStatus(PullRequest oldPullRequest, PullRequest newPullRequest) {
+        final PullRequestStatus oldStatus = oldPullRequest.getStatus();
+        final PullRequestStatus newStatus = newPullRequest.getStatus();
+        if (!oldStatus.equals(newStatus)) {
+            changeService.save(
+                    StatusPrChange.builder()
+                            .name(newPullRequest.getTitle())
+                            .url(oldPullRequest.getUrl())
+                            .newStatus(newStatus)
+                            .oldStatus(oldStatus)
+                            .telegramIds(
+                                    personService.getAllTelegramIdByLogin(
+                                            Collections.singleton(oldPullRequest.getAuthorLogin())
+                                    )
+                            )
+                            .build()
+            );
+            oldPullRequest.setStatus(newStatus);
+        }
+    }
+
     private void updateReviewers(PullRequest oldPullRequest, PullRequest newPullRequest) {
         final Map<String, Reviewer> oldReviewers = oldPullRequest.getReviewers().stream()
                 .collect(Collectors.toMap(Reviewer::getPersonLogin, reviewer -> reviewer));
diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/TaskServiceImpl.java b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/TaskServiceImpl.java
index 6cb9f42..740fbf6 100644
--- a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/TaskServiceImpl.java
@@ -126,7 +126,7 @@ public class TaskServiceImpl extends AbstractSimpleManagerService<Task, Long> im
     private void updateAnswer(Task oldTask, Task task) {
         final Set<Long> oldAnswerIds = oldTask.getAnswers();
         final Set<Long> newAnswerIds = task.getAnswers();
-        if (!newAnswerIds.isEmpty()) {
+        if (!oldAnswerIds.equals(newAnswerIds)) {
             final Set<Long> existsNewAnswersIds = commentService.existsById(newAnswerIds);
             final List<Comment> newAnswers = commentService.getAllById(existsNewAnswersIds).stream()
                     .filter(comment -> !oldAnswerIds.contains(comment.getId()))
diff --git a/src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml b/src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml
index 1aa4394..02d3a18 100644
--- a/src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml
+++ b/src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml
@@ -174,7 +174,7 @@
         </createTable>
     </changeSet>
 
-    <changeSet id="2020-09-08-create-table-" author="">
+    <changeSet id="2020-09-08-create-table-task-comments" author="upagge">
         <createTable tableName="task_comments">
             <column name="task_id" type="integer">
                 <constraints nullable="false" foreignKeyName="task_comments_task_id_task_id" references="task(id)"/>
diff --git a/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml b/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
index 5ec625e..2ff2041 100644
--- a/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
+++ b/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
@@ -4,5 +4,6 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
     <include file="liquibase/v.2.0.0/2020-09-06-create-table.xml"/>
+    <include file="liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml"/>
 
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml b/src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml
new file mode 100644
index 0000000..de774df
--- /dev/null
+++ b/src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml
@@ -0,0 +1,24 @@
+<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="2020-09-15-drop-constraint-task-comments" author="upagge">
+        <dropForeignKeyConstraint baseTableName="task_comments" constraintName="task_comments_comment_id_comment_id"/>
+        <dropForeignKeyConstraint baseTableName="task_comments" constraintName="task_comments_task_id_task_id"/>
+    </changeSet>
+
+    <changeSet id="2020-09-15-create-constraint-task-comments" author="upagge">
+        <addNotNullConstraint tableName="task_comments" columnName="comment_id"/>
+        <addNotNullConstraint tableName="task_comments" columnName="task_id"/>
+        <addForeignKeyConstraint baseTableName="task_comments" baseColumnNames="comment_id"
+                                 constraintName="task_comments_comment_id_comment_id"
+                                 referencedTableName="comment"
+                                 referencedColumnNames="id" onDelete="CASCADE"/>
+        <addForeignKeyConstraint baseTableName="task_comments" baseColumnNames="task_id"
+                                 constraintName="task_comments_task_id_task_id"
+                                 referencedTableName="task"
+                                 referencedColumnNames="id" onDelete="CASCADE"/>
+    </changeSet>
+
+</databaseChangeLog>