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:
Руслан Дергачев 2023-02-03 10:58:39 +03:00
parent f9b5b86bb1
commit 2d90c751a2
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/DeferredMessage.java
View File

@ -23,4 +23,6 @@ public class DeferredMessage {
private String message; private String message;
@Column (name = "time") @Column (name = "time")
private LocalDateTime time; private LocalDateTime time;
@Column (name = "type")
private String type;
} }

66
bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DelayedNotifyServiceImpl.java
View File

@ -12,8 +12,10 @@ import dev.struchkov.bot.gitlab.context.domain.notify.task.TaskCloseNotify;
import dev.struchkov.bot.gitlab.data.jpa.DelayedNotifyJpaRepository; import dev.struchkov.bot.gitlab.data.jpa.DelayedNotifyJpaRepository;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@ -21,51 +23,45 @@ public class DelayedNotifyServiceImpl {
private final DelayedNotifyJpaRepository delayedNotifyJpaRepository; private final DelayedNotifyJpaRepository delayedNotifyJpaRepository;
@Transactional
public <T extends Notify> void save(T notify) { public <T extends Notify> void save(T notify) {
Gson gson = new Gson(); Gson gson = new Gson();
DeferredMessage deferredMessage = new DeferredMessage(); DeferredMessage deferredMessage = new DeferredMessage();
String notifyForSave = gson.toJson(notify); String notifyForSave = gson.toJson(notify);
deferredMessage.setMessage(notifyForSave); deferredMessage.setMessage(notifyForSave);
deferredMessage.setTime(LocalDateTime.now().plusNanos(0)); deferredMessage.setTime(LocalDateTime.now().withNano(0));
deferredMessage.setType(notify.getType());
delayedNotifyJpaRepository.save(deferredMessage); delayedNotifyJpaRepository.save(deferredMessage);
} }
public <T extends Notify> void getNotifyFromDb(T notify){ public List<Object> getAllNotify(){
Class<? extends Notify> newNotify;
switch (notify.getType()) { List<DeferredMessage> allDeferredMessageFromDb = delayedNotifyJpaRepository.findAll();
case ConflictMrNotify.TYPE:
newNotify = ConflictMrNotify.class; return allDeferredMessageFromDb.stream()
break; .map(DelayedNotifyServiceImpl::convertToNotifyClass).toList();
case DiscussionNewNotify.TYPE:
newNotify = DiscussionNewNotify.class;
break;
case NewCommentNotify.TYPE:
newNotify = NewCommentNotify.class;
break;
case NewMrForAssignee.TYPE:
newNotify = NewMrForAssignee.class;
break;
case NewMrForReview.TYPE:
newNotify = NewMrForReview.class;
break;
case NewProjectNotify.TYPE:
newNotify = NewProjectNotify.class;
break;
case PipelineNotify.TYPE:
newNotify = PipelineNotify.class;
break;
case StatusMrNotify.TYPE:
newNotify = StatusMrNotify.class;
break;
case TaskCloseNotify.TYPE:
newNotify = TaskCloseNotify.class;
break;
case UpdateMrNotify.TYPE:
newNotify = UpdateMrNotify.class;
break;
}
} }
public static <T extends Notify> T convertToNotifyClass(DeferredMessage deferredMessage) {
Gson gson = new Gson();
Class<? extends Notify> newNotifyClass = switch (deferredMessage.getType()) {
case ConflictMrNotify.TYPE -> ConflictMrNotify.class;
case DiscussionNewNotify.TYPE -> DiscussionNewNotify.class;
case NewCommentNotify.TYPE -> NewCommentNotify.class;
case NewMrForAssignee.TYPE -> NewMrForAssignee.class;
case NewMrForReview.TYPE -> NewMrForReview.class;
case NewProjectNotify.TYPE -> NewProjectNotify.class;
case PipelineNotify.TYPE -> PipelineNotify.class;
case StatusMrNotify.TYPE -> StatusMrNotify.class;
case TaskCloseNotify.TYPE -> TaskCloseNotify.class;
case UpdateMrNotify.TYPE -> UpdateMrNotify.class;
default -> throw new RuntimeException("the " + deferredMessage.getType() + " type class is not found");
};
Object notify = gson.fromJson(deferredMessage.getMessage(), newNotifyClass);
return (T) notify;
}
} }