Skip to content

Commit

Permalink
πŸš€ [Deploy] - μž‘μ—… λͺ©λ‘ API μˆ˜μ • (#159)
Browse files Browse the repository at this point in the history
* refactor: μ½”λ“œ μŠ€νƒ€μΌ μˆ˜μ • (#154)

* Chore: λΆˆν•„μš”ν•œ λΆ€λΆ„ μ‚­μ œ (#157)

* πŸ› [Fix] - μž‘μ—… λͺ©λ‘ API μˆ˜μ • (#158)

* refactor: μ½”λ“œ μŠ€νƒ€μΌ μˆ˜μ •

* fix: Work 생성 λ‚ μ§œ κΈ°μ€€μœΌλ‘œ λ‚΄λ¦Όμ°¨μˆœ μ„€μ •

---------

Co-authored-by: Lim jeong woo <[email protected]>
  • Loading branch information
JeongHeumChoi and dlawjddn authored Mar 23, 2024
1 parent 864e4fa commit a017f6c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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)
Expand All @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -202,7 +196,6 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
}

Long totalTime = worker.getTotalMinute() + todayWork;

// 업무 μ‹œκ°„ DB 반영
memberService.updateTotalWorkTime(worker.getId(), totalTime);

Expand Down Expand Up @@ -395,13 +388,6 @@ private Team myTeam(SlashCommandInteractionEvent event){
}
return optionalTeam.get();
}
private goormthon.team28.startup_valley.domain.User me(SlashCommandInteractionEvent event){
Optional<goormthon.team28.startup_valley.domain.User> 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<goormthon.team28.startup_valley.domain.User> optionalUser = userService.findBySerialId(userId);
if (optionalUser.isEmpty()){
Expand Down Expand Up @@ -430,7 +416,6 @@ private Optional<Work> 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,
Expand All @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
}
Expand Down

0 comments on commit a017f6c

Please sign in to comment.