Merge pull request #98 from Team-UMC/feature/#94/album-api-refactoring

[FEAT] Album 관련 리펙토링 및 데이터 추가 로직 구현

src/main/java/com/umc/networkingService/config/SwaggerConfig.java

@@ -6,13 +6,17 @@
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.List;
 
 @Configuration
 public class SwaggerConfig {
+
+    @Value("${server.url}")
+    private String serverUrl;
     @Bean
     public OpenAPI openAPI() {
 
@@ -28,7 +32,7 @@ public OpenAPI openAPI() {
                         .scheme("Bearer"));
 
         Server server = new Server();
-        server.setUrl("https://umcservice.shop");
+        server.setUrl(serverUrl);
 
         return new OpenAPI()
                 .addSecurityItem(securityRequirement)

src/main/java/com/umc/networkingService/config/initial/AlbumInfo.java

@@ -0,0 +1,55 @@
+package com.umc.networkingService.config.initial;
+
+import com.umc.networkingService.global.common.enums.Semester;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public enum AlbumInfo {
+
+    // 4기
+    FOURTH_INHA_MT("222222", Semester.FOURTH, "인하대학교 4기 MT", "OB와 YB가 함께하는 인하대학교 4기 MT를 성공적으로 마무리했습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/MT.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/MT+(2).jpg")),
+    FOURTH_DEMO_DAY("222222", Semester.FOURTH, "UMC 4기 데모데이 행사", "UMC 4기 데모데이 행사 3일간 성공적으로 마무리했습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/%EB%8D%B0%EB%AA%A8%EB%8D%B0%EC%9D%B41.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/%EB%8D%B0%EB%AA%A8%EB%8D%B0%EC%9D%B42.jpg")),
+
+    // 5기
+    FIFTH_OT("333333", Semester.FIFTH, "UMC 5기 OT", "UMC 5기 연합 및 교내 OT를 진행하였습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/OT1.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/OT2.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/OT3.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/OT4.jpg")),
+    FIFTH_NETWORKING("333333", Semester.FIFTH, "UMC 5기 GACI 지부 네트워킹 데이", "UMC 5기 GACI 지부 네트워킹 데이 행사를 진행하였습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/NETWORKING1.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/NETWORKING2.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/NETWORKING3.jpg")),
+    FIFTH_INHA_MT("333333", Semester.FIFTH, "인하대학교 5기 MT", "OB와 YB가 함께하는 인하대학교 5기 MT를 진행하였습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/MT1.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/MT2.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/MT3.jpg")),
+    FIFTH_GRDUATION("333333", Semester.FIFTH, "인하대학교 UMC 졸업식 행사", "인하대학교 UMC 챌린저 졸업자를 축하하는 행사를 진행했습니다.",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/G1.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/G2.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/G3.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/G4.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/G5.jpg")),
+    FIFTH_DEMO_DAY("333333", Semester.FIFTH, "UMC 5기 데모데이 행사", "UMC 5기 데모데이 행사를 3일간 성공적으로 마무리했고, UMC 네트워킹 데이 서비스 팀이 1등했습니다!!~~",
+            List.of("https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/DEMO.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/DEMO1.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/DEMO2.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/DEMO3.jpg",
+                    "https://umc-service-bucket.s3.ap-northeast-2.amazonaws.com/album/inha/DEMO4.jpg")),
+
+    ;
+
+    private final String clientId;
+    private final Semester semester;
+    private final String title;
+    private final String content;
+    private final List<String> images;
+}

src/main/java/com/umc/networkingService/config/initial/DataLoader.java

@@ -1,11 +1,21 @@
 package com.umc.networkingService.config.initial;
 
+import com.umc.networkingService.domain.album.entity.Album;
+import com.umc.networkingService.domain.album.entity.AlbumImage;
+import com.umc.networkingService.domain.album.repository.AlbumImageRepository;
+import com.umc.networkingService.domain.album.repository.AlbumRepository;
 import com.umc.networkingService.domain.branch.entity.Branch;
 import com.umc.networkingService.domain.branch.entity.BranchUniversity;
 import com.umc.networkingService.domain.branch.repository.BranchRepository;
 import com.umc.networkingService.domain.branch.repository.BranchUniversityRepository;
 import com.umc.networkingService.domain.mascot.entity.Mascot;
 import com.umc.networkingService.domain.mascot.repository.MascotRepository;
+import com.umc.networkingService.domain.member.entity.Member;
+import com.umc.networkingService.domain.member.entity.MemberPosition;
+import com.umc.networkingService.domain.member.entity.PositionType;
+import com.umc.networkingService.domain.member.entity.SocialType;
+import com.umc.networkingService.domain.member.repository.MemberPositionRepository;
+import com.umc.networkingService.domain.member.repository.MemberRepository;
 import com.umc.networkingService.domain.project.entity.Project;
 import com.umc.networkingService.domain.project.entity.ProjectMember;
 import com.umc.networkingService.domain.project.repository.ProjectMemberRepository;
