From 65045dd010bc72c6ca329642acb47912fd140dcf Mon Sep 17 00:00:00 2001 From: DongHoon Lee Date: Fri, 24 Jan 2025 15:09:59 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=ED=83=9C=EA=B7=B8=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=B2=88=EC=A9=8D=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/makers/crew/main/entity/tag/Tag.java | 16 ++++++------- .../crew/main/entity/tag/TagRepository.java | 2 +- .../crew/main/entity/tag/enums/TagType.java | 2 +- .../TagV2CreateFlashTagResponseDto.java | 15 ++++++++++++ .../response/TagV2CreateTagResponseDto.java | 15 ------------ .../main/tag/v2/service/TagV2Service.java | 6 ++--- .../main/tag/v2/service/TagV2ServiceImpl.java | 24 +++++++++---------- 7 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateFlashTagResponseDto.java delete mode 100644 main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateTagResponseDto.java diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/Tag.java b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/Tag.java index f247d23e..17e9d8cf 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/Tag.java +++ b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/Tag.java @@ -34,7 +34,7 @@ public class Tag extends BaseTimeEntity { /** * @implSpec : 모임태그 or 번쩍태그 구분 - * @implNote : 모임태그일 경우, lightningId == null + * @implNote : 모임태그일 경우, flashId == null * @implNote : 번쩍태그일 경우, meetingId == null * */ @Enumerated(EnumType.STRING) @@ -45,18 +45,18 @@ public class Tag extends BaseTimeEntity { @Column(name = "meetingId") private Integer meetingId; - @Column(name = "lightningId") - private Integer lightningId; + @Column(name = "flashId") + private Integer flashId; @Column(name = "welcomeMessageTypes", columnDefinition = "jsonb") @Type(JsonBinaryType.class) private List welcomeMessageTypes; @Builder - private Tag(TagType tagType, Integer meetingId, Integer lightningId, List welcomeMessageTypes) { + private Tag(TagType tagType, Integer meetingId, Integer flashId, List welcomeMessageTypes) { this.tagType = tagType; this.meetingId = meetingId; - this.lightningId = lightningId; + this.flashId = flashId; this.welcomeMessageTypes = welcomeMessageTypes; } @@ -65,17 +65,17 @@ public static Tag createGeneralMeetingTag(TagType tagType, Integer meetingId, return Tag.builder() .tagType(tagType) .meetingId(meetingId) - .lightningId(null) + .flashId(null) .welcomeMessageTypes(welcomeMessageTypes) .build(); } - public static Tag createLightningMeetingTag(TagType tagType, Integer lightningId, + public static Tag createFlashMeetingTag(TagType tagType, Integer flashId, List welcomeMessageTypes) { return Tag.builder() .tagType(tagType) .meetingId(null) - .lightningId(lightningId) + .flashId(flashId) .welcomeMessageTypes(welcomeMessageTypes) .build(); } diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/TagRepository.java b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/TagRepository.java index 5a519390..f356fee6 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/TagRepository.java +++ b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/TagRepository.java @@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface TagRepository extends JpaRepository { - Optional findByLightningId(Integer lightningId); + Optional findByFlashId(Integer flashId); } diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/enums/TagType.java b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/enums/TagType.java index 7bcf5d57..2d2e575d 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/entity/tag/enums/TagType.java +++ b/main/src/main/java/org/sopt/makers/crew/main/entity/tag/enums/TagType.java @@ -2,5 +2,5 @@ public enum TagType { MEETING, - LIGHTNING + FLASH } diff --git a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateFlashTagResponseDto.java b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateFlashTagResponseDto.java new file mode 100644 index 00000000..2d731a78 --- /dev/null +++ b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateFlashTagResponseDto.java @@ -0,0 +1,15 @@ +package org.sopt.makers.crew.main.tag.v2.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +@Schema(name = "TagV2CreateFlashTagResponseDto", description = "번쩍 모임 태그 생성 응답 Dto") +public record TagV2CreateFlashTagResponseDto( + @Schema(description = "모임 태그 id", example = "1") + @NotNull + Integer tagId +) { + public static TagV2CreateFlashTagResponseDto from(Integer tagId) { + return new TagV2CreateFlashTagResponseDto(tagId); + } +} diff --git a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateTagResponseDto.java b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateTagResponseDto.java deleted file mode 100644 index 4dedd85a..00000000 --- a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/dto/response/TagV2CreateTagResponseDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.sopt.makers.crew.main.tag.v2.dto.response; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; - -@Schema(name = "TagV2CreateLightningTagResponseDto", description = "번쩍 모임 태그 생성 응답 Dto") -public record TagV2CreateTagResponseDto( - @Schema(description = "모임 태그 id", example = "1") - @NotNull - Integer tagId -) { - public static TagV2CreateTagResponseDto from(Integer tagId) { - return new TagV2CreateTagResponseDto(tagId); - } -} diff --git a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2Service.java b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2Service.java index ab138972..b9058462 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2Service.java +++ b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2Service.java @@ -3,10 +3,10 @@ import java.util.List; import org.sopt.makers.crew.main.entity.tag.enums.WelcomeMessageType; -import org.sopt.makers.crew.main.tag.v2.dto.response.TagV2CreateTagResponseDto; +import org.sopt.makers.crew.main.tag.v2.dto.response.TagV2CreateFlashTagResponseDto; public interface TagV2Service { - TagV2CreateTagResponseDto createLightningTag(List welcomeMessageTypes, Integer lightningId); + TagV2CreateFlashTagResponseDto createFlashTag(List welcomeMessageTypes, Integer flashId); - List getWelcomeMessageTypesByLightningId(Integer lightningId); + List getWelcomeMessageTypesByFlashId(Integer flashId); } diff --git a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2ServiceImpl.java b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2ServiceImpl.java index 5a3b56b3..4d9b29b4 100644 --- a/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2ServiceImpl.java +++ b/main/src/main/java/org/sopt/makers/crew/main/tag/v2/service/TagV2ServiceImpl.java @@ -11,7 +11,7 @@ import org.sopt.makers.crew.main.entity.tag.enums.TagType; import org.sopt.makers.crew.main.entity.tag.enums.WelcomeMessageType; import org.sopt.makers.crew.main.global.exception.BadRequestException; -import org.sopt.makers.crew.main.tag.v2.dto.response.TagV2CreateTagResponseDto; +import org.sopt.makers.crew.main.tag.v2.dto.response.TagV2CreateFlashTagResponseDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,38 +28,38 @@ public class TagV2ServiceImpl implements TagV2Service { @Override @Transactional - public TagV2CreateTagResponseDto createLightningTag(List welcomeMessageTypes, - Integer lightningId) { + public TagV2CreateFlashTagResponseDto createFlashTag(List welcomeMessageTypes, + Integer flashId) { - if (lightningId == null) { + if (flashId == null) { throw new BadRequestException(VALIDATION_EXCEPTION.getErrorCode()); } if (welcomeMessageTypes == null || welcomeMessageTypes.isEmpty()) { - return saveTag(lightningId, List.of()); + return saveTag(flashId, List.of()); } List welcomeMessageTypeEnums = welcomeMessageTypes.stream() .map(WelcomeMessageType::ofValue) .toList(); - return saveTag(lightningId, welcomeMessageTypeEnums); + return saveTag(flashId, welcomeMessageTypeEnums); } @Override - public List getWelcomeMessageTypesByLightningId(Integer lightningId) { - if (lightningId == null) { + public List getWelcomeMessageTypesByFlashId(Integer flashId) { + if (flashId == null) { throw new BadRequestException(VALIDATION_EXCEPTION.getErrorCode()); } - return tagRepository.findByLightningId(lightningId) + return tagRepository.findByFlashId(flashId) .map(WelcomeMessageTypeProjection::getWelcomeMessageTypes) .orElse(Collections.emptyList()); } - private TagV2CreateTagResponseDto saveTag(Integer lightningId, List welcomeMessageTypeEnums) { - Tag tag = Tag.createLightningMeetingTag(TagType.LIGHTNING, lightningId, welcomeMessageTypeEnums); + private TagV2CreateFlashTagResponseDto saveTag(Integer flashId, List welcomeMessageTypeEnums) { + Tag tag = Tag.createFlashMeetingTag(TagType.FLASH, flashId, welcomeMessageTypeEnums); tagRepository.save(tag); - return TagV2CreateTagResponseDto.from(tag.getId()); + return TagV2CreateFlashTagResponseDto.from(tag.getId()); } }