Merge pull request #261 from Link-MIND/feat/#256

Feat/#256

linkmind/src/main/java/com/app/toaster/admin/controller/AdminController.java

@@ -3,11 +3,14 @@
 import com.app.toaster.admin.common.RedirectResponse;
 import com.app.toaster.admin.controller.dto.command.VerifyNewAdminCommand;
 import com.app.toaster.admin.controller.dto.request.AdminTotpDto;
+//import com.app.toaster.admin.controller.dto.request.LinkDto;
 import com.app.toaster.admin.controller.dto.request.SignInDto;
 import com.app.toaster.admin.controller.dto.response.AdminResponse;
+import com.app.toaster.admin.domain.AdminStatus;
 import com.app.toaster.admin.entity.ToasterAdmin;
 import com.app.toaster.admin.service.AdminService;
 import com.app.toaster.admin.config.QrMfaAuthenticator;
+//import com.app.toaster.admin.service.AdminLinkService;
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.Success;
 import com.app.toaster.exception.model.CustomException;
@@ -36,18 +39,18 @@ class AdminController {
     private final S3Service s3Service;
     private final QrMfaAuthenticator qrMfaAuthenticator;
     private final AdminService adminService;
+//    private final AdminLinkService adminLinkService;
 
     @PostMapping("/register")
     @ResponseBody
     public RedirectResponse<?> registerAdmin(@RequestBody SignInDto signInDto, HttpSession session) {
-
         VerifyNewAdminCommand res = adminService.registerAdmin(signInDto.username(), signInDto.password());
 
         String key = res.key();
         Long adminId = res.id();
-        boolean isNewAdmin = res.isNewAdmin();
+        AdminStatus adminStatus = res.adminStatus();
 
-        if (isNewAdmin){
+        if (adminStatus.equals(AdminStatus.FIRST_REGISTER)){
             key = executeDiscordQrOperation(key);
         }
 
@@ -93,6 +96,17 @@ public RedirectResponse<AdminResponse> responseIsAdminView(HttpSession session,
         return RedirectResponse.success(Success.LOGIN_SUCCESS,"main", result);
     }
 
+//    @PostMapping("/link")
+//    public void addRecommendLink(@RequestBody LinkDto linkDto){
+//        adminLinkService.addNewRecommendLink(linkDto);
+//    }
+//
+//    @GetMapping("/link")
+//    public String getAllLink(Model model){
+//        model.addAttribute("links", adminLinkService.findAllLink());
+//        return "basic/linkListPage";
+//    }
+
     private String executeDiscordQrOperation(String key){
         MultipartFile qrImage = qrMfaAuthenticator.generateQrCode(key);
         String imageKey = s3Service.uploadImage(qrImage, "admin/");

linkmind/src/main/java/com/app/toaster/admin/controller/dto/command/VerifyNewAdminCommand.java

@@ -1,8 +1,10 @@
 package com.app.toaster.admin.controller.dto.command;
 
+import com.app.toaster.admin.domain.AdminStatus;
+
 public record VerifyNewAdminCommand(
         Long id,
         String key,
-        boolean isNewAdmin
+        AdminStatus adminStatus
 ) {
 }

linkmind/src/main/java/com/app/toaster/admin/domain/AdminStatus.java

@@ -0,0 +1,10 @@
+package com.app.toaster.admin.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum AdminStatus {
+    ACCEPTED,
+    NEED_RENEW,
+    FIRST_REGISTER
+}

linkmind/src/main/java/com/app/toaster/admin/service/AdminService.java

@@ -1,6 +1,7 @@
 package com.app.toaster.admin.service;
 
 import com.app.toaster.admin.controller.dto.command.VerifyNewAdminCommand;
+import com.app.toaster.admin.domain.AdminStatus;
 import com.app.toaster.admin.entity.VerifiedAdmin;
 import com.app.toaster.admin.entity.ToasterAdmin;
 import com.app.toaster.admin.infrastructure.AdminRepository;
@@ -60,17 +61,17 @@ public TokenResponseDto issueToken(Long testUserId) {
 
 
     @Transactional
-    public VerifyNewAdminCommand registerVerifiedUser(final ToasterAdmin toasterAdmin, boolean isNewAdmin) {
+    public VerifyNewAdminCommand registerVerifiedUser(final ToasterAdmin toasterAdmin, AdminStatus adminStatus) {
 
         String otpKey = null;
         Long id = null;
 
         Optional<VerifiedAdmin> existVerifiedAdmin = verifiedAdminRepository.findByAdmin(toasterAdmin);
 
-        if (isNewAdmin) { //새로운 어드민의 경우 등록.
+        if (AdminStatus.NEED_RENEW.equals(adminStatus) || AdminStatus.FIRST_REGISTER.equals(adminStatus)) { //새로운 어드민의 경우 등록.
             log.info("갱신해야되는 케이스.");
 
-            deletePastVerify(existVerifiedAdmin);
+            deletePastVerify(existVerifiedAdmin); //새로운 어드민이면 여기서 기존 verify삭제 안함.
 
             GoogleAuthenticatorKey key = googleAuthenticator.createCredentials();
 
@@ -96,7 +97,7 @@ public VerifyNewAdminCommand registerVerifiedUser(final ToasterAdmin toasterAdmi
 
         }
 
-        return new VerifyNewAdminCommand(id, otpKey, isNewAdmin);
+        return new VerifyNewAdminCommand(id, otpKey, adminStatus);
     }
 
     @Transactional
@@ -111,9 +112,9 @@ public VerifyNewAdminCommand registerAdmin(String username, String password) {
                 if (existAdmin != null) {
                     log.info("존재합니다. 전 이 게임을 해봤어요.");
                     if (existAdmin.verifyLastDate()) { //검증된 경우면 걍 어드민을 리턴.
-                        return registerVerifiedUser(existAdmin, false);
+                        return registerVerifiedUser(existAdmin, AdminStatus.ACCEPTED);
                     }else{
-                        return registerVerifiedUser(existAdmin, true); //아닌 경우는 갱신을 해야됨.
+                        return registerVerifiedUser(existAdmin, AdminStatus.NEED_RENEW); //아닌 경우는 갱신을 해야됨.
                     }
                 }
 
@@ -126,7 +127,7 @@ public VerifyNewAdminCommand registerAdmin(String username, String password) {
                         .password(encPassword)
                         .build();
 
-                return registerVerifiedUser(adminRepository.save(toasterAdmin), true);
+                return registerVerifiedUser(adminRepository.save(toasterAdmin), AdminStatus.FIRST_REGISTER);
             }
         }
         throw new CustomException(Error.NOT_FOUND_USER_EXCEPTION, "어드민이 아닙니다.");

linkmind/src/main/java/com/app/toaster/external/client/discord/DiscordMessageProvider.java

@@ -53,7 +53,7 @@ public void sendNotification(NotificationDto notification) {
             }
         }
     }
-
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void sendAdmin(NotificationDto notification) {
         if (!Arrays.asList(environment.getActiveProfiles()).contains("local")) { // 일단 로컬 막아두겠습니다. TODO: 웹훅 주소 바꾸기
             try {