From a017f6c4d1b9a00a7a140b065fa126abb11ac24f Mon Sep 17 00:00:00 2001 From: JeongHeumChoi <79458446+JeongHeumChoi@users.noreply.github.com> Date: Sun, 24 Mar 2024 04:55:24 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20[Deploy]=20-=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EB=AA=A9=EB=A1=9D=20API=20=EC=88=98=EC=A0=95=20(#1?= =?UTF-8?q?59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 코드 스타일 수정 (#154) * Chore: 불필요한 부분 삭제 (#157) * 🐛 [Fix] - 작업 목록 API 수정 (#158) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 --------- Co-authored-by: Lim jeong woo --- .../discord/listener/DiscordListener.java | 19 +------------------ .../startup_valley/service/WorkService.java | 4 ++++ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/main/java/goormthon/team28/startup_valley/discord/listener/DiscordListener.java b/src/main/java/goormthon/team28/startup_valley/discord/listener/DiscordListener.java index 870992b..29a1fa6 100644 --- a/src/main/java/goormthon/team28/startup_valley/discord/listener/DiscordListener.java +++ b/src/main/java/goormthon/team28/startup_valley/discord/listener/DiscordListener.java @@ -12,7 +12,6 @@ import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.springframework.transaction.annotation.Transactional; import java.time.Duration; @@ -35,7 +34,6 @@ public class DiscordListener extends ListenerAdapter { private final GptService gptService; private final ReviewService reviewService; @Override - @Transactional public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { LocalDate nowLocalDate = LocalDate.now(); LocalDateTime nowLocalDateTime = LocalDateTime.now(); @@ -142,11 +140,9 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { } answerService.saveAnswer(findQuestion, speaker, answerContent, nowLocalDateTime); - questionService.updateQuestionStatus(findQuestion, EQuestionStatus.FINISH); event.reply("답변이 등록 되었습니다 ! ").setEphemeral(true).queue(); - event.getGuild().getTextChannelById(event.getChannel().getId()) .sendMessage( maker.getAsMention() + "님! 질문에 답변이 등록 되었어요 ! \n\n" + "답변 내용: " + answerContent) @@ -155,7 +151,6 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { case "업무시작": // 팀, 사용자 조회 -> 팀 멤버 조회 - Team team = myTeam(event); goormthon.team28.startup_valley.domain.Member member = getMember(event, event.getUser().getName()); if (member.getPart() == null){ event.reply(event.getMember().getAsMention() +"님이 역할을 아직 입력하지 않으셨어요 ㅠㅠ 역할 입력 해주세요 ~ !").setEphemeral(true).queue(); @@ -171,8 +166,7 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { } // 업무 생성 - Work work = workService.saveWork(scrum, member, nowLocalDateTime); - + workService.saveWork(scrum, member, nowLocalDateTime); event.reply(event.getMember().getAsMention() + "의 오늘의 업무가 등록 되었습니다 ! \n\n" + "오늘의 업무 시작 시간: " + nowLocalDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))) .setEphemeral(true).queue(); @@ -202,7 +196,6 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { } Long totalTime = worker.getTotalMinute() + todayWork; - // 업무 시간 DB 반영 memberService.updateTotalWorkTime(worker.getId(), totalTime); @@ -395,13 +388,6 @@ private Team myTeam(SlashCommandInteractionEvent event){ } return optionalTeam.get(); } - private goormthon.team28.startup_valley.domain.User me(SlashCommandInteractionEvent event){ - Optional optionalUser = userService.findBySerialId(event.getUser().getName()); - if (optionalUser.isEmpty()){ - event.reply("웹에 회원가입을 먼저 진행해주세요 !").setEphemeral(true).queue(); - } - return optionalUser.get(); - } private goormthon.team28.startup_valley.domain.User getUser(SlashCommandInteractionEvent event, String userId){ Optional optionalUser = userService.findBySerialId(userId); if (optionalUser.isEmpty()){ @@ -430,7 +416,6 @@ private Optional getMyProcessingWork(SlashCommandInteractionEvent event){ String userId = event.getUser().getName(); return workService.findNotOverWork(getProcessingScrum(event, userId).get(), getMember(event, userId)); } - public void saveOrGetMember(Team team, Member discordMember, SlashCommandInteractionEvent event) { goormthon.team28.startup_valley.domain.Member teamMember = memberService.saveOrGetMember( team, @@ -441,11 +426,9 @@ public void saveOrGetMember(Team team, Member discordMember, SlashCommandInterac teamService.updateLeader(team.getId(), teamMember); } } - public boolean isTeamLeaderNotSet(Team team) { return team.getLeader() == null; } - public boolean isGuildOwner(Member discordMember, SlashCommandInteractionEvent event) { return discordMember.getUser().getName().equals(event.getGuild().getOwner().getUser().getName()); } diff --git a/src/main/java/goormthon/team28/startup_valley/service/WorkService.java b/src/main/java/goormthon/team28/startup_valley/service/WorkService.java index 4fd7067..e7ba868 100644 --- a/src/main/java/goormthon/team28/startup_valley/service/WorkService.java +++ b/src/main/java/goormthon/team28/startup_valley/service/WorkService.java @@ -15,6 +15,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -87,6 +88,9 @@ public WorkListDto listMemberWork(Long userId, Long teamsId, String sort) { )) .toList()); } + workDtoList = workDtoList.stream() + .sorted(Comparator.comparing(WorkDto::createdAt).reversed()) + .toList(); return WorkListDto.of(workDtoList, team.getName()); }