✨ feat: 공고 수정 기능 개발 (#41)

Co-authored-by: 이소정 <[email protected]>
Co-authored-by: seheonnn <[email protected]>

Author: 3 people

http/test.http

@@ -30,7 +30,7 @@ Content-Type: application/json
 }
 
 ### 공고 생성
-POST http://localhost:8080/api/v1/announcement
+POST http://localhost:8080/api/v1/announcements
 Authorization: Bearer {{matsterToken}}
 Content-Type: application/json
 
@@ -43,12 +43,25 @@ Content-Type: application/json
 }
 
 ### 상세 조회
-GET http://localhost:8080/api/v1/announcement/1
+GET http://localhost:8080/api/v1/announcements/2
 
 ### 삭제 (생성한 단체만 삭제 가능)
-DELETE http://localhost:8080/api/v1/announcement/1
+DELETE http://localhost:8080/api/v1/announcements/1
 Authorization: Bearer {{matsterToken}}
 
+### 공고 수정
+PATCH http://localhost:8080/api/v1/announcements/1
+Authorization: Bearer {{matsterToken}}
+Content-Type: application/json
+
+{
+  "title": "스포너스 스폰서십",
+  "type": "SPONSORSHIP",
+  "category": "MARKETING",
+  "content": "스포너스 스폰서십을 진행할 대학교 학생회를 모집합니다.",
+  "status": "POSTED"
+}
+
 ### 보고서 작성
 POST http://localhost:8080/api/v1/reports
 Content-Type: application/json

src/main/java/com/sponus/sponusbe/domain/announcement/controller/AnnouncementController.java

@@ -16,6 +16,8 @@
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementCreateRequest;
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementCreateResponse;
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementResponse;
+import com.sponus.sponusbe.domain.announcement.dto.AnnouncementUpdateRequest;
+import com.sponus.sponusbe.domain.announcement.dto.AnnouncementUpdateResponse;
 import com.sponus.sponusbe.domain.announcement.service.AnnouncementQueryService;
 import com.sponus.sponusbe.domain.announcement.service.AnnouncementService;
 import com.sponus.sponusbe.domain.organization.entity.Organization;
@@ -71,8 +73,13 @@ public ApiResponse<Void> deleteAnnouncement(
 	}
 
 	@PatchMapping("/{announcementId}")
-	public ApiResponse<?> updateAnnouncement(@PathVariable Long announcementId) {
-		return null;
+	public ApiResponse<AnnouncementUpdateResponse> updateAnnouncement(
+		@AuthOrganization Organization authOrganization,
+		@PathVariable Long announcementId,
+		@RequestBody @Valid AnnouncementUpdateRequest request
+	) {
+		announcementService.updateAnnouncement(authOrganization, announcementId, request);
+		return ApiResponse.onSuccess(announcementService.updateAnnouncement(authOrganization, announcementId, request));
 	}
 
 }

src/main/java/com/sponus/sponusbe/domain/announcement/dto/AnnouncementUpdateRequest.java

@@ -0,0 +1,37 @@
+package com.sponus.sponusbe.domain.announcement.dto;
+
+import com.sponus.sponusbe.domain.announcement.entity.Announcement;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementCategory;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementStatus;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementType;
+import com.sponus.sponusbe.domain.organization.entity.Organization;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Builder
+public record AnnouncementUpdateRequest(
+	@NotBlank(message = "[ERROR] 타이틀 입력은 필수 입니다.")
+	String title,
+	@NotNull(message = "[ERROR] 유형 입력은 필수 입니다.")
+	AnnouncementType type,
+	@NotNull(message = "[ERROR] 카테코리 입력은 필수 입니다.")
+	AnnouncementCategory category,
+	@NotBlank(message = "[ERROR] 내용 입력은 필수 입니다.")
+	String content,
+
+	AnnouncementStatus status
+) {
+
+	public Announcement toEntity(Organization writer) {
+		return Announcement.builder()
+			.writer(writer)
+			.title(title)
+			.type(type)
+			.category(category)
+			.content(content)
+			.status(status)
+			.build();
+	}
+}

src/main/java/com/sponus/sponusbe/domain/announcement/dto/AnnouncementUpdateResponse.java

