#177 [feat] API 추가

build.gradle

@@ -23,6 +23,12 @@ repositories {
 	mavenCentral()
 }
 
+dependencyManagement {
+	imports {
+		mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:3.4.0"
+	}
+}
+
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -52,8 +58,10 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
 	//S3의존성 추가
-	implementation("software.amazon.awssdk:bom:2.21.0")
-	implementation("software.amazon.awssdk:s3:2.21.0")
+//	implementation("software.amazon.awssdk:bom:2.21.0")
+//	implementation("software.amazon.awssdk:s3:2.21.0")
+
+	implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3'
 
 	// Feign 추가
 	implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.3.0'
@@ -81,6 +89,10 @@ dependencies {
 	implementation 'org.ahocorasick:ahocorasick:0.6.3'
 }
 
+
+
+
+
 // Querydsl 빌드 옵션 설정
 def generated = 'src/main/generated'
 

src/main/java/org/sopt/certi_server/domain/acquisition/dto/response/GetAcquisitionResponse.java

@@ -13,6 +13,7 @@
 public record GetAcquisitionResponse(
 	Long acquisitionId,
 	String cardFrontImageUrl,
+	String certificationType,
 	int index,
 	String name,
 	List<String> tags,
@@ -25,6 +26,7 @@ public static GetAcquisitionResponse from(Acquisition acquisition) {
 		return GetAcquisitionResponse.builder()
 			.acquisitionId(acquisition.getId())
 			.cardFrontImageUrl(acquisition.getCardType().getCardFrontImageUrl())
+			.certificationType(acquisition.getCertification().getCertificationType().getKoreanName())
 			.index(acquisition.getCardType().getIndex())
 			.name(acquisition.getCertification().getName())
 			.acquisitionDate(acquisition.getAcquisitionDate())

src/main/java/org/sopt/certi_server/domain/activity/controller/ActivityController.java

@@ -26,7 +26,7 @@ public class ActivityController {
 
     @PostMapping
     @Operation(summary = "대내외활동 추가 API", description = "대내외 활동을 추가합니다")
-    public ResponseEntity<SuccessResponse> createActivity(
+    public ResponseEntity<SuccessResponse<Void>> createActivity(
             @AuthenticationPrincipal Long userId,
             @Valid @RequestBody CreateActivityRequest request) {
         activityService.createActivity(userId, request);
@@ -46,7 +46,7 @@ public ResponseEntity<SuccessResponse<GetActivityListResponse>> getAllActivities
 
     @DeleteMapping("/{activity-id}")
     @Operation(summary = "대내외 활동 삭제 API", description = "대내외 활동을 삭제합니다")
-    public ResponseEntity<SuccessResponse> deleteActivity(
+    public ResponseEntity<SuccessResponse<Void>> deleteActivity(
             @AuthenticationPrincipal Long userId,
             @Parameter(description = "activity Id", example = "1")
             @PathVariable(name = "activity-id") Long activityId

src/main/java/org/sopt/certi_server/domain/activity/dto/request/CreateActivityRequest.java

@@ -2,15 +2,20 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 import java.time.LocalDate;
 
 public record CreateActivityRequest(
+
+        @Schema(description = "활동 시작일", example = "2024.05.24", type = "string")
         @NotNull(message = "활동 시작일은 필수 입력값입니다.")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         LocalDate startAt,
+
+        @Schema(description = "활동 종료일", example = "2024.05.28", type = "string")
         @NotNull(message = "활동 종료일은 필수 입력값입니다")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         LocalDate endAt,

src/main/java/org/sopt/certi_server/domain/user/controller/AuthController.java

@@ -69,7 +69,7 @@ public ResponseEntity<SuccessResponse<AuthResponse>> processSignIn(@Valid @Reque
     @Operation(summary = "회원 가입", description = "회원 가입을 진행합니다.")
     public ResponseEntity<SuccessResponse<SignUpResponse>> processSignup(
             @RequestHeader("Authorization") @NotEmpty(message = "임시 토큰이 누락되었습니다.") String authorization,
-            @Valid @RequestBody SignupRequest request
+            @RequestBody SignupRequest request
     ) {
         return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_CREATE, authService.register(authorization, request)));
     }

src/main/java/org/sopt/certi_server/domain/user/controller/UserController.java

@@ -2,8 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.sopt.certi_server.domain.user.dto.request.*;
@@ -61,7 +60,7 @@ public ResponseEntity<SuccessResponse<PersonalInformationResponse>> getPersonalI
     @Operation(summary = "개인정보 수정 API", description = "개인정보를 수정합니다.")
     public ResponseEntity<SuccessResponse<Void>> putPersonalInformation(
             @AuthenticationPrincipal Long userId,
-            @RequestBody UpdateUserRequest request
+            @Valid @RequestBody UpdateUserRequest request
     ){
         userService.updateUserInformation(userId, request);
         return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_UPDATE));
@@ -122,4 +121,30 @@ public ResponseEntity<SuccessResponse<GetTrackResponse>> getUserTrack(
     ){
         return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, userService.getTrack(userId)));
     }
+
+    @GetMapping(value = "/presigned-url")
+    @Operation(summary = "presigned URL 반환 API", description = "Presigned URL을 반환합니다. 해당 URL을 통해 이미지를 업로드 할 수 있습니다.")
+    public ResponseEntity<SuccessResponse<GetPreSignedURLResponse>> getPreSignedURL(
+            @AuthenticationPrincipal Long userId
+    ){
+        return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, userService.getPreSignedURL(userId)));
+    }
+
+
+    @GetMapping(value = "/marketing-agreement")
+    @Operation(summary = "광고성 수신 정보 동의 조회 API", description = "광고성 수신 정보 동의 정보를 조회합니다.")
+    public ResponseEntity<SuccessResponse<MarketingResponse>> getMarketingAgreeInformation(
+            @AuthenticationPrincipal Long userId
+    ){
+        return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, userService.getMarketingAgree(userId)));
+    }
+
+    @PatchMapping(value = "/marketing-agreement")
+    @Operation(summary = "광고성 수신 정보 동의 토글 API", description = "광고성 수신 정보 동의를 토글식으로 변경합니다.")
+    public ResponseEntity<SuccessResponse<Void>> patchMarketingAgree(
+            @AuthenticationPrincipal Long userId
+    ){
+        userService.toggleMarketingAgree(userId);
+        return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_UPDATE));
+    }
 }

