v0.7.1

.github/workflows/dev-deploy.yml

@@ -60,7 +60,7 @@ jobs:
           echo "$FIREBASEKEY" > ./src/main/resources/bankidz-firebase.json
         env:
           FIREBASEKEY: ${{ secrets.FIREBASE_KEY }}
-          
+
       - name: Make apple-auth-key.p8
         run: |
           touch ./src/main/resources/apple-auth-key.p8
@@ -121,7 +121,9 @@ jobs:
           key: ${{ secrets.KEY_DEV }}
           script: |
             sh ~/srv/ubuntu/config/scripts/deploy.sh
-            sudo docker image prune -a
+            sudo docker stop $(sudo docker ps -a -q)
+            sudo docker rm $(sudo docker ps -a -q)
+            sudo docker rmi $(sudo docker images -q)
             sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml pull
             sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml up --build -d
 

src/main/java/com/ceos/bankids/config/security/WebSecurityConfig.java

@@ -51,6 +51,7 @@ protected void configure(HttpSecurity http) throws Exception {
             .antMatchers(SwaggerPatterns).permitAll()
             .antMatchers("/kakao/login").permitAll()
             .antMatchers("/apple/login").permitAll()
+            .antMatchers("/apple/revoke").permitAll()
             .antMatchers("/user/refresh").permitAll()
             .anyRequest().authenticated()
             .and()

src/main/java/com/ceos/bankids/constant/ErrorCode.java

@@ -74,6 +74,7 @@ public enum ErrorCode implements EnumMapperType {
     APPLE_KEY_UNAVAILABLE("E400-80002"),
     APPLE_TOKEN_EXPIRED("E400-80003"),
     APPLE_NONCE_INCORRECT("E400-80004"),
+    APPLE_ACCESS_TOKEN_ERROR("E400-80005"),
 
     // S3
     PRESIGNEDURI_ERROR("E400-60001"),

src/main/java/com/ceos/bankids/controller/AppleController.java

@@ -44,7 +44,7 @@ public void postAppleLogin(
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
             appleKeyListDTO);
 
-        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest);
+        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "login");
 
         LoginDTO loginDTO = userService.loginWithAppleAuthenticationCode(
             appleSubjectDTO.getAuthenticationCode(), appleRequest);
@@ -63,17 +63,22 @@ public void deleteAppleLogin(
         throws IOException {
 
         log.info("api = 애플 연동해제");
-        AppleRequest appleRequest = appleService.getAppleRequest(formData);
 
-        AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
+        try {
+            AppleRequest appleRequest = appleService.getAppleRequest(formData);
 
-        AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
-            appleKeyListDTO);
+            AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
+
+            AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
+                appleKeyListDTO);
 
-        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest);
+            AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "revoke");
 
-        Object appleResponse = appleService.revokeAppleAccount(appleTokenDTO);
+            Object appleResponse = appleService.revokeAppleAccount(appleTokenDTO);
+        } catch (Exception e) {
+            response.sendRedirect("https://bankidz.com/manage/withdraw/callback?isError=true");
+        }
 
-        response.sendRedirect("https://bankidz.com/manage/withdraw/callback");
+        response.sendRedirect("https://bankidz.com/manage/withdraw/callback?isError=false");
     }
 }

src/main/java/com/ceos/bankids/controller/ChallengeController.java

@@ -133,7 +133,7 @@ public CommonResponse<AchievedChallengeListDTO> getAchievedListChallenge(
     }
 
     @ApiOperation(value = "완주한 돈길에 이자 지급하기")
