diff --git a/src/main/java/gg/agit/konect/domain/club/dto/ClubInformationUpdateRequestDto.java b/src/main/java/gg/agit/konect/domain/club/dto/ClubInformationUpdateRequestDto.java index b6b33fecb..3b4d6b8fa 100644 --- a/src/main/java/gg/agit/konect/domain/club/dto/ClubInformationUpdateRequestDto.java +++ b/src/main/java/gg/agit/konect/domain/club/dto/ClubInformationUpdateRequestDto.java @@ -31,11 +31,6 @@ public record ClubInformationUpdateRequestDto( @Size(max = 20, message = "동아리 주제는 최대 20자입니다.") String clubTopic, - @Schema(description = "동아리 이모지", example = "💻", requiredMode = REQUIRED) - @NotBlank(message = "동아리 이모지는 필수입니다.") - @Size(max = 10, message = "동아리 이모지는 최대 10자입니다.") - String clubEmoji, - @Schema( description = "한 줄 소개 (최대 30자)", example = "코딩 동아리입니다.", diff --git a/src/main/java/gg/agit/konect/domain/club/event/ClubInformationUpdateRequestedEvent.java b/src/main/java/gg/agit/konect/domain/club/event/ClubInformationUpdateRequestedEvent.java index b59f596e4..74d2d0e7c 100644 --- a/src/main/java/gg/agit/konect/domain/club/event/ClubInformationUpdateRequestedEvent.java +++ b/src/main/java/gg/agit/konect/domain/club/event/ClubInformationUpdateRequestedEvent.java @@ -15,7 +15,6 @@ public record ClubInformationUpdateRequestedEvent( String requestedCategory, String currentTopic, String requestedTopic, - String requestedEmoji, String currentDescription, String requestedDescription, String currentFullIntroduction, @@ -36,7 +35,6 @@ public static ClubInformationUpdateRequestedEvent from(ClubInformationUpdateRequ request.getClubCategory().getDescription(), request.getClub().getTopic(), request.getClubTopic(), - request.getClubEmoji(), request.getClub().getDescription(), request.getShortDescription(), request.getClub().getIntroduce(), diff --git a/src/main/java/gg/agit/konect/domain/club/model/ClubInformationUpdateRequest.java b/src/main/java/gg/agit/konect/domain/club/model/ClubInformationUpdateRequest.java index 2f33401e9..3466a779c 100644 --- a/src/main/java/gg/agit/konect/domain/club/model/ClubInformationUpdateRequest.java +++ b/src/main/java/gg/agit/konect/domain/club/model/ClubInformationUpdateRequest.java @@ -63,10 +63,6 @@ public class ClubInformationUpdateRequest extends BaseEntity { @Column(name = "club_topic", length = 20, nullable = false) private String clubTopic; - @NotNull - @Column(name = "club_emoji", length = 10, nullable = false) - private String clubEmoji; - @NotNull @Column(name = "short_description", length = 30, nullable = false) private String shortDescription; @@ -92,7 +88,6 @@ private ClubInformationUpdateRequest( String clubName, ClubCategory clubCategory, String clubTopic, - String clubEmoji, String shortDescription, String fullIntroduction, UpdateRequestStatus status @@ -103,7 +98,6 @@ private ClubInformationUpdateRequest( this.clubName = clubName; this.clubCategory = clubCategory; this.clubTopic = clubTopic; - this.clubEmoji = clubEmoji; this.shortDescription = shortDescription; this.fullIntroduction = fullIntroduction; this.status = status != null ? status : UpdateRequestStatus.PENDING; diff --git a/src/main/java/gg/agit/konect/domain/club/service/ClubRegistrationRequestService.java b/src/main/java/gg/agit/konect/domain/club/service/ClubRegistrationRequestService.java index 2b2a25203..668ce6a10 100644 --- a/src/main/java/gg/agit/konect/domain/club/service/ClubRegistrationRequestService.java +++ b/src/main/java/gg/agit/konect/domain/club/service/ClubRegistrationRequestService.java @@ -58,7 +58,6 @@ public void requestInformationUpdate(Integer clubId, ClubInformationUpdateReques .clubName(request.clubName()) .clubCategory(request.clubCategory()) .clubTopic(request.clubTopic()) - .clubEmoji(request.clubEmoji()) .shortDescription(request.shortDescription()) .fullIntroduction(request.fullIntroduction()) .status(ClubInformationUpdateRequest.UpdateRequestStatus.PENDING) diff --git a/src/main/java/gg/agit/konect/infrastructure/slack/enums/SlackMessageTemplate.java b/src/main/java/gg/agit/konect/infrastructure/slack/enums/SlackMessageTemplate.java index 1a3db1024..8715c28d4 100644 --- a/src/main/java/gg/agit/konect/infrastructure/slack/enums/SlackMessageTemplate.java +++ b/src/main/java/gg/agit/konect/infrastructure/slack/enums/SlackMessageTemplate.java @@ -68,7 +68,6 @@ public enum SlackMessageTemplate { :bookmark: *동아리명* : %s :label: *분과* : %s :dart: *주제* : %s - :art: *요청 이모지* : *`%s`* :memo: *한 줄 소개* %s diff --git a/src/main/java/gg/agit/konect/infrastructure/slack/listener/ClubRegistrationRequestSlackListener.java b/src/main/java/gg/agit/konect/infrastructure/slack/listener/ClubRegistrationRequestSlackListener.java index 5f853b9c7..95eb22ea3 100644 --- a/src/main/java/gg/agit/konect/infrastructure/slack/listener/ClubRegistrationRequestSlackListener.java +++ b/src/main/java/gg/agit/konect/infrastructure/slack/listener/ClubRegistrationRequestSlackListener.java @@ -54,7 +54,6 @@ public void handleClubInformationUpdateRequested(ClubInformationUpdateRequestedE event.requestedCategory(), event.currentTopic(), event.requestedTopic(), - event.requestedEmoji(), event.currentDescription(), event.requestedDescription(), event.currentFullIntroduction(), diff --git a/src/main/java/gg/agit/konect/infrastructure/slack/service/SlackNotificationService.java b/src/main/java/gg/agit/konect/infrastructure/slack/service/SlackNotificationService.java index 1c435bf54..08a4cfb9b 100644 --- a/src/main/java/gg/agit/konect/infrastructure/slack/service/SlackNotificationService.java +++ b/src/main/java/gg/agit/konect/infrastructure/slack/service/SlackNotificationService.java @@ -92,7 +92,6 @@ public void notifyClubInformationUpdateRequest( String requestedCategory, String currentTopic, String requestedTopic, - String requestedEmoji, String currentDescription, String requestedDescription, String currentFullIntroduction, @@ -107,7 +106,6 @@ public void notifyClubInformationUpdateRequest( formatInlineChange(currentClubName, requestedClubName), formatInlineChange(currentCategory, requestedCategory), formatInlineChange(currentTopic, requestedTopic), - requestedEmoji, formatBlockChange(currentDescription, requestedDescription), formatBlockChange(currentFullIntroduction, requestedFullIntroduction), formatBlockChange(currentImageUrl, formatImageUrls(requestedImageUrls)) diff --git a/src/main/resources/db/migration/V84__drop_club_information_update_request_emoji.sql b/src/main/resources/db/migration/V84__drop_club_information_update_request_emoji.sql new file mode 100644 index 000000000..b3c667686 --- /dev/null +++ b/src/main/resources/db/migration/V84__drop_club_information_update_request_emoji.sql @@ -0,0 +1,2 @@ +ALTER TABLE club_information_update_request + DROP COLUMN club_emoji; diff --git a/src/test/java/gg/agit/konect/integration/domain/club/ClubRegistrationRequestApiTest.java b/src/test/java/gg/agit/konect/integration/domain/club/ClubRegistrationRequestApiTest.java index 6110b3d4b..1af49bd94 100644 --- a/src/test/java/gg/agit/konect/integration/domain/club/ClubRegistrationRequestApiTest.java +++ b/src/test/java/gg/agit/konect/integration/domain/club/ClubRegistrationRequestApiTest.java @@ -161,7 +161,6 @@ void requestClubInformationUpdateWithMissingFields() throws Exception { "BCSD Lab", ClubCategory.ACADEMIC, "코딩", - "💻", "수정 소개", "수정 상세 소개입니다.", List.of() @@ -178,7 +177,6 @@ private ClubInformationUpdateRequestDto createInformationUpdateRequest() { "BCSD Lab", ClubCategory.ACADEMIC, "코딩", - "💻", "수정 소개", "수정 상세 소개입니다.", List.of("https://example.com/image1.jpg") diff --git a/src/test/java/gg/agit/konect/unit/domain/club/service/ClubRegistrationRequestServiceTest.java b/src/test/java/gg/agit/konect/unit/domain/club/service/ClubRegistrationRequestServiceTest.java index 1c33a978a..2aa7eabf6 100644 --- a/src/test/java/gg/agit/konect/unit/domain/club/service/ClubRegistrationRequestServiceTest.java +++ b/src/test/java/gg/agit/konect/unit/domain/club/service/ClubRegistrationRequestServiceTest.java @@ -112,7 +112,6 @@ void requestInformationUpdatePublishesClubInformationUpdateRequestedEvent() { "요청 동아리명", ClubCategory.ACADEMIC, "AI", - "🤖", "수정 소개", "수정 상세 소개입니다.", List.of("https://example.com/image1.jpg") @@ -124,7 +123,6 @@ void requestInformationUpdatePublishesClubInformationUpdateRequestedEvent() { .clubName(request.clubName()) .clubCategory(request.clubCategory()) .clubTopic(request.clubTopic()) - .clubEmoji(request.clubEmoji()) .shortDescription(request.shortDescription()) .fullIntroduction(request.fullIntroduction()) .build(); @@ -152,7 +150,6 @@ void requestInformationUpdatePublishesClubInformationUpdateRequestedEvent() { assertThat(event.requestedCategory()).isEqualTo(request.clubCategory().getDescription()); assertThat(event.currentTopic()).isEqualTo(club.getTopic()); assertThat(event.requestedTopic()).isEqualTo(request.clubTopic()); - assertThat(event.requestedEmoji()).isEqualTo(request.clubEmoji()); assertThat(event.currentDescription()).isEqualTo(club.getDescription()); assertThat(event.requestedDescription()).isEqualTo(request.shortDescription()); assertThat(event.currentFullIntroduction()).isEqualTo(club.getIntroduce()); diff --git a/src/test/java/gg/agit/konect/unit/infrastructure/slack/listener/ClubRegistrationRequestSlackListenerTest.java b/src/test/java/gg/agit/konect/unit/infrastructure/slack/listener/ClubRegistrationRequestSlackListenerTest.java index 1ed28914f..e877d5a37 100644 --- a/src/test/java/gg/agit/konect/unit/infrastructure/slack/listener/ClubRegistrationRequestSlackListenerTest.java +++ b/src/test/java/gg/agit/konect/unit/infrastructure/slack/listener/ClubRegistrationRequestSlackListenerTest.java @@ -93,7 +93,6 @@ void handleClubInformationUpdateRequestedDelegatesToSlackService() { event.requestedCategory(), event.currentTopic(), event.requestedTopic(), - event.requestedEmoji(), event.currentDescription(), event.requestedDescription(), event.currentFullIntroduction(), @@ -121,7 +120,6 @@ void handleClubInformationUpdateRequestedSwallowsExceptions() { event.requestedCategory(), event.currentTopic(), event.requestedTopic(), - event.requestedEmoji(), event.currentDescription(), event.requestedDescription(), event.currentFullIntroduction(), @@ -161,7 +159,6 @@ private ClubInformationUpdateRequestedEvent createInformationUpdateEvent() { "학술", "코딩", "AI", - "🤖", "현재 소개", "수정 소개", "현재 상세 소개 내용입니다.", diff --git a/src/test/java/gg/agit/konect/unit/infrastructure/slack/service/SlackNotificationServiceTest.java b/src/test/java/gg/agit/konect/unit/infrastructure/slack/service/SlackNotificationServiceTest.java index 26727677c..e5dd58155 100644 --- a/src/test/java/gg/agit/konect/unit/infrastructure/slack/service/SlackNotificationServiceTest.java +++ b/src/test/java/gg/agit/konect/unit/infrastructure/slack/service/SlackNotificationServiceTest.java @@ -94,7 +94,6 @@ void notifyClubInformationUpdateRequestFormatsSlackMessageWithMarkdownAndEmoji() "학술", "코딩", "AI", - "🤖", "현재 소개", "수정 소개", "현재 상세 소개 내용입니다.", @@ -116,7 +115,6 @@ void notifyClubInformationUpdateRequestFormatsSlackMessageWithMarkdownAndEmoji() :bookmark: *동아리명* : *`현재 동아리명`* → *`요청 동아리명`* :label: *분과* : *`문화`* → *`학술`* :dart: *주제* : *`코딩`* → *`AI`* - :art: *요청 이모지* : *`🤖`* :memo: *한 줄 소개* ```현재 소개```