Merge pull request #297 from Team-WSS/feat/#295

[FEAT] 약관 동의 조회 API 구현

Author: rinarina0429

src/main/java/org/websoso/WSSServer/controller/UserController.java

@@ -31,6 +31,7 @@
 import org.websoso.WSSServer.dto.user.ProfileGetResponse;
 import org.websoso.WSSServer.dto.user.ProfileStatusResponse;
 import org.websoso.WSSServer.dto.user.RegisterUserInfoRequest;
+import org.websoso.WSSServer.dto.user.TermsSettingGetResponse;
 import org.websoso.WSSServer.dto.user.UpdateMyProfileRequest;
 import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
 import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
@@ -239,4 +240,12 @@ public ResponseEntity<Void> registerPushSetting(Principal principal,
                 .status(NO_CONTENT)
                 .build();
     }
+
+    @GetMapping("/terms-settings")
+    public ResponseEntity<TermsSettingGetResponse> getTermsSettingValue(Principal principal) {
+        User user = userService.getUserOrException(Long.valueOf(principal.getName()));
+        return ResponseEntity
+                .status(OK)
+                .body(userService.getTermsSettingValue(user));
+    }
 }

src/main/java/org/websoso/WSSServer/domain/User.java

@@ -77,6 +77,15 @@ public class User extends BaseEntity {
     @Column(columnDefinition = "Boolean default true", nullable = false)
     private Boolean isPushEnabled;
 
+    @Column(columnDefinition = "Boolean default false", nullable = false)
+    private Boolean serviceAgreed;
+
+    @Column(columnDefinition = "Boolean default false", nullable = false)
+    private Boolean privacyAgreed;
+
+    @Column(columnDefinition = "Boolean default false", nullable = false)
+    private Boolean marketingAgreed;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     @ColumnDefault("'USER'")
@@ -130,6 +139,9 @@ private User(String socialId, String nickname, String email) {
         this.avatarId = 1;
         this.isProfilePublic = true;
         this.isPushEnabled = true;
+        this.serviceAgreed = false;
+        this.privacyAgreed = false;
+        this.marketingAgreed = false;
         this.role = USER;
         this.socialId = socialId;
         this.nickname = nickname;

src/main/java/org/websoso/WSSServer/dto/user/TermsSettingGetResponse.java

@@ -0,0 +1,15 @@
+package org.websoso.WSSServer.dto.user;
+
+public record TermsSettingGetResponse(
+        Boolean serviceAgreed,
+        Boolean privacyAgreed,
+        Boolean marketingAgreed
+) {
+    public static TermsSettingGetResponse of(Boolean serviceAgreed, Boolean privacyAgreed, Boolean marketingAgreed) {
+        return new TermsSettingGetResponse(
+                serviceAgreed,
+                privacyAgreed,
+                marketingAgreed
+        );
+    }
+}

src/main/java/org/websoso/WSSServer/service/UserService.java

@@ -36,6 +36,7 @@
 import org.websoso.WSSServer.dto.user.ProfileGetResponse;
 import org.websoso.WSSServer.dto.user.ProfileStatusResponse;
 import org.websoso.WSSServer.dto.user.RegisterUserInfoRequest;
+import org.websoso.WSSServer.dto.user.TermsSettingGetResponse;
 import org.websoso.WSSServer.dto.user.UpdateMyProfileRequest;
 import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
 import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
@@ -277,4 +278,10 @@ public void registerPushSetting(User user, Boolean isPushEnabled) {
     public PushSettingGetResponse getPushSettingValue(User user) {
         return PushSettingGetResponse.of(user.getIsPushEnabled());
     }
+
+    @Transactional(readOnly = true)
+    public TermsSettingGetResponse getTermsSettingValue(User user) {
+        return TermsSettingGetResponse.of(user.getServiceAgreed(), user.getPrivacyAgreed(),
+                user.getMarketingAgreed());
+    }
 }