-    @PatchMapping(value = "/interest_payment/{challengeId}", produces = "application/json; charset=utf-8")
+    @PatchMapping(value = "/interest-payment/{challengeId}", produces = "application/json; charset=utf-8")
     public CommonResponse<AchievedChallengeDTO> patchInterestPayment(
         @AuthenticationPrincipal User authUser,
         @PathVariable Long challengeId) {

src/main/java/com/ceos/bankids/controller/NotificationController.java

@@ -47,7 +47,7 @@ public class NotificationController {
     private final NotificationRepository notificationRepository;
 
     @ApiOperation(value = "모든 유저에게 알림")
-    @PostMapping(value = "/all_user", produces = "application/json; charset=utf-8")
+    @PostMapping(produces = "application/json; charset=utf-8")
     public CommonResponse<String> allSendNotification(
         @RequestBody AllSendNotificationDTO allSendNotificationRequest,
         @AuthenticationPrincipal User authUser) {
@@ -65,10 +65,11 @@ public CommonResponse<String> allSendNotification(
             .forEach(user -> {
                 if (user.getNoticeOptIn()) {
                     expoNotificationService.sendMessage(user, title, message,
-                        allSendNotificationRequest.getNewMap(), notificationCategory);
+                        allSendNotificationRequest.getNewMap(), notificationCategory, "/");
                 } else {
                     Notification notification = Notification.builder().user(user).title(title)
-                        .message(message).notificationCategory(notificationCategory).build();
+                        .message(message).notificationCategory(notificationCategory).linkUrl("/")
+                        .build();
                     notificationRepository.save(notification);
                 }
             });
@@ -126,10 +127,10 @@ public void notification(Challenge challenge, User authUser) {
         newMap.put("userId", authUser.getId());
         NotificationCategory notificationCategory = NotificationCategory.CHALLENGE;
         Boolean checkServiceOptIn = checkServiceOptIn(authUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(authUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/");
         }
         log.info("유저 {}의 돈길 {}의 {} 상태변경 알림", authUser.getId(), challenge.getId(),
             challenge.getChallengeStatus());
@@ -145,10 +146,10 @@ public void userLevelUpMinusOne(User authUser) {
         newMap.put("userId", authUser.getId());
         NotificationCategory notificationCategory = NotificationCategory.LEVEL;
         Boolean checkServiceOptIn = checkServiceOptIn(authUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/mypage");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(authUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/mypage");
         }
         log.info("유저 id = {}의 레벨업 직전 알림", authUser.getId());
     }
@@ -164,10 +165,10 @@ public void userLevelUpHalf(User authUser) {
         newMap.put("userId", authUser.getId());
         NotificationCategory notificationCategory = NotificationCategory.LEVEL;
         Boolean checkServiceOptIn = checkServiceOptIn(authUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/mypage");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(authUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/mypage");
         }
         log.info("유저 id = {}의 레벨업 절반 달성 알림", authUser.getId());
     }
@@ -184,10 +185,10 @@ public void createPendingChallengeNotification(User contractUser, ChallengeUser
         newMap.put("challenge", challengeUser.getChallenge().getId());
         NotificationCategory notificationCategory = NotificationCategory.CHALLENGE;
         Boolean checkServiceOptIn = checkServiceOptIn(contractUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(contractUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "");
         }
         log.info("부모 유저 id = {}에게 유저 id = {} 돈길 id = {} 의 돈길 제안", contractUser.getId(),
             challengeUser.getUser().getId(), challengeUser.getChallenge().getId());
@@ -205,10 +206,10 @@ public void runProgressNotification(User contractUser, ChallengeUser challengeUs
         newMap.put("challenge", challengeUser.getChallenge().getId());
         NotificationCategory notificationCategory = NotificationCategory.CHALLENGE;
         Boolean checkServiceOptIn = checkServiceOptIn(contractUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(contractUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/");
         }
         log.info("부모 유저 id = {}에게 유저 id = {}의 돈길 id = {} 돈길 걷기 알림 전송", contractUser.getId(),
             challengeUser.getUser().getId(), challengeUser.getChallenge().getId());
@@ -227,10 +228,10 @@ public void achieveChallengeNotification(User contractUser, ChallengeUser challe
         newMap.put("challenge", challengeUser.getChallenge().getId());
         NotificationCategory notificationCategory = NotificationCategory.CHALLENGE;
         Boolean checkServiceOptIn = checkServiceOptIn(contractUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(contractUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/");
         }
         log.info("부모 유저 id = {}에게 유저 id = {}의 돈길 id = {} 돈길 완주 알림 전송", contractUser.getId(),
             challengeUser.getUser().getId(), challengeUser.getChallenge().getId());
@@ -247,10 +248,10 @@ public void kidLevelUpNotification(User contractUser, User user, Long level, Lon
         newMap.put("user", user.getId());
         NotificationCategory notificationCategory = NotificationCategory.LEVEL;
         Boolean checkServiceOptIn = checkServiceOptIn(contractUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(contractUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "");
         }
         log.info("부모 유저 id = {}에게 유저 id = {}의 레벨업 알림 전송", contractUser.getId(), user.getId());
     }
@@ -266,10 +267,10 @@ public void challengeFailedNotification(User contractUser, ChallengeUser challen
         newMap.put("challenge", challengeUser.getChallenge().getId());
         NotificationCategory notificationCategory = NotificationCategory.CHALLENGE;
         Boolean checkServiceOptIn = checkServiceOptIn(contractUser, title, notificationBody,
-            notificationCategory);
+            notificationCategory, "/");
         if (checkServiceOptIn) {
             expoNotificationService.sendMessage(contractUser, title, notificationBody, newMap,
-                notificationCategory);
+                notificationCategory, "/");
         }
         log.info("부모 유저 id = {}에게 유저 id = {}의 돈길 id = {} 돈길 실패 알림 전송", contractUser.getId(),
             challengeUser.getChallenge().getId(), challengeUser.getChallenge().getId());
@@ -286,21 +287,21 @@ public void newFamilyUserNotification(User newFamilyUser, List<FamilyUser> famil
         familyUserList.forEach(familyUser -> {
             User user = familyUser.getUser();
             Boolean checkServiceOptIn = checkServiceOptIn(user, title, notificationBody,
-                notificationCategory);
+                notificationCategory, "");
             if (checkServiceOptIn) {
                 expoNotificationService.sendMessage(user, title, notificationBody, newMap,
-                    notificationCategory);
+                    notificationCategory, "");
             }
             log.info("기존 가족 구성원 id = {}에게 유저 id = {}의 가족 참여 알림 전송", familyUser.getUser().getId(),
                 newFamilyUser.getId());
         });
     }
 
     private Boolean checkServiceOptIn(User user, String title, String body,
-        NotificationCategory notificationCategory) {
+        NotificationCategory notificationCategory, String linkUrl) {
         if (!user.getServiceOptIn()) {
             Notification notification = Notification.builder().user(user).title(title).message(body)
-                .notificationCategory(notificationCategory)
+                .notificationCategory(notificationCategory).linkUrl(linkUrl)
                 .build();
             notificationRepository.save(notification);
             return false;

src/main/java/com/ceos/bankids/controller/UserController.java

@@ -164,13 +164,24 @@ public CommonResponse<OptInDTO> patchNoticeOptIn(@AuthenticationPrincipal User a
     }
 
     @ApiOperation(value = "가족 활동 알림 동의")
-    @PatchMapping(value = "/action", produces = "application/json; charset=utf-8")
+    @PatchMapping(value = "/service", produces = "application/json; charset=utf-8")
     @ResponseBody
-    public CommonResponse<OptInDTO> patchActionOptIn(@AuthenticationPrincipal User authUser) {
+    public CommonResponse<OptInDTO> patchServiceOptIn(@AuthenticationPrincipal User authUser) {
 
         log.info("api = 가족 활동 알림 동의, user = {}", authUser.getUsername());
         OptInDTO optInDTO = userService.updateServiceOptIn(authUser);
 
         return CommonResponse.onSuccess(optInDTO);
     }
+
+    @ApiOperation(value = "유저 알림 동의 조회")
+    @GetMapping(value = "/opt-in", produces = "application/json; charset=utf-8")
+    @ResponseBody
+    public CommonResponse<OptInDTO> getOptIn(@AuthenticationPrincipal User authUser) {
+
+        log.info("api = 유저 알림 동의 조회, user = {}", authUser.getUsername());
+        OptInDTO optInDTO = userService.getOptIn(authUser);
+
+        return CommonResponse.onSuccess(optInDTO);
+    }
 }

src/main/java/com/ceos/bankids/domain/Notification.java

@@ -47,6 +47,9 @@ public class Notification extends AbstractTimestamp {
     @Enumerated(EnumType.STRING)
     private NotificationCategory notificationCategory;
 
+    @Column(nullable = false)
+    private String linkUrl;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "userId", nullable = false)
     private User user;
@@ -58,6 +61,7 @@ public Notification(
         String message,
         Boolean isRead,
         NotificationCategory notificationCategory,
+        String linkUrl,
         User user
     ) {
 
@@ -66,6 +70,7 @@ public Notification(
         this.message = message;
         this.isRead = isRead;
         this.notificationCategory = notificationCategory;
+        this.linkUrl = linkUrl;
         this.user = user;
     }
 }

src/main/java/com/ceos/bankids/domain/User.java

@@ -40,13 +40,13 @@ public class User extends AbstractTimestamp implements UserDetails {
     @Column(nullable = false, length = 10)
     private String username;
 
-    @Column(nullable = true)
+    @Column()
     private Boolean isFemale;
 
-    @Column(nullable = true, length = 8)
+    @Column(length = 8)
     private String birthday;
 
-    @Column(nullable = true, length = 12, unique = true)
+    @Column(length = 12, unique = true)
     private String phone;
 
     @Column(name = "authentication_code", nullable = false, unique = true)
@@ -55,7 +55,7 @@ public class User extends AbstractTimestamp implements UserDetails {
     @Column(nullable = false, length = 10)
     private String provider;
 
-    @Column(nullable = true)
+    @Column()
     private Boolean isKid;
 
     @Column(columnDefinition = "TEXT")
@@ -64,11 +64,11 @@ public class User extends AbstractTimestamp implements UserDetails {
     @Column(columnDefinition = "TEXT")
     private String expoToken;
 
-    @Column(nullable = false)
+    @Column()
     @ColumnDefault("false")
     private Boolean noticeOptIn;
 
-    @Column(nullable = false)
+    @Column()
     @ColumnDefault("false")
     private Boolean serviceOptIn;
 

src/main/java/com/ceos/bankids/dto/NotificationDTO.java

@@ -31,6 +31,9 @@ public class NotificationDTO {
     @ApiModelProperty(example = "CHALLENGE")
     private NotificationCategory notificationCategory;
 
+    @ApiModelProperty(example = "/")
+    private String linkUrl;
+
     @ApiModelProperty(example = "2022/07/05 05:05:05")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd hh:mm:ss", timezone = "Asia/Seoul")
     private Timestamp createdAt;
@@ -41,6 +44,7 @@ public NotificationDTO(Notification notification) {
         this.message = notification.getMessage();
         this.isRead = notification.getIsRead();
         this.notificationCategory = notification.getNotificationCategory();
+        this.linkUrl = notification.getLinkUrl();
         this.createdAt = notification.getCreatedAt();
     }
 }

src/main/java/com/ceos/bankids/service/AppleService.java

@@ -15,7 +15,7 @@ public interface AppleService {
     public AppleSubjectDTO verifyIdentityToken(AppleRequest appleRequest,
         AppleKeyListDTO appleKeyListDTO);
 
-    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest);
+    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest, String option);
 
     public Object revokeAppleAccount(AppleTokenDTO appleTokenDTO);
 

src/main/java/com/ceos/bankids/service/AppleServiceImpl.java

@@ -140,13 +140,13 @@ public AppleSubjectDTO verifyIdentityToken(AppleRequest appleRequest,
     }
 
     @Override
-    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest) {
+    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest, String option) {
         APPLE_SECRET = makeClientSecret();
 
         String getTokenURL =
             "https://appleid.apple.com/auth/token?client_id=" + APPLE_CLIENT_ID + "&client_secret="
                 + APPLE_SECRET + "&grant_type=authorization_code&code=" + appleRequest.getCode()
-                + "&redirect_uri=" + APPLE_URI;
+                + "&redirect_uri=" + APPLE_URI + option;
 
         WebClient.ResponseSpec responseSpec = webClient.post().uri(getTokenURL).retrieve();
 
@@ -155,7 +155,7 @@ public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest) {
             return appleTokenDTO;
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BadRequestException(ErrorCode.APPLE_BAD_REQUEST.getErrorCode());
+            throw new BadRequestException(ErrorCode.APPLE_ACCESS_TOKEN_ERROR.getErrorCode());
         }
     }