@@ -14,6 +24,7 @@
 import com.umc.networkingService.domain.university.repository.UniversityRepository;
 import com.umc.networkingService.global.common.enums.Semester;
 import com.umc.networkingService.global.common.exception.RestApiException;
+import com.umc.networkingService.global.common.exception.code.MemberErrorCode;
 import com.umc.networkingService.global.common.exception.code.ProjectErrorCode;
 import com.umc.networkingService.global.common.exception.code.UniversityErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -33,14 +44,22 @@ public class DataLoader implements ApplicationListener<ContextRefreshedEvent> {
     private final UniversityRepository universityRepository;
     private final BranchRepository branchRepository;
     private final BranchUniversityRepository branchUniversityRepository;
+
     private final ProjectRepository projectRepository;
     private final ProjectMemberRepository projectMemberRepository;
 
+    private final MemberRepository memberRepository;
+    private final MemberPositionRepository memberPositionRepository;
+    private final AlbumRepository albumRepository;
+    private final AlbumImageRepository albumImageRepository;
+
     private List<MascotInfo> mascots = Arrays.stream(MascotInfo.values()).toList();
     private List<UniversityInfo> universities = Arrays.stream(UniversityInfo.values()).toList();
     private List<BranchInfo> branches = Arrays.stream(BranchInfo.values()).toList();
     private List<ProjectInfo> projects = Arrays.stream(ProjectInfo.values()).toList();
     private List<ProjectMemberInfo> projectMembers = Arrays.stream(ProjectMemberInfo.values()).toList();
+    private List<MemberInfo> albumMembers = Arrays.stream(MemberInfo.values()).toList();
+    private List<AlbumInfo> albums = Arrays.stream(AlbumInfo.values()).toList();
 
     @Override
     public void onApplicationEvent(ContextRefreshedEvent event) {
@@ -60,6 +79,12 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
         // 새로운 프로젝트 생성
         List<Project> newProjects = insertNewProjects();
         if (!newProjects.isEmpty()) insertProjectMembers(newProjects);
+
+        // 앨범 작성자 생성
+        insertAlbumWriters();
+
+        // 앨범 데이터 생성
+        insertNewAlbums();
     }
 
     // 새로운 마스코트를 추가하는 함수
@@ -180,6 +205,71 @@ private Project findProject(List<Project> newProjects, String projectName) {
                 .orElseThrow(() -> new RestApiException(ProjectErrorCode.EMPTY_PROJECT));
     }
 
+    // 앨범 작성자를 추가하는 함수
+    private void insertAlbumWriters() {
+        albumMembers.stream()
+                .filter(albumMember -> !memberRepository.existsByClientIdAndSocialType(
+                        albumMember.getClientId(), albumMember.getType()))
+                .forEach(this::saveAlbumMember);
+    }
+
+    private void saveAlbumMember(MemberInfo albumMember) {
+        Member member = Member.builder()
+                .clientId(albumMember.getClientId())
+                .socialType(albumMember.getType())
+                .university(universityRepository.findByName(albumMember.getUniversity())
+                        .orElseThrow(() -> new RestApiException(UniversityErrorCode.EMPTY_UNIVERSITY)))
+                .nickname(albumMember.getNickname())
+                .name(albumMember.getName())
+                .role(albumMember.getRole())
+                .build();
+
+        insertMemberPosition(memberRepository.save(member), albumMember.getPosition());
+    }
+
+    // 앨범 작성자 직책을 추가하는 함수
+    private void insertMemberPosition(Member member, String position) {
+        MemberPosition memberPosition = MemberPosition.builder()
+                .member(member)
+                .name(position)
+                .type(PositionType.CAMPUS)
+                .build();
+
+        memberPositionRepository.save(memberPosition);
+    }
+
+    // 새로운 앨범을 추가하는 함수
+    private void insertNewAlbums() {
+        albums.stream()
+                .filter(album -> !albumRepository.existsByTitle(album.getTitle()))
+                .forEach(this::saveAlbum);
+    }
+
+    // 새로운 앨범을 저장하는 함수
+    private void saveAlbum(AlbumInfo albumInfo) {
+        Album album = Album.builder()
+                .writer(memberRepository.findByClientIdAndSocialType(
+                                albumInfo.getClientId(), SocialType.KAKAO)
+                        .orElseThrow(() -> new RestApiException(MemberErrorCode.EMPTY_MEMBER)))
+                .semester(albumInfo.getSemester())
+                .title(albumInfo.getTitle())
+                .content(albumInfo.getContent())
+                .build();
+
+        insertAlbumImages(
+                albumRepository.save(album),
+                albumInfo.getImages()
+        );
+    }
+
+    // 앨범 이미지를 추가하는 함수
+    private void insertAlbumImages(Album album, List<String> images) {
+        images.stream()
+                .map(image -> AlbumImage.builder()
+                        .album(album).url(image).build())
+                .forEach(albumImageRepository::save);
+    }
+
     @Override
     public boolean supportsAsyncExecution() {
         return ApplicationListener.super.supportsAsyncExecution();

src/main/java/com/umc/networkingService/config/initial/MemberInfo.java

@@ -0,0 +1,32 @@
+package com.umc.networkingService.config.initial;
+
+import com.umc.networkingService.domain.member.entity.SocialType;
+import com.umc.networkingService.global.common.enums.Part;
+import com.umc.networkingService.global.common.enums.Role;
+import com.umc.networkingService.global.common.enums.Semester;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum MemberInfo {
+
+    // 4기 회장
+    BORA("222222", "인하대학교", "보라", "유지수", SocialType.KAKAO, Role.CAMPUS_STAFF, "회장", Semester.FOURTH, Part.SPRING),
+
+    // 5기 회장
+    BEX("333333", "인하대학교", "벡스", "김준석", SocialType.KAKAO, Role.CAMPUS_STAFF, "회장", Semester.FIFTH, Part.SPRING),
+    ;
+
+    private final String clientId;
+    private final String university;
+    private final String nickname;
+    private final String name;
+    private final SocialType type;
+    private final Role role;
+    private final String position;
+    private final Semester semester;
+    private final Part part;
+
+
+}

src/main/java/com/umc/networkingService/domain/album/controller/AlbumCommentController.java

@@ -3,11 +3,13 @@
 import com.umc.networkingService.config.security.auth.CurrentMember;
 import com.umc.networkingService.domain.album.dto.request.AlbumCommentCreateRequest;
 import com.umc.networkingService.domain.album.dto.request.AlbumCommentUpdateRequest;
-import com.umc.networkingService.domain.album.dto.response.AlbumCommentIdResponse;
+import com.umc.networkingService.domain.album.dto.response.AlbumCommentResponse;
 import com.umc.networkingService.domain.album.service.AlbumCommentService;
 import com.umc.networkingService.domain.member.entity.Member;
 import com.umc.networkingService.global.common.base.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,10 +32,15 @@ public class AlbumCommentController {
             @ApiResponse(responseCode = "COMMON200", description = "성공"),
             @ApiResponse(responseCode = "ALBUM001", description = "존재하지 않는 사진첩입니다.")
     })
+    @Parameters(value = {
+            @Parameter(name = "commentId", description = "대댓글일 경우 상위 댓글 id값입니다.(대댓글이 아닐 경우, 미포함)"),
+    })
     @PostMapping
-    public BaseResponse<AlbumCommentIdResponse> createAlbumComment(@CurrentMember Member member,
-                                                                   @Valid @RequestBody AlbumCommentCreateRequest request) {
-        return BaseResponse.onSuccess(albumCommentService.createAlbumComment(member, request));
+    public BaseResponse<AlbumCommentResponse> createAlbumComment(
+            @CurrentMember Member member,
+            @RequestParam(required = false) UUID commentId,
+            @Valid @RequestBody AlbumCommentCreateRequest request) {
+        return BaseResponse.onSuccess(albumCommentService.createAlbumComment(member, commentId, request));
     }
 
     @Operation(summary = "댓글 수정 API", description = "댓글을 수정하는 API입니다.")
@@ -43,9 +50,10 @@ public BaseResponse<AlbumCommentIdResponse> createAlbumComment(@CurrentMember Me
             @ApiResponse(responseCode = "COMMENT002", description = "댓글 수정 권한이 없을 경우 발생")
     })
     @PatchMapping("/{commentId}")
-    public BaseResponse<AlbumCommentIdResponse> updateAlbumComment(@CurrentMember Member member,
-                                                                   @PathVariable(value = "commentId") UUID commentId,
-                                                                   @Valid @RequestBody AlbumCommentUpdateRequest request) {
+    public BaseResponse<AlbumCommentResponse> updateAlbumComment(
+            @CurrentMember Member member,
+            @PathVariable(value = "commentId") UUID commentId,
+            @Valid @RequestBody AlbumCommentUpdateRequest request) {
         return BaseResponse.onSuccess(albumCommentService.updateAlbumComment(member, commentId, request));
     }
 
@@ -56,8 +64,8 @@ public BaseResponse<AlbumCommentIdResponse> updateAlbumComment(@CurrentMember Me
             @ApiResponse(responseCode = "COMMENT002", description = "댓글 수정 권한이 없을 경우 발생")
     })
     @DeleteMapping("/{commentId}")
-    public BaseResponse<AlbumCommentIdResponse> deleteAlbumComment(@CurrentMember Member member,
-                                                                   @PathVariable(value = "commentId") UUID commentId) {
+    public BaseResponse<AlbumCommentResponse> deleteAlbumComment(@CurrentMember Member member,
+                                                                 @PathVariable(value = "commentId") UUID commentId) {
         return BaseResponse.onSuccess(albumCommentService.deleteAlbumComment(member, commentId));
     }
 }