src/main/java/org/sopt/certi_server/domain/user/dto/request/PatchUserProfileImageRequest.java

@@ -0,0 +1,6 @@
+package org.sopt.certi_server.domain.user.dto.request;
+
+public record PatchUserProfileImageRequest(
+        String publicURL
+) {
+}

src/main/java/org/sopt/certi_server/domain/user/dto/request/UpdateUserRequest.java

@@ -1,6 +1,7 @@
 package org.sopt.certi_server.domain.user.dto.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
@@ -18,9 +19,13 @@ public record UpdateUserRequest(
         @NotEmpty(message = "닉네임은 공백이 될 수 없습니다.")
         @NoProfanity
         String nickName,
+
+        @Schema(description = "생년월일", example = "1998.05.24", type = "string")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         @Past(message = "생년월일은 과거 날짜여야 합니다.")
-        LocalDate birthDate
+        LocalDate birthDate,
+
+        String publicURL
 ) {
 
 }

src/main/java/org/sopt/certi_server/domain/user/dto/response/GetMyPageInfoResponse.java

@@ -8,6 +8,7 @@
 @Builder
 public record GetMyPageInfoResponse(
         String nickname,
+        String profileImageURL,
         String email,
         GetJobResponse jobResponse,
         int upCount,
@@ -19,6 +20,7 @@ public static GetMyPageInfoResponse from(
     ){
         return GetMyPageInfoResponse.builder()
                 .nickname(user.getNickname())
+                .profileImageURL(user.getProfileImageUrl())
                 .email(user.getEmail())
                 .jobResponse(jobResponse)
                 .upCount(upCount)

src/main/java/org/sopt/certi_server/domain/user/dto/response/GetPreSignedURLResponse.java

@@ -0,0 +1,17 @@
+package org.sopt.certi_server.domain.user.dto.response;
+
+public record GetPreSignedURLResponse(
+        String preSignedURL,
+        String publicURL
+) {
+    public static GetPreSignedURLResponse of(
+            String preSignedURL,
+            String publicURL
+    ){
+        return new GetPreSignedURLResponse(
+                preSignedURL,
+                publicURL
+        );
+    }
+
+}

src/main/java/org/sopt/certi_server/domain/user/dto/response/GetUserResponse.java

@@ -4,19 +4,27 @@
 import org.sopt.certi_server.domain.major.entity.MajorImpl;
 import org.sopt.certi_server.domain.user.entity.User;
 
+import java.time.LocalDate;
+
 @Builder
 public record GetUserResponse(
         String nickname,
+        String name,
         String university,
         String major,
+        String profileImage,
+        LocalDate birthDate,
         int percentage
 ) {
     public static GetUserResponse from(User user, MajorImpl majorImpl, int percentage) {
         return GetUserResponse.builder()
                 .nickname(user.getNickname())
+                .name(user.getName())
                 .university(user.getUniversity().getName())
                 .major(majorImpl.getName())
+                .profileImage(user.getProfileImageUrl())
                 .percentage(percentage)
+                .birthDate(user.getBirthDate())
                 .build();
     }
 }

src/main/java/org/sopt/certi_server/domain/user/dto/response/MarketingResponse.java

@@ -0,0 +1,9 @@
+package org.sopt.certi_server.domain.user.dto.response;
+
+public record MarketingResponse(
+        boolean isAdAgreed
+) {
+    public static MarketingResponse of(boolean isAdAgreed){
+        return new MarketingResponse(isAdAgreed);
+    };
+}

src/main/java/org/sopt/certi_server/domain/user/dto/response/OAuthUserInformation.java

@@ -18,7 +18,7 @@ public static OAuthUserInformation from(
                 information.id(),
                 SocialType.KAKAO,
                 information.kakaoAccount().email(),
-                information.kakaoAccount().profile().name(),
+                information.kakaoAccount().profile().nickname(),
                 information.kakaoAccount().profile().profileImageUrl()
         );
     }

src/main/java/org/sopt/certi_server/domain/user/dto/response/PersonalInformationResponse.java

@@ -10,7 +10,8 @@ public record PersonalInformationResponse(
         String nickName,
         String name,
         String email,
-        LocalDate birthDate
+        LocalDate birthDate,
+        String profileImageURL
 ) {
 
     public static PersonalInformationResponse from(User user){
@@ -19,6 +20,7 @@ public static PersonalInformationResponse from(User user){
                 .nickName(user.getNickname())
                 .email(user.getEmail())
                 .birthDate(user.getBirthDate())
+                .profileImageURL(user.getProfileImageUrl())
                 .build();
     }
 }

src/main/java/org/sopt/certi_server/domain/user/dto/response/UserInformation.java

@@ -13,7 +13,7 @@ public static UserInformation from(
     ) {
         return new UserInformation(
                 information.kakaoAccount().email(),
-                information.kakaoAccount().profile().name(),
+                information.kakaoAccount().profile().nickname(),
                 information.kakaoAccount().profile().profileImageUrl()
         );
     }

src/main/java/org/sopt/certi_server/domain/user/dto/response/kakao/KakaoUserInformationResponse.java

@@ -18,7 +18,7 @@ public record KakaoAccount(
 
     @JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record KakaoProfile(
-            String name,
+            String nickname,
             String profileImageUrl
     ) {
 

src/main/java/org/sopt/certi_server/domain/user/entity/User.java

@@ -61,6 +61,9 @@ public class User extends BaseTimeEntity {
     @Column(name = "birth_date")
     private LocalDate birthDate;
 
+    @Column(name = "marketing_agree")
+    private Boolean marketingAgree;
+
 
     public User(String nickname, String email, String profileImageUrl) {
         this.nickname = nickname;
@@ -70,7 +73,7 @@ public User(String nickname, String email, String profileImageUrl) {
 
     @Builder
     public User(Long id, University university, String track, String grade, MajorImpl major, String nickname, String name, String email,
-                String profileImageUrl, SocialType socialType, Long socialId) {
+                String profileImageUrl, SocialType socialType, Long socialId, Boolean marketingAgree) {
         this.id = id;
         this.university = university;
         this.track = TrackType.from(track);
@@ -82,13 +85,15 @@ public User(Long id, University university, String track, String grade, MajorImp
         this.profileImageUrl = profileImageUrl;
         this.socialType = socialType;
         this.socialId = socialId;
+        this.marketingAgree = marketingAgree;
     }
 
-    public void changeUser(String name, String nickname, String email, LocalDate birthDate){
+    public void changeUser(String name, String nickname, String email, LocalDate birthDate, String profileImageUrl){
         this.name = name;
         this.nickname = nickname;
         this.email = email;
         this.birthDate = birthDate;
+        this.profileImageUrl = profileImageUrl;
     }
 
     public void changeUniversity(University university) {
@@ -98,4 +103,12 @@ public void changeUniversity(University university) {
     public void changeMajor(MajorImpl mi) {
         this.major = mi;
     }
+
+    public void updateMarketingAgree() {
+        this.marketingAgree = !this.marketingAgree;
+    }
+
+    public void updateProfileImage(String publicKey) {
+        this.profileImageUrl = publicKey;
+    }
 }

src/main/java/org/sopt/certi_server/domain/user/service/KakaoService.java

@@ -54,7 +54,7 @@ public OAuthUserInformation getUserInfo(String code) {
     public OAuthUserInformation getUserInfoByAccessToken(String accessToken) {
         try {
             KakaoUserInformationResponse information = kakaoApiFeignClient.getInformation("Bearer " + accessToken);
-            log.info(information.kakaoAccount().profile().name());
+            log.info(information.kakaoAccount().profile().nickname());
             log.info(information.kakaoAccount().email());
             return OAuthUserInformation.from(information);
         } catch (Exception e) {