Merge pull request #1329 from Moadong/develop/be

lepitaaar · web-flow · commit ab6ef67463c0 · 2026-03-09T14:11:15.000+09:00
[release] BE
diff --git a/backend/src/main/java/moadong/club/controller/PromotionArticleController.java b/backend/src/main/java/moadong/club/controller/PromotionArticleController.java
@@ -5,14 +5,17 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import moadong.club.payload.request.PromotionArticleCreateRequest;
+import moadong.club.payload.request.PromotionArticleUpdateRequest;
 import moadong.club.payload.response.PromotionArticleResponse;
 import moadong.club.service.PromotionArticleService;
 import moadong.global.payload.Response;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -41,4 +44,15 @@ public ResponseEntity<?> createPromotionArticle(
         promotionArticleService.createPromotionArticle(request);
         return Response.ok("홍보 게시글이 생성되었습니다.");
     }
+
+    @PutMapping("/{articleId}")
+    @Operation(summary = "홍보 게시글 수정", description = "기존 홍보 게시글을 수정합니다.")
+    @PreAuthorize("hasRole('DEVELOPER')")
+    @SecurityRequirement(name = "BearerAuth")
+    public ResponseEntity<?> updatePromotionArticle(
+        @PathVariable String articleId,
+        @RequestBody @Validated PromotionArticleUpdateRequest request) {
+        promotionArticleService.updatePromotionArticle(articleId, request);
+        return Response.ok("홍보 게시글이 수정되었습니다.");
+    }
 }
diff --git a/backend/src/main/java/moadong/club/entity/PromotionArticle.java b/backend/src/main/java/moadong/club/entity/PromotionArticle.java
@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import moadong.club.payload.request.PromotionArticleUpdateRequest;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -38,4 +39,15 @@ public class PromotionArticle {
 
     @Builder.Default
     private Instant createdAt = Instant.now();
+
+    public void update(PromotionArticleUpdateRequest request, String clubName) {
+        this.clubId = request.clubId();
+        this.clubName = clubName;
+        this.title = request.title();
+        this.location = request.location();
+        this.eventStartDate = request.eventStartDate();
+        this.eventEndDate = request.eventEndDate();
+        this.description = request.description();
+        this.images = request.images();
+    }
 }
diff --git a/backend/src/main/java/moadong/club/payload/dto/PromotionArticleDto.java b/backend/src/main/java/moadong/club/payload/dto/PromotionArticleDto.java
@@ -1,9 +1,12 @@
 package moadong.club.payload.dto;
 
