Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

Доработки

Browse Source
This commit is contained in:
uPagge 2021-02-13 01:25:14 +03:00
parent 82a730c616
commit dcd91b8c01
No known key found for this signature in database
GPG Key ID: 964B40928E4C9088
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bot-app/src/main/resources/liquibase/v.1.0.0/2021-01-14-create-tables.xml
View File

@ -161,9 +161,6 @@
<constraints nullable="false" foreignKeyName="merge_request_author_id_person_id" <constraints nullable="false" foreignKeyName="merge_request_author_id_person_id"
references="person(id)"/> references="person(id)"/>
</column> </column>
<column name="system" type="boolean">
<constraints nullable="false"/>
</column>
<column name="noteable_id" type="int"/> <column name="noteable_id" type="int"/>
<column name="noteable_type" type="varchar(100)"/> <column name="noteable_type" type="varchar(100)"/>
<column name="resolvable" type="varchar(6)"/> <column name="resolvable" type="varchar(6)"/>

3
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java
View File

@ -40,9 +40,6 @@ public class Note implements BasicEntity<Long> {
@JoinColumn(name = "author_id") @JoinColumn(name = "author_id")
private Person author; private Person author;
@Column(name = "system")
private boolean system;
@Column(name = "noteable_id") @Column(name = "noteable_id")
private Long noteableId; private Long noteableId;

1
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java
View File

@ -25,6 +25,7 @@ public class DiscussionJsonConverter implements Converter<DiscussionJson, Discus
discussion.setId(source.getId()); discussion.setId(source.getId());
discussion.setNotes( discussion.setNotes(
source.getNotes().stream() source.getNotes().stream()
.filter(noteJson -> !noteJson.isSystem())
.map(noteJsonConvert::convert) .map(noteJsonConvert::convert)
.collect(Collectors.toList()) .collect(Collectors.toList())
); );

1
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java
View File

@ -29,7 +29,6 @@ public class NoteJsonConvert implements Converter<NoteJson, Note> {
note.setUpdated(source.getUpdated()); note.setUpdated(source.getUpdated());
note.setNoteableId(source.getNoteableId()); note.setNoteableId(source.getNoteableId());
note.setNoteableIid(source.getNoteableIid()); note.setNoteableIid(source.getNoteableIid());
note.setSystem(source.isSystem());
note.setResolved(source.getResolved()); note.setResolved(source.getResolved());
note.setResolvable(source.isResolvable()); note.setResolvable(source.isResolvable());
if (source.getResolvedBy() != null) { if (source.getResolvedBy() != null) {