Merge pull request #1381 from Moadong/feature/#1370-improve-promotion-MOA-777

Zepelown · web-flow · commit 6f1480097a9d · 2026-04-05T23:38:13.000+09:00
[feature] 홍보 게시글 삭제 기능 및 소프트 딜리트 적용
diff --git a/backend/src/main/java/moadong/club/controller/PromotionArticleController.java b/backend/src/main/java/moadong/club/controller/PromotionArticleController.java
@@ -13,6 +13,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -56,4 +57,13 @@ public ResponseEntity<?> updatePromotionArticle(
         promotionArticleService.updatePromotionArticle(articleId, request);
         return Response.ok("홍보 게시글이 수정되었습니다.");
     }
+
+    @DeleteMapping("/{articleId}")
+    @Operation(summary = "홍보 게시글 삭제", description = "기존 홍보 게시글을 삭제합니다.")
+    @PreAuthorize("hasRole('DEVELOPER')")
+    @SecurityRequirement(name = "BearerAuth")
+    public ResponseEntity<?> deletePromotionArticle(@PathVariable String articleId) {
+        promotionArticleService.deletePromotionArticle(articleId);
+        return Response.ok("홍보 게시글이 삭제되었습니다.", null);
+    }
 }
diff --git a/backend/src/main/java/moadong/club/entity/PromotionArticle.java b/backend/src/main/java/moadong/club/entity/PromotionArticle.java
@@ -40,6 +40,11 @@ public class PromotionArticle {
     @Builder.Default
     private Instant createdAt = Instant.now();
 
+    @Builder.Default
+    private boolean deleted = false;
+
+    private Instant deletedAt;
+
     public void update(PromotionArticleUpdateRequest request, String clubName) {
         this.clubId = request.clubId();
         this.clubName = clubName;
@@ -50,4 +55,9 @@ public void update(PromotionArticleUpdateRequest request, String clubName) {
         this.description = request.description();
         this.images = request.images();
     }
+
+    public void softDelete() {
+        this.deleted = true;
+        this.deletedAt = Instant.now();
+    }
 }
diff --git a/backend/src/main/java/moadong/club/repository/PromotionArticleRepository.java b/backend/src/main/java/moadong/club/repository/PromotionArticleRepository.java
@@ -2,14 +2,24 @@
 
 import moadong.club.entity.PromotionArticle;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface PromotionArticleRepository extends MongoRepository<PromotionArticle, String> {
 
-    List<PromotionArticle> findAllByOrderByCreatedAtDesc();
+    @Query(value = "{ 'deleted': { $ne: true } }", sort = "{ 'createdAt': -1 }")
+    List<PromotionArticle> findAllActiveOrderByCreatedAtDesc();
 
-    List<PromotionArticle> findByClubIdOrderByCreatedAtDesc(String clubId);
+    @Query(value = "{ 'clubId': ?0, 'deleted': { $ne: true } }", sort = "{ 'createdAt': -1 }")
+    List<PromotionArticle> findActiveByClubIdOrderByCreatedAtDesc(String clubId);
+
+    @Query("{ '_id': ?0, 'deleted': { $ne: true } }")
+    Optional<PromotionArticle> findActiveById(String id);
+
+    @Query(value = "{ '_id': ?0, 'deleted': { $ne: true } }", exists = true)
+    boolean existsActiveById(String id);
 }
diff --git a/backend/src/main/java/moadong/club/service/PromotionArticleService.java b/backend/src/main/java/moadong/club/service/PromotionArticleService.java
@@ -27,7 +27,7 @@ public class PromotionArticleService {
     private final ClubRepository clubRepository;
 
     public PromotionArticleResponse getPromotionArticles() {
-        List<PromotionArticleDto> articles = promotionArticleRepository.findAllByOrderByCreatedAtDesc()
+        List<PromotionArticleDto> articles = promotionArticleRepository.findAllActiveOrderByCreatedAtDesc()
             .stream()
             .map(PromotionArticleDto::from)
             .toList();
@@ -55,14 +55,23 @@ public PromotionArticleCreateResultDto createPromotionArticle(PromotionArticleCr
 
     @Transactional
     public void updatePromotionArticle(String articleId, PromotionArticleUpdateRequest request) {
-        PromotionArticle article = promotionArticleRepository.findById(articleId)
+        PromotionArticle article = promotionArticleRepository.findActiveById(articleId)
             .orElseThrow(() -> new RestApiException(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND));
         Club club = getClub(request.clubId());
 
         article.update(request, club.getName());
         promotionArticleRepository.save(article);
     }
 
+    @Transactional
+    public void deletePromotionArticle(String articleId) {
+        PromotionArticle article = promotionArticleRepository.findActiveById(articleId)
+            .orElseThrow(() -> new RestApiException(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND));
+
+        article.softDelete();
+        promotionArticleRepository.save(article);
+    }
+
     private Club getClub(String clubId) {
         ObjectId clubObjectId = ObjectIdConverter.convertString(clubId);
         return clubRepository.findClubById(clubObjectId)
diff --git a/backend/src/main/java/moadong/media/service/PromotionImageUploadService.java b/backend/src/main/java/moadong/media/service/PromotionImageUploadService.java
@@ -35,7 +35,7 @@ public PromotionImageUploadResponse upload(String articleId, MultipartFile file)
     }
 
     private void ensurePromotionArticleExists(String articleId) {
-        if (!promotionArticleRepository.existsById(articleId)) {
+        if (!promotionArticleRepository.existsActiveById(articleId)) {
             throw new RestApiException(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND);
         }
     }
diff --git a/backend/src/main/resources/static/dev/index.html b/backend/src/main/resources/static/dev/index.html
@@ -345,6 +345,7 @@ <h3>선택된 게시글 편집</h3>
           <div class="promotion-actions">
             <button type="button" id="btnSavePromotion">저장</button>
             <button type="button" id="btnResetPromotion">원본으로 되돌리기</button>
+            <button type="button" id="btnDeletePromotion">삭제</button>
             <button type="button" id="btnClearPromotionSelection">선택 해제</button>
           </div>
           <p id="promotionHelpText" class="promotion-help">기존 게시글의 `clubId`는 읽기 전용입니다. 저장 후 목록을 다시 조회해 서버 기준 최신값으로 동기화합니다.</p>
@@ -517,6 +518,7 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
     let promotionIsLoading = false;
     let promotionIsSaving = false;
     let promotionIsUploading = false;
+    let promotionIsDeleting = false;
 
     function getToken() { return sessionStorage.getItem('devPortalToken') || ''; }
     function setToken(t) { sessionStorage.setItem('devPortalToken', t); }
@@ -1084,7 +1086,7 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       const hasSelection = !!promotionSelectedArticleId;
       const isCreateMode = isPromotionCreateMode();
       const hasEditorTarget = hasSelection || isCreateMode;
-      const busy = promotionIsLoading || promotionIsSaving || promotionIsUploading;
+      const busy = promotionIsLoading || promotionIsSaving || promotionIsUploading || promotionIsDeleting;
       const dirty = isPromotionDirty();
       const badge = document.getElementById('promotionEditingBadge');
       const summary = document.getElementById('promotionSelectionSummary');
@@ -1097,6 +1099,7 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       const btnCreate = document.getElementById('btnCreatePromotion');
       const btnSave = document.getElementById('btnSavePromotion');
       const btnReset = document.getElementById('btnResetPromotion');
+      const btnDelete = document.getElementById('btnDeletePromotion');
       const btnClear = document.getElementById('btnClearPromotionSelection');
 
       PROMOTION_FORM_IDS.forEach((id) => {
@@ -1111,10 +1114,12 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       btnCreate.disabled = busy;
       btnSave.disabled = busy || !hasEditorTarget;
       btnReset.disabled = busy || !hasEditorTarget || !dirty;
+      btnDelete.disabled = busy || !hasSelection || isCreateMode;
       btnClear.disabled = busy || !hasEditorTarget;
       btnSave.textContent = promotionIsSaving
         ? (isCreateMode ? '생성 중...' : '저장 중...')
         : (isCreateMode ? '생성' : '저장');
+      btnDelete.textContent = promotionIsDeleting ? '삭제 중...' : '삭제';
 
       if (isCreateMode) {
         badge.textContent = dirty ? '새 게시글 작성 중 · 저장되지 않은 변경 있음' : '새 게시글 작성 중';
@@ -1326,7 +1331,7 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       const removeBtn = document.createElement('button');
       removeBtn.type = 'button';
       removeBtn.textContent = '제거';
-      removeBtn.disabled = promotionIsLoading || promotionIsSaving || promotionIsUploading || (!promotionSelectedArticleId && !isPromotionCreateMode());
+      removeBtn.disabled = promotionIsLoading || promotionIsSaving || promotionIsUploading || promotionIsDeleting || (!promotionSelectedArticleId && !isPromotionCreateMode());
       removeBtn.onclick = () => {
         removePromotionImageAt(index);
       };
@@ -1463,6 +1468,15 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       return { res, data };
     }
 
+    async function deletePromotionArticleRequest(articleId) {
+      const res = await fetch(API_BASE + '/api/promotion/' + encodeURIComponent(articleId), {
+        method: 'DELETE',
+        headers: headers()
+      });
+      const data = await readJsonOrEmpty(res);
+      return { res, data };
+    }
+
     function clearPromotionState() {
       promotionArticles = [];
       promotionEditorMode = 'edit';
@@ -1472,6 +1486,7 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       promotionIsLoading = false;
       promotionIsSaving = false;
       promotionIsUploading = false;
+      promotionIsDeleting = false;
       document.getElementById('promotionListLoading').classList.add('hidden');
       document.getElementById('promotionImageUploadFile').value = '';
       clearPromotionBanner();
@@ -1537,6 +1552,67 @@ <h2>이미지 변환 배치 (전체 동아리)</h2>
       clearPromotionSelection();
     };
 
+    document.getElementById('btnDeletePromotion').onclick = async () => {
+      const selectedId = promotionSelectedArticleId;
+      const selectedArticle = promotionArticles.find((article) => article.id === selectedId);
+      if (!selectedId || !selectedArticle) {
+        showPromotionSaveResult(false, '삭제할 홍보 게시글을 먼저 선택하세요.');
+        return;
+      }
+
+      const articleLabel = selectedArticle.title ? '"' + selectedArticle.title + '"' : '선택한 홍보 게시글';
+      const confirmMessage = isPromotionDirty()
+        ? '저장되지 않은 변경사항이 있습니다. ' + articleLabel + '을(를) 정말 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.'
+        : articleLabel + '을(를) 정말 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.';
+      if (!confirm(confirmMessage)) return;
+
+      promotionIsDeleting = true;
+      updatePromotionEditorState();
+      clearPromotionBanner();
+      hidePromotionSaveResult();
+
+      try {
+        const { res, data } = await deletePromotionArticleRequest(selectedId);
+        if (res.status === 403) {
+          showPromotionSaveResult(false, '개발자 계정으로 로그인하세요.');
+          return;
+        }
+        if (res.status === 404) {
+          if (data.statuscode === '902-1') {
+            promotionArticles = promotionArticles.filter((article) => article.id !== selectedId);
+            clearPromotionSelection({ keepMessage: true });
+            showPromotionSaveResult(false, data.message || '선택한 홍보 게시글을 찾을 수 없습니다. 목록을 새로고침하세요.');
+          } else {
+            showPromotionSaveResult(false, data.message || '홍보 게시글 삭제 실패 (HTTP ' + res.status + ')');
+          }
+          return;
+        }
+        if (!res.ok) {
+          showPromotionSaveResult(false, data.message || '홍보 게시글 삭제 실패 (HTTP ' + res.status + ')');
+          return;
+        }
+
+        const deleteSuccessMessage = getApiSuccessMessage(data, '홍보 게시글이 삭제되었습니다.');
+        const syncResult = await reloadPromotionList({ keepMessage: true });
+        if (!syncResult.ok) {
+          clearPromotionSelection({ keepMessage: true });
+          showPromotionSaveResult(true, deleteSuccessMessage);
+          setPromotionBanner('삭제는 완료되었지만 목록 동기화에 실패했습니다. 목록을 새로고침해 확인하세요.', 'warn');
+          return;
+        }
+
+        clearPromotionSelection({ keepMessage: true });
+        clearPromotionBanner();
+        showPromotionSaveResult(true, deleteSuccessMessage);
+        showToast('홍보 게시글 삭제 완료', 'success');
+      } catch (e) {
+        showPromotionSaveResult(false, e.message || '요청 실패');
+      } finally {
+        promotionIsDeleting = false;
+        updatePromotionEditorState();
+      }
+    };
+
     function extractCreatedPromotionId(data) {
       return data?.data?.articleId || data?.data?.id || data?.articleId || data?.id || '';
     }
diff --git a/backend/src/test/java/moadong/club/controller/PromotionArticleControllerTest.java b/backend/src/test/java/moadong/club/controller/PromotionArticleControllerTest.java
@@ -0,0 +1,34 @@
+package moadong.club.controller;
+
+import moadong.club.service.PromotionArticleService;
+import moadong.global.payload.Response;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class PromotionArticleControllerTest {
+
+    @Mock
+    private PromotionArticleService promotionArticleService;
+
+    @InjectMocks
+    private PromotionArticleController promotionArticleController;
+
+    @Test
+    void 홍보게시글을_삭제하면_성공응답을_반환한다() {
+        ResponseEntity<?> response = promotionArticleController.deletePromotionArticle("article-1");
+
+        assertEquals(200, response.getStatusCode().value());
+        @SuppressWarnings("unchecked")
+        Response<Object> body = (Response<Object>) response.getBody();
+        assertEquals("홍보 게시글이 삭제되었습니다.", body.message());
+        verify(promotionArticleService).deletePromotionArticle("article-1");
+    }
+}
diff --git a/backend/src/test/java/moadong/club/service/PromotionArticleServiceTest.java b/backend/src/test/java/moadong/club/service/PromotionArticleServiceTest.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -54,7 +55,7 @@ class PromotionArticleServiceTest {
             .description("설명")
             .images(List.of("image-1"))
             .build();
-        when(promotionArticleRepository.findAllByOrderByCreatedAtDesc()).thenReturn(List.of(article));
+        when(promotionArticleRepository.findAllActiveOrderByCreatedAtDesc()).thenReturn(List.of(article));
 
         PromotionArticleResponse response = promotionArticleService.getPromotionArticles();
 
@@ -63,6 +64,15 @@ class PromotionArticleServiceTest {
         assertEquals("모아동", response.articles().get(0).clubName());
     }
 
+    @Test
+    void 홍보게시글_목록조회시_활성게시글_기준_조회한다() {
+        when(promotionArticleRepository.findAllActiveOrderByCreatedAtDesc()).thenReturn(List.of());
+
+        promotionArticleService.getPromotionArticles();
+
+        verify(promotionArticleRepository).findAllActiveOrderByCreatedAtDesc();
+    }
+
     @Test
     void 홍보게시글을_수정한다() {
         String clubId = new ObjectId().toHexString();
@@ -86,7 +96,7 @@ class PromotionArticleServiceTest {
             "수정 설명",
             List.of("new-image-1", "new-image-2")
         );
-        when(promotionArticleRepository.findById("article-1")).thenReturn(Optional.of(article));
+        when(promotionArticleRepository.findActiveById("article-1")).thenReturn(Optional.of(article));
         when(clubRepository.findClubById(new ObjectId(clubId))).thenReturn(Optional.of(Club.builder()
             .name("수정 동아리")
             .category("category")
@@ -157,12 +167,58 @@ class PromotionArticleServiceTest {
             "수정 설명",
             List.of("new-image")
         );
-        when(promotionArticleRepository.findById("missing-article")).thenReturn(Optional.empty());
+        when(promotionArticleRepository.findActiveById("missing-article")).thenReturn(Optional.empty());
 
         RestApiException exception = assertThrows(RestApiException.class,
             () -> promotionArticleService.updatePromotionArticle("missing-article", request));
 
         assertEquals(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND, exception.getErrorCode());
         verify(clubRepository, never()).findClubById(org.mockito.ArgumentMatchers.any());
     }
+
+    @Test
+    void 삭제된_홍보게시글은_수정할_수_없다() {
+        PromotionArticleUpdateRequest request = new PromotionArticleUpdateRequest(
+            new ObjectId().toHexString(),
+            "수정 제목",
+            "수정 장소",
+            Instant.parse("2026-04-01T00:00:00Z"),
+            Instant.parse("2026-04-10T00:00:00Z"),
+            "수정 설명",
+            List.of("new-image")
+        );
+        when(promotionArticleRepository.findActiveById("deleted-article")).thenReturn(Optional.empty());
+
+        RestApiException exception = assertThrows(RestApiException.class,
+            () -> promotionArticleService.updatePromotionArticle("deleted-article", request));
+
+        assertEquals(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND, exception.getErrorCode());
+        verify(clubRepository, never()).findClubById(org.mockito.ArgumentMatchers.any());
+    }
+
+    @Test
+    void 홍보게시글을_삭제한다() {
+        PromotionArticle article = PromotionArticle.builder()
+            .id("article-1")
+            .build();
+        when(promotionArticleRepository.findActiveById("article-1")).thenReturn(Optional.of(article));
+
+        promotionArticleService.deletePromotionArticle("article-1");
+
+        assertTrue(article.isDeleted());
+        assertNotNull(article.getDeletedAt());
+        verify(promotionArticleRepository).save(article);
+        verify(promotionArticleRepository, never()).deleteById("article-1");
+    }
+
+    @Test
+    void 삭제대상_홍보게시글이_없으면_예외를_던진다() {
+        when(promotionArticleRepository.findActiveById("missing-article")).thenReturn(Optional.empty());
+
+        RestApiException exception = assertThrows(RestApiException.class,
+            () -> promotionArticleService.deletePromotionArticle("missing-article"));
+
+        assertEquals(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND, exception.getErrorCode());
+        verify(promotionArticleRepository, never()).deleteById("missing-article");
+    }
 }
diff --git a/backend/src/test/java/moadong/media/service/PromotionImageUploadServiceTest.java b/backend/src/test/java/moadong/media/service/PromotionImageUploadServiceTest.java
diff --git a/docs/spec/promotion-admin-delete-spec.md b/docs/spec/promotion-admin-delete-spec.md
diff --git a/docs/spec/promotion-admin-soft-delete-spec.md b/docs/spec/promotion-admin-soft-delete-spec.md

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public PromotionImageUploadResponse upload(String articleId, MultipartFile file)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private void ensurePromotionArticleExists(String articleId) {`
`38`		`- if (!promotionArticleRepository.existsById(articleId)) {`
	`38`	`+ if (!promotionArticleRepository.existsActiveById(articleId)) {`
`39`	`39`	`throw new RestApiException(ErrorCode.PROMOTION_ARTICLE_NOT_FOUND);`
`40`	`40`	`}`
`41`	`41`	`}`