From dcd91b8c011c74a1194cd8dcc382fa6f0e5d0062 Mon Sep 17 00:00:00 2001
From: uPagge <git@upagge.ru>
Date: Sat, 13 Feb 2021 01:25:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml   | 3 ---
 .../org/sadtech/bot/gitlab/context/domain/entity/Note.java     | 3 ---
 .../gitlab/core/service/convert/DiscussionJsonConverter.java   | 1 +
 .../bot/gitlab/core/service/convert/NoteJsonConvert.java       | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/bot-app/src/main/resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml b/bot-app/src/main/resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml
index c718ad9..dcdd9bf 100644
--- a/bot-app/src/main/resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml
+++ b/bot-app/src/main/resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml
@@ -161,9 +161,6 @@
                 <constraints nullable="false" foreignKeyName="merge_request_author_id_person_id"
                              references="person(id)"/>
             </column>
-            <column name="system" type="boolean">
-                <constraints nullable="false"/>
-            </column>
             <column name="noteable_id" type="int"/>
             <column name="noteable_type" type="varchar(100)"/>
             <column name="resolvable" type="varchar(6)"/>
diff --git a/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java
index a1e4197..08e8b0c 100644
--- a/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java
+++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java
@@ -40,9 +40,6 @@ public class Note implements BasicEntity<Long> {
     @JoinColumn(name = "author_id")
     private Person author;
 
-    @Column(name = "system")
-    private boolean system;
-
     @Column(name = "noteable_id")
     private Long noteableId;
 
diff --git a/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java
index 6a30ac9..299c3e8 100644
--- a/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java
+++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java
@@ -25,6 +25,7 @@ public class DiscussionJsonConverter implements Converter<DiscussionJson, Discus
         discussion.setId(source.getId());
         discussion.setNotes(
                 source.getNotes().stream()
+                        .filter(noteJson -> !noteJson.isSystem())
                         .map(noteJsonConvert::convert)
                         .collect(Collectors.toList())
         );
diff --git a/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java
index e4b6178..85ca806 100644
--- a/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java
+++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java
@@ -29,7 +29,6 @@ public class NoteJsonConvert implements Converter<NoteJson, Note> {
         note.setUpdated(source.getUpdated());
         note.setNoteableId(source.getNoteableId());
         note.setNoteableIid(source.getNoteableIid());
-        note.setSystem(source.isSystem());
         note.setResolved(source.getResolved());
         note.setResolvable(source.isResolvable());
         if (source.getResolvedBy() != null) {