@@ -0,0 +1,33 @@
+package com.sponus.sponusbe.domain.announcement.dto;
+
+import com.sponus.sponusbe.domain.announcement.entity.Announcement;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementCategory;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementStatus;
+import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementType;
+
+import lombok.Builder;
+
+@Builder
+public record AnnouncementUpdateResponse(
+	Long id,
+	Long writerId,
+	String title,
+	AnnouncementType type,
+	AnnouncementCategory category,
+	String content,
+	AnnouncementStatus status,
+	Long viewCount
+) {
+	public static AnnouncementUpdateResponse from(Announcement announcement) {
+		return AnnouncementUpdateResponse.builder()
+			.id(announcement.getId())
+			.writerId(announcement.getWriter().getId())
+			.title(announcement.getTitle())
+			.type(announcement.getType())
+			.category(announcement.getCategory())
+			.content(announcement.getContent())
+			.status(AnnouncementStatus.POSTED)
+			.viewCount(announcement.getViewCount())
+			.build();
+	}
+}

src/main/java/com/sponus/sponusbe/domain/announcement/entity/Announcement.java

@@ -66,4 +66,11 @@ public class Announcement extends BaseEntity {
 	public void increaseViewCount() {
 		this.viewCount++;
 	}
+
+	public void update(String title, AnnouncementType type, AnnouncementCategory category, String content) {
+		this.title = title == null ? this.title : title;
+		this.type = type == null ? this.type : type;
+		this.category = category == null ? this.category : category;
+		this.content = content == null ? this.content : content;
+	}
 }

src/main/java/com/sponus/sponusbe/domain/announcement/exception/AnnouncementErrorCode.java

@@ -13,6 +13,7 @@
 public enum AnnouncementErrorCode implements BaseErrorCode {
 	ANNOUNCEMENT_ERROR(HttpStatus.BAD_REQUEST, "ANC4000", "공지사항 관련 에러"),
 	ANNOUNCEMENT_ALREADY_DELETED(HttpStatus.BAD_REQUEST, "ANC4001", "이미 삭제된 공지사항입니다."),
+	INVALID_ORGANIZATION(HttpStatus.BAD_REQUEST, "ANC4002", "해당 단체의 공고가 아닙니다."),
 	ANNOUNCEMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "ANC4040", "해당 공지사항이 존재하지 않습니다.");
 
 	private final HttpStatus httpStatus;

src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementService.java

@@ -6,6 +6,8 @@
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementCreateRequest;
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementCreateResponse;
 import com.sponus.sponusbe.domain.announcement.dto.AnnouncementResponse;
+import com.sponus.sponusbe.domain.announcement.dto.AnnouncementUpdateRequest;
+import com.sponus.sponusbe.domain.announcement.dto.AnnouncementUpdateResponse;
 import com.sponus.sponusbe.domain.announcement.entity.Announcement;
 import com.sponus.sponusbe.domain.announcement.exception.AnnouncementErrorCode;
 import com.sponus.sponusbe.domain.announcement.exception.AnnouncementException;
@@ -46,4 +48,21 @@ public void deleteAnnouncement(Organization organization, Long announcementId) {
 		announcementRepository.delete(announcement);
 	}
 
+	public AnnouncementUpdateResponse updateAnnouncement(Organization authOrganization, Long proposeId,
+		AnnouncementUpdateRequest request) {
+		final Announcement announcement = announcementRepository.findById(proposeId)
+			.orElseThrow(() -> new AnnouncementException(AnnouncementErrorCode.ANNOUNCEMENT_NOT_FOUND));
+
+		if (!isOrganizationsAnnouncement(authOrganization.getId(), announcement))
+			throw new AnnouncementException(AnnouncementErrorCode.INVALID_ORGANIZATION);
+
+		announcement.update(request.title(), request.type(), request.category(), request.content());
+		announcementRepository.save(announcement);
+		return AnnouncementUpdateResponse.from(announcement);
+	}
+
+	private boolean isOrganizationsAnnouncement(Long organizationId, Announcement announcement) {
+		return announcement.getWriter().getId().equals(organizationId);
+	}
+
 }