circular dependency fixed

Broscorp-net · Feb 1, 2024 · bfc7bd1 · bfc7bd1
1 parent 40eadf8
commit bfc7bd1
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 22 deletions.
diff --git a/bot/src/main/java/com/community/tools/repository/UserRepository.java b/bot/src/main/java/com/community/tools/repository/UserRepository.java
@@ -9,7 +9,7 @@
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
 
-  Optional<User> findByUserId(String userId);
+  Optional<User> findByUserID(String userId);
 
   Optional<User> findByGitName(String gitName);
 

diff --git a/bot/src/main/java/com/community/tools/service/MessageListener.java b/bot/src/main/java/com/community/tools/service/MessageListener.java
@@ -4,33 +4,38 @@
 import com.community.tools.model.Messages;
 import com.community.tools.model.User;
 import com.community.tools.repository.UserRepository;
-
 import java.time.LocalDate;
 import java.util.List;
-
-import lombok.RequiredArgsConstructor;
 import net.dv8tion.jda.api.entities.MessageType;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Component
-@RequiredArgsConstructor
 public class MessageListener implements EventListener {
 
-  private final UserRepository userRepository;
-  private final MessageService<?> messageService;
-  private final List<Command> commands;
+  private UserRepository userRepository;
+  private MessageService<?> messageService;
+  private List<Command> commands;
 
   @Value("${welcomeChannel}")
   private String welcomeChannelName;
 
   @Value("${newbieRole}")
   private String newbieRoleName;
 
+  public MessageListener(UserRepository userRepository,
+                         @Lazy MessageService<?> messageService,
+                         List<Command> commands) {
+    this.userRepository = userRepository;
+    this.messageService = messageService;
+    this.commands = commands;
+  }
+
   @Override
   public void memberJoin(GuildMemberJoinEvent event) {
     String userId = event.getUser().getId();

diff --git a/bot/src/main/java/com/community/tools/service/NotificationService.java b/bot/src/main/java/com/community/tools/service/NotificationService.java
@@ -60,14 +60,14 @@ public void sendPullRequestUpdateNotification(String gitHubName,
   public void sendPullRequestUpdateNotification(
       List<UserForTaskStatusDto> userForTaskStatusDtoList) {
     List<String> gitHubNames = userForTaskStatusDtoList.stream()
-        .map(UserForTaskStatusDto::getGitName).collect(
+        .map(UserForTaskStatusDto::gitName).collect(
             Collectors.toList());
     Map<String, String> gitHubDiscordNames = discordGitHubMappingService.getDiscordGithubUsernames(
         gitHubNames);
     for (UserForTaskStatusDto dto : userForTaskStatusDtoList) {
-      String discordName = gitHubDiscordNames.get(dto.getGitName());
+      String discordName = gitHubDiscordNames.get(dto.gitName());
       Optional<User> userOptional = discordService.getUserByName(discordName);
-      checkUserAndSendNotification(userOptional, discordName, dto.getTaskStatuses());
+      checkUserAndSendNotification(userOptional, discordName, dto.taskStatuses());
     }
   }
 
@@ -106,8 +106,8 @@ private String buildNotification(User user, List<TaskNameAndStatus> taskNameAndS
         .append("! Your PR statuses updated on: ");
     for (TaskNameAndStatus taskNameAndStatus : taskNameAndStatusList) {
       announcementText.append(System.lineSeparator());
-      announcementText.append(taskNameAndStatus.getTaskName()).append(" :")
-          .append(taskNameAndStatus.getTaskStatus());
+      announcementText.append(taskNameAndStatus.taskName()).append(" :")
+          .append(taskNameAndStatus.taskStatus());
     }
     return announcementText.toString();
   }

diff --git a/bot/src/main/java/com/community/tools/service/StateMachineService.java b/bot/src/main/java/com/community/tools/service/StateMachineService.java
@@ -44,15 +44,15 @@ public StateMachine<State, Event> restoreMachineByNick(String nick) {
     StateMachine<State, Event> machine = factory.getStateMachine();
     machine.start();
     try {
-      persister.restore(machine, user.getUserId());
+      persister.restore(machine, user.getUserID());
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
     return machine;
   }
 
   public String getIdByNick(String nick) {
-    return userRepository.findByGitName(nick).get().getUserId();
+    return userRepository.findByGitName(nick).get().getUserID();
   }
 
   /**

diff --git a/bot/src/main/java/com/community/tools/service/discord/RegisterCommand.java b/bot/src/main/java/com/community/tools/service/discord/RegisterCommand.java
@@ -8,26 +8,40 @@
 import com.community.tools.service.github.GitHubService;
 import java.io.IOException;
 
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
+@NoArgsConstructor
 public class RegisterCommand extends Command {
 
   private static final String OPTION_NAME = "username";
-  private final GitHubService gitHubService;
-  private final UserRepository userRepository;
-  private final MessageService<?> messageService;
+  private GitHubService gitHubService;
+  private UserRepository userRepository;
+  private MessageService<?> messageService;
 
   @Value("${newbieRole}")
   private String newbieRoleName;
 
+  public RegisterCommand(CommandData commandData,
+                         GitHubService gitHubService,
+                         UserRepository userRepository,
+                         @Lazy MessageService<?> messageService,
+                         OptionData... options) {
+    super(commandData, options);
+    this.gitHubService = gitHubService;
+    this.userRepository = userRepository;
+    this.messageService = messageService;
+  }
+
   /**
    * Basic constructor for the class, specifies command data and injects required beans.
    * @param gitHubService checks if provided username is correct

diff --git a/bot/src/main/java/com/community/tools/util/statemachine/StateMachinePersister.java b/bot/src/main/java/com/community/tools/util/statemachine/StateMachinePersister.java
@@ -32,10 +32,10 @@ public class StateMachinePersister implements
   public void write(StateMachineContext<State, Event> context, String userId) {
     User user = null;
     try {
-      user = userRepository.findByUserId(userId).get();
+      user = userRepository.findByUserID(userId).get();
     } catch (NoSuchElementException e) {
       user = new User();
-      user.setUserId(userId);
+      user.setUserID(userId);
     }
 
     byte[] data = serialize(context);
@@ -46,7 +46,7 @@ public void write(StateMachineContext<State, Event> context, String userId) {
   @Override
   public StateMachineContext<State, Event> read(String s) {
 
-    User user = userRepository.findByUserId(s).get();
+    User user = userRepository.findByUserID(s).get();
     byte[] arr = user.getStateMachine();
 
     return deserialize(arr);

diff --git a/message-service/src/main/java/com/community/tools/discord/Command.java b/message-service/src/main/java/com/community/tools/discord/Command.java
@@ -1,14 +1,16 @@
 package com.community.tools.discord;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 
 @Getter
+@NoArgsConstructor
 public abstract class Command {
 
-  private final CommandData commandData;
+  private CommandData commandData;
 
   protected Command(CommandData commandData, OptionData... options) {
     this.commandData = commandData;