Доработки

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

View File

@ -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)"/>

View File

@ -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;

View File

@ -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())
);

View File

@ -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) {