+import moadong.club.entity.PromotionArticle;
+
 import java.time.Instant;
 import java.util.List;
 
 public record PromotionArticleDto(
+    String id,
     String clubName,
     String clubId,
     String title,
@@ -13,4 +16,17 @@ public record PromotionArticleDto(
     String description,
     List<String> images
 ) {
+    public static PromotionArticleDto from(PromotionArticle article) {
+        return new PromotionArticleDto(
+            article.getId(),
+            article.getClubName(),
+            article.getClubId(),
+            article.getTitle(),
+            article.getLocation(),
+            article.getEventStartDate(),
+            article.getEventEndDate(),
+            article.getDescription(),
+            article.getImages()
+        );
+    }
 }
diff --git a/backend/src/main/java/moadong/club/payload/request/PromotionArticleCreateRequest.java b/backend/src/main/java/moadong/club/payload/request/PromotionArticleCreateRequest.java
@@ -10,7 +10,7 @@
 public record PromotionArticleCreateRequest(
     @NotBlank String clubId,
     @NotBlank String title,
-    String location,
+    @NotBlank String location,
     @NotNull Instant eventStartDate,
     @NotNull Instant eventEndDate,
     @NotBlank String description,
diff --git a/backend/src/main/java/moadong/club/payload/request/PromotionArticleUpdateRequest.java b/backend/src/main/java/moadong/club/payload/request/PromotionArticleUpdateRequest.java
@@ -0,0 +1,19 @@
+package moadong.club.payload.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.time.Instant;
+import java.util.List;
+
+public record PromotionArticleUpdateRequest(
+    @NotBlank String clubId,
+    @NotBlank String title,
+    @NotBlank String location,
+    @NotNull Instant eventStartDate,
+    @NotNull Instant eventEndDate,
+    @NotBlank String description,
+    @NotEmpty List<String> images
+) {
+}
diff --git a/backend/src/main/java/moadong/club/repository/PromotionArticleRepository.java b/backend/src/main/java/moadong/club/repository/PromotionArticleRepository.java
@@ -1,18 +1,15 @@
 package moadong.club.repository;
 
 import moadong.club.entity.PromotionArticle;
-import moadong.club.payload.dto.PromotionArticleDto;
 import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.mongodb.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
 public interface PromotionArticleRepository extends MongoRepository<PromotionArticle, String> {
 
-    @Query(value = "{}", sort = "{ 'createdAt': -1 }")
-    List<PromotionArticleDto> findAllProjectedBy();
+    List<PromotionArticle> findAllByOrderByCreatedAtDesc();
 
     List<PromotionArticle> findByClubIdOrderByCreatedAtDesc(String clubId);
 }
diff --git a/backend/src/main/java/moadong/club/service/PromotionArticleService.java b/backend/src/main/java/moadong/club/service/PromotionArticleService.java
@@ -5,6 +5,7 @@
 import moadong.club.entity.PromotionArticle;
 import moadong.club.payload.dto.PromotionArticleDto;
 import moadong.club.payload.request.PromotionArticleCreateRequest;
+import moadong.club.payload.request.PromotionArticleUpdateRequest;
 import moadong.club.payload.response.PromotionArticleResponse;
 import moadong.club.repository.ClubRepository;
 import moadong.club.repository.PromotionArticleRepository;
@@ -25,15 +26,16 @@ public class PromotionArticleService {
     private final ClubRepository clubRepository;
 
     public PromotionArticleResponse getPromotionArticles() {
-        List<PromotionArticleDto> articles = promotionArticleRepository.findAllProjectedBy();
+        List<PromotionArticleDto> articles = promotionArticleRepository.findAllByOrderByCreatedAtDesc()
+            .stream()
+            .map(PromotionArticleDto::from)
+            .toList();
         return new PromotionArticleResponse(articles);
     }
 
     @Transactional
     public void createPromotionArticle(PromotionArticleCreateRequest request) {
-        ObjectId clubObjectId = ObjectIdConverter.convertString(request.clubId());
-        Club club = clubRepository.findClubById(clubObjectId)
-            .orElseThrow(() -> new RestApiException(ErrorCode.CLUB_NOT_FOUND));
+        Club club = getClub(request.clubId());
 
         PromotionArticle article = PromotionArticle.builder()
             .clubId(request.clubId())
@@ -48,4 +50,20 @@ public void createPromotionArticle(PromotionArticleCreateRequest request) {
 
         promotionArticleRepository.save(article);
     }
+
+    @Transactional
+    public void updatePromotionArticle(String articleId, PromotionArticleUpdateRequest request) {
+        PromotionArticle article = promotionArticleRepository.findById(articleId)
+            .orElseThrow(() -> new RestApiException(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND));
+        Club club = getClub(request.clubId());
+
+        article.update(request, club.getName());
+        promotionArticleRepository.save(article);
+    }
+
+    private Club getClub(String clubId) {
+        ObjectId clubObjectId = ObjectIdConverter.convertString(clubId);
+        return clubRepository.findClubById(clubObjectId)
+            .orElseThrow(() -> new RestApiException(ErrorCode.CLUB_NOT_FOUND));
+    }
 }
diff --git a/backend/src/main/java/moadong/fcm/controller/StudentFcmController.java b/backend/src/main/java/moadong/fcm/controller/StudentFcmController.java
@@ -4,14 +4,15 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import moadong.fcm.payload.request.StudentFcmTokenRotateRequest;
 import moadong.fcm.payload.response.ClubSubscribeListResponse;
 import moadong.fcm.payload.response.StudentFcmTokenRotateResponse;
 import moadong.fcm.service.StudentFcmTokenService;
 import moadong.global.payload.Response;
 import moadong.user.service.StudentJwtService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +23,7 @@
 @RestController
 @RequestMapping("/api/student")
 @RequiredArgsConstructor
+@Slf4j
 @Tag(name = "Student FCM", description = "학생 FCM 토큰 관리 API")
 public class StudentFcmController {
 
@@ -35,8 +37,13 @@ public ResponseEntity<?> rotateFcmToken(
             @RequestHeader("Authorization") String authorization,
             @RequestBody StudentFcmTokenRotateRequest request
     ) {
+        log.info("Student FCM token rotate request received. authorization={}, fcmToken={}",
+                maskAuthorization(authorization), maskToken(request.fcmToken()));
         if (request.fcmToken() == null) return Response.ok("pass");
+
         String studentId = studentJwtService.extractStudentId(authorization);
+        log.info("Student FCM token rotate request parsed. studentId={}", studentId);
+
         StudentFcmTokenRotateResponse response = studentFcmTokenService.rotateFcmToken(studentId, request.fcmToken());
         return Response.ok(response);
     }
@@ -47,8 +54,26 @@ public ResponseEntity<?> rotateFcmToken(
     public ResponseEntity<?> getSubscribedClubs(
             @RequestHeader("Authorization") String authorization
     ) {
+        log.info("Student subscribed clubs request received. authorization={}", maskAuthorization(authorization));
+
         String studentId = studentJwtService.extractStudentId(authorization);
+        log.info("Student subscribed clubs request parsed. studentId={}", studentId);
+
         ClubSubscribeListResponse response = studentFcmTokenService.getSubscribedClubs(studentId);
         return Response.ok(response);
     }
+
+    private String maskAuthorization(String authorization) {
+        if (!StringUtils.hasText(authorization) || authorization.length() < 10) {
+            return "***";
+        }
+        return authorization.substring(0, 6) + "..." + authorization.substring(authorization.length() - 4);
+    }
+
+    private String maskToken(String token) {
+        if (!StringUtils.hasText(token) || token.length() < 10) {
+            return "***";
+        }
+        return token.substring(0, 6) + "..." + token.substring(token.length() - 4);
+    }
 }
diff --git a/backend/src/main/java/moadong/global/exception/ErrorCode.java b/backend/src/main/java/moadong/global/exception/ErrorCode.java
@@ -68,7 +68,11 @@ public enum ErrorCode {
     // 901xx: FCM 관련 오류
     FCMTOKEN_NOT_FOUND(HttpStatus.NOT_FOUND, "901-1", "존재하지 않는 토큰입니다."),
     FCMTOKEN_SUBSCRIBE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "901-2", "동아리 구독중에 오류가 발생 하였습니다."),
-    FCMMESSAGE_SEND_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "901-3", "FCM 메시지 전송 중 오류가 발생했습니다.");
+    FCMMESSAGE_SEND_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "901-3", "FCM 메시지 전송 중 오류가 발생했습니다."),
+
+    // 902xx: 홍보게시판 오류
+    PROMOTION_ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "902-1", "홍보 게시글이 존재하지 않습니다."),
+    ;
 
     private final HttpStatus httpStatus;
     private final String code;
diff --git a/backend/src/main/java/moadong/media/controller/BannerImagesController.java b/backend/src/main/java/moadong/media/controller/BannerImagesController.java
@@ -5,14 +5,18 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import moadong.global.payload.Response;
+import moadong.media.dto.BannerImageUploadResponse;
 import moadong.media.dto.BannerImagesRequest;
 import moadong.media.dto.BannerImagesResponse;
 import moadong.media.enums.PlatformType;
+import moadong.media.service.BannerImageUploadService;
 import moadong.media.service.BannerImagesService;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/api/banner")
@@ -21,6 +25,7 @@
 public class BannerImagesController {
 
     private final BannerImagesService bannerImagesService;
+    private final BannerImageUploadService bannerImageUploadService;
 
     @PutMapping
     @PreAuthorize("hasRole('DEVELOPER')")
@@ -37,4 +42,14 @@ public ResponseEntity<?> getBannerImages(@RequestParam(value = "type", required
         BannerImagesResponse response = bannerImagesService.getBannerImages(type);
         return Response.ok(response);
     }
+
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PreAuthorize("hasRole('DEVELOPER')")
+    @SecurityRequirement(name = "BearerAuth")
+    @Operation(summary = "배너 이미지 업로드", description = "배너 이미지를 Cloudflare R2 배너 버킷에 업로드하고 최종 URL을 반환합니다.")
+    public ResponseEntity<?> uploadBannerImage(@RequestPart("file") MultipartFile file,
+                                               @RequestParam("type") PlatformType type) {
+        BannerImageUploadResponse response = bannerImageUploadService.upload(file, type);
+        return Response.ok("배너 이미지가 업로드되었습니다.", response);
+    }
 }
diff --git a/backend/src/main/java/moadong/media/dto/BannerImageUploadResponse.java b/backend/src/main/java/moadong/media/dto/BannerImageUploadResponse.java
@@ -0,0 +1,6 @@
+package moadong.media.dto;
+
+public record BannerImageUploadResponse(
+    String imageUrl
+) {
+}
diff --git a/backend/src/main/java/moadong/media/service/BannerImageUploadService.java b/backend/src/main/java/moadong/media/service/BannerImageUploadService.java
diff --git a/backend/src/main/resources/static/dev/index.html b/backend/src/main/resources/static/dev/index.html
diff --git a/backend/src/test/java/moadong/club/service/PromotionArticleServiceTest.java b/backend/src/test/java/moadong/club/service/PromotionArticleServiceTest.java
diff --git a/backend/src/test/java/moadong/media/service/BannerImageUploadServiceTest.java b/backend/src/test/java/moadong/media/service/BannerImageUploadServiceTest.java
