From c1dc0556d1fbc779571672aab9fc1e98f4f4232f Mon Sep 17 00:00:00 2001 From: KimDoubleB Date: Tue, 17 Jan 2023 01:49:33 +0900 Subject: [PATCH] feat(#53): converted Utils classes java to kotlin --- .../archive/dto/v1/archive/ArchiveDtoV1.java | 9 ++--- .../archive/dto/v1/user/BaseUserDtoV1.java | 4 +- .../dto/v1/user/SpecificUserDtoV1.java | 4 +- .../dto/v2/ArchiveCommunityResponseDto.java | 5 +-- .../site/archive/dto/v2/ArchiveDtoV2.java | 5 +-- .../dto/v2/ArchiveLikeResponseDto.java | 5 +-- .../archive/dto/v2/MyArchiveResponseDto.java | 5 +-- .../archive/common/ArchiveStringUtils.java | 14 ------- .../site/archive/common/ArchiveStringUtils.kt | 9 +++++ .../site/archive/common/DateTimeUtil.java | 40 ------------------- .../java/site/archive/common/DateTimeUtils.kt | 34 ++++++++++++++++ .../java/site/archive/common/FileUtils.java | 30 -------------- .../java/site/archive/common/FileUtils.kt | 22 ++++++++++ .../site/archive/common/DateTimeUtilTest.java | 12 +++--- .../custom/ArchiveCommunityTimeSortType.java | 14 +++---- .../custom/ArchiveCustomRepositoryImpl.java | 4 +- .../domain/archive/ArchiveRepositoryTest.java | 4 +- 17 files changed, 98 insertions(+), 122 deletions(-) delete mode 100644 archive-common/src/main/java/site/archive/common/ArchiveStringUtils.java create mode 100644 archive-common/src/main/java/site/archive/common/ArchiveStringUtils.kt delete mode 100644 archive-common/src/main/java/site/archive/common/DateTimeUtil.java create mode 100644 archive-common/src/main/java/site/archive/common/DateTimeUtils.kt delete mode 100644 archive-common/src/main/java/site/archive/common/FileUtils.java create mode 100644 archive-common/src/main/java/site/archive/common/FileUtils.kt diff --git a/archive-application/src/main/java/site/archive/dto/v1/archive/ArchiveDtoV1.java b/archive-application/src/main/java/site/archive/dto/v1/archive/ArchiveDtoV1.java index 9038747f..f8878b03 100644 --- a/archive-application/src/main/java/site/archive/dto/v1/archive/ArchiveDtoV1.java +++ b/archive-application/src/main/java/site/archive/dto/v1/archive/ArchiveDtoV1.java @@ -6,6 +6,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.CoverImageType; import site.archive.domain.archive.Emotion; @@ -15,8 +16,6 @@ import java.util.List; import java.util.Objects; -import static site.archive.common.DateTimeUtil.YY_MM_DD_FORMATTER; - @NoArgsConstructor @AllArgsConstructor @Getter @@ -50,7 +49,7 @@ public static ArchiveDtoV1 specificFrom(Archive archive) { return ArchiveDtoV1.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .mainImage(archive.getMainImage()) .companions(archive.getCompanions()) @@ -71,7 +70,7 @@ public static ArchiveDtoV1 simpleFrom(Archive archive) { return ArchiveDtoV1.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .companions(archive.getCompanions()) .mainImage(archive.getMainImage()) @@ -86,7 +85,7 @@ public Archive toEntity(BaseUser user) { var archiveCoverImageType = Objects.requireNonNullElse(coverImageType, CoverImageType.EMOTION_COVER); return Archive.builder() .name(name) - .watchedOn(LocalDate.parse(watchedOn, YY_MM_DD_FORMATTER)) + .watchedOn(LocalDate.parse(watchedOn, DateTimeUtils.getYymmddFormatter())) .emotion(emotion) .mainImage(mainImage) .companions(companions) diff --git a/archive-application/src/main/java/site/archive/dto/v1/user/BaseUserDtoV1.java b/archive-application/src/main/java/site/archive/dto/v1/user/BaseUserDtoV1.java index 7edea58a..05a86000 100644 --- a/archive-application/src/main/java/site/archive/dto/v1/user/BaseUserDtoV1.java +++ b/archive-application/src/main/java/site/archive/dto/v1/user/BaseUserDtoV1.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import site.archive.common.DateTimeUtil; +import site.archive.common.DateTimeUtils; import site.archive.domain.user.BaseUser; import site.archive.domain.user.UserRole; @@ -29,7 +29,7 @@ public static BaseUserDtoV1 from(BaseUser baseUser) { } public String getCreatedAt() { - return DateTimeUtil.DATE_TIME_FORMATTER.format(this.createdAt); + return DateTimeUtils.getDateTimeFormatter().format(this.createdAt); } } diff --git a/archive-application/src/main/java/site/archive/dto/v1/user/SpecificUserDtoV1.java b/archive-application/src/main/java/site/archive/dto/v1/user/SpecificUserDtoV1.java index 31161afa..d92a9c5d 100644 --- a/archive-application/src/main/java/site/archive/dto/v1/user/SpecificUserDtoV1.java +++ b/archive-application/src/main/java/site/archive/dto/v1/user/SpecificUserDtoV1.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import site.archive.common.DateTimeUtil; +import site.archive.common.DateTimeUtils; import site.archive.domain.user.BaseUser; import site.archive.domain.user.UserRole; @@ -19,7 +19,7 @@ public class SpecificUserDtoV1 { private final String userType; public static SpecificUserDtoV1 from(BaseUser baseUser) { - var createdAt = DateTimeUtil.DATE_TIME_FORMATTER.format(baseUser.getCreatedAt()); + var createdAt = DateTimeUtils.getDateTimeFormatter().format(baseUser.getCreatedAt()); return new SpecificUserDtoV1(baseUser.getId(), baseUser.getMailAddress(), baseUser.getRole(), diff --git a/archive-application/src/main/java/site/archive/dto/v2/ArchiveCommunityResponseDto.java b/archive-application/src/main/java/site/archive/dto/v2/ArchiveCommunityResponseDto.java index 02e820a1..b5149d34 100644 --- a/archive-application/src/main/java/site/archive/dto/v2/ArchiveCommunityResponseDto.java +++ b/archive-application/src/main/java/site/archive/dto/v2/ArchiveCommunityResponseDto.java @@ -3,12 +3,11 @@ import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.CoverImageType; import site.archive.domain.archive.Emotion; -import static site.archive.common.DateTimeUtil.YY_MM_DD_FORMATTER; - @RequiredArgsConstructor @Builder @Getter @@ -36,7 +35,7 @@ public static ArchiveCommunityResponseDto from(Archive archive, Long currentUser return ArchiveCommunityResponseDto.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .mainImage(archive.getMainImage()) .coverImageType(archive.getCoverImageType()) diff --git a/archive-application/src/main/java/site/archive/dto/v2/ArchiveDtoV2.java b/archive-application/src/main/java/site/archive/dto/v2/ArchiveDtoV2.java index c9dac0df..bbbb1597 100644 --- a/archive-application/src/main/java/site/archive/dto/v2/ArchiveDtoV2.java +++ b/archive-application/src/main/java/site/archive/dto/v2/ArchiveDtoV2.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.CoverImageType; import site.archive.domain.archive.Emotion; @@ -12,8 +13,6 @@ import java.util.List; -import static site.archive.common.DateTimeUtil.YY_MM_DD_FORMATTER; - @NoArgsConstructor @AllArgsConstructor @Getter @@ -52,7 +51,7 @@ public static ArchiveDtoV2 specificFrom(Archive archive) { return ArchiveDtoV2.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .mainImage(archive.getMainImage()) .companions(archive.getCompanions()) diff --git a/archive-application/src/main/java/site/archive/dto/v2/ArchiveLikeResponseDto.java b/archive-application/src/main/java/site/archive/dto/v2/ArchiveLikeResponseDto.java index 79c97ead..04062190 100644 --- a/archive-application/src/main/java/site/archive/dto/v2/ArchiveLikeResponseDto.java +++ b/archive-application/src/main/java/site/archive/dto/v2/ArchiveLikeResponseDto.java @@ -4,12 +4,11 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.CoverImageType; import site.archive.domain.archive.Emotion; -import static site.archive.common.DateTimeUtil.YY_MM_DD_FORMATTER; - @RequiredArgsConstructor @Builder @Getter @@ -37,7 +36,7 @@ public static ArchiveLikeResponseDto from(Archive archive, Long currentUserIdx) return ArchiveLikeResponseDto.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .mainImage(archive.getMainImage()) .coverImageType(archive.getCoverImageType()) diff --git a/archive-application/src/main/java/site/archive/dto/v2/MyArchiveResponseDto.java b/archive-application/src/main/java/site/archive/dto/v2/MyArchiveResponseDto.java index 12381e24..80149e77 100644 --- a/archive-application/src/main/java/site/archive/dto/v2/MyArchiveResponseDto.java +++ b/archive-application/src/main/java/site/archive/dto/v2/MyArchiveResponseDto.java @@ -3,12 +3,11 @@ import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.CoverImageType; import site.archive.domain.archive.Emotion; -import static site.archive.common.DateTimeUtil.YY_MM_DD_FORMATTER; - @RequiredArgsConstructor @Builder @Getter @@ -32,7 +31,7 @@ public static MyArchiveResponseDto from(Archive archive, long dateMilli) { return MyArchiveResponseDto.builder() .archiveId(archive.getId()) .name(archive.getName()) - .watchedOn(archive.getWatchedOn().format(YY_MM_DD_FORMATTER)) + .watchedOn(archive.getWatchedOn().format(DateTimeUtils.getYymmddFormatter())) .emotion(archive.getEmotion()) .mainImage(archive.getMainImage()) .isPublic(archive.getIsPublic()) diff --git a/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.java b/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.java deleted file mode 100644 index 64b5300e..00000000 --- a/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.java +++ /dev/null @@ -1,14 +0,0 @@ -package site.archive.common; - -public class ArchiveStringUtils { - - private static final Character MAIL_AT = '@'; - - private ArchiveStringUtils() { - } - - public static String extractIdFromMail(final String mailAddress) { - return mailAddress.substring(0, mailAddress.indexOf(MAIL_AT)); - } - -} diff --git a/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.kt b/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.kt new file mode 100644 index 00000000..b1cd64a2 --- /dev/null +++ b/archive-common/src/main/java/site/archive/common/ArchiveStringUtils.kt @@ -0,0 +1,9 @@ +@file:JvmName("ArchiveStringUtils") + +package site.archive.common + +private const val MAIL_AT = '@' + +fun extractIdFromMail(mailAddress: String): String { + return mailAddress.substring(0, mailAddress.indexOf(MAIL_AT)) +} \ No newline at end of file diff --git a/archive-common/src/main/java/site/archive/common/DateTimeUtil.java b/archive-common/src/main/java/site/archive/common/DateTimeUtil.java deleted file mode 100644 index 4cd23a97..00000000 --- a/archive-common/src/main/java/site/archive/common/DateTimeUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package site.archive.common; - -import java.time.Clock; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.YearMonth; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; - -public class DateTimeUtil { - - public static final DateTimeFormatter YY_MM_DD_FORMATTER = DateTimeFormatter.ofPattern("yy/MM/dd"); - public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - public static final ZoneId ASIA_SEOUL_ZONE = ZoneId.of("Asia/Seoul"); - - private static Clock clock = Clock.system(ASIA_SEOUL_ZONE); - - private DateTimeUtil() {} - - public static void changeClock(LocalDate date) { - // log.warn("Change clock of DateTimeUtil. It may effect now() methods of DateTimeUtil."); - var dateTime = date.atStartOfDay(); - var zoneOffset = ASIA_SEOUL_ZONE.getRules().getOffset(dateTime); - clock = Clock.fixed(dateTime.atOffset(zoneOffset).toInstant(), zoneOffset); - } - - public static ZonedDateTime fromMilli(long milli) { - return Instant.ofEpochMilli(milli).atZone(ASIA_SEOUL_ZONE); - } - - public static LocalDateTime firstDateTimeOfMonth() { - return YearMonth.now(clock) - .atDay(1) - .atTime(0, 0); - } - -} diff --git a/archive-common/src/main/java/site/archive/common/DateTimeUtils.kt b/archive-common/src/main/java/site/archive/common/DateTimeUtils.kt new file mode 100644 index 00000000..3f230afc --- /dev/null +++ b/archive-common/src/main/java/site/archive/common/DateTimeUtils.kt @@ -0,0 +1,34 @@ +@file:JvmName("DateTimeUtils") +package site.archive.common + +import java.time.Clock +import java.time.Instant +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.YearMonth +import java.time.ZoneId +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter + +const val ASIA_SEOUL_ZONE_ID = "Asia/Seoul" +val yymmddFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yy/MM/dd") +val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") +val asiaSeoulZone: ZoneId = ZoneId.of(ASIA_SEOUL_ZONE_ID) + +var clock: Clock = Clock.system(asiaSeoulZone) + +fun changeClock(date: LocalDate) { + val dateTime = date.atStartOfDay() + val zoneOffset = asiaSeoulZone.rules.getOffset(dateTime) + clock = Clock.fixed(dateTime.atOffset(zoneOffset).toInstant(), zoneOffset) +} + +fun fromMilli(milli: Long): ZonedDateTime { + return Instant.ofEpochMilli(milli).atZone(asiaSeoulZone) +} + +fun firstDateTimeOfMonth(): LocalDateTime { + return YearMonth.now(clock) + .atDay(1) + .atTime(0, 0) +} \ No newline at end of file diff --git a/archive-common/src/main/java/site/archive/common/FileUtils.java b/archive-common/src/main/java/site/archive/common/FileUtils.java deleted file mode 100644 index fe230115..00000000 --- a/archive-common/src/main/java/site/archive/common/FileUtils.java +++ /dev/null @@ -1,30 +0,0 @@ -package site.archive.common; - -import org.springframework.web.multipart.MultipartFile; - -import java.util.Arrays; - -import static org.springframework.http.MediaType.IMAGE_GIF_VALUE; -import static org.springframework.http.MediaType.IMAGE_JPEG_VALUE; -import static org.springframework.http.MediaType.IMAGE_PNG_VALUE; - -public class FileUtils { - - private static final String HTTP = "http://"; - private static final String HTTPS = "https://"; - - private FileUtils() { - } - - public static void verifyImageFile(final MultipartFile imageFile) { - if (!Arrays.asList(IMAGE_PNG_VALUE, IMAGE_GIF_VALUE, IMAGE_JPEG_VALUE) - .contains(imageFile.getContentType())) { - throw new IllegalStateException("FIle uploaded is not an image"); - } - } - - public static boolean isFileUrl(final String file) { - return file != null && (file.startsWith(HTTP) || file.startsWith(HTTPS)); - } - -} diff --git a/archive-common/src/main/java/site/archive/common/FileUtils.kt b/archive-common/src/main/java/site/archive/common/FileUtils.kt new file mode 100644 index 00000000..ba14e92a --- /dev/null +++ b/archive-common/src/main/java/site/archive/common/FileUtils.kt @@ -0,0 +1,22 @@ +@file:JvmName("FileUtils") + +package site.archive.common + +import org.springframework.http.MediaType.IMAGE_GIF_VALUE +import org.springframework.http.MediaType.IMAGE_JPEG_VALUE +import org.springframework.http.MediaType.IMAGE_PNG_VALUE +import org.springframework.web.multipart.MultipartFile + +private const val HTTP = "http://" +private const val HTTPS = "https://" + +fun verifyImageFile(imageFile: MultipartFile) { + if (!listOf(IMAGE_PNG_VALUE, IMAGE_GIF_VALUE, IMAGE_JPEG_VALUE) + .contains(imageFile.contentType)) { + throw IllegalStateException("FIle uploaded is not an image") + } +} + +fun isFileUrl(file: String?) : Boolean{ + return file != null && (file.startsWith(HTTP) || file.startsWith(HTTPS)) +} \ No newline at end of file diff --git a/archive-common/src/test/java/site/archive/common/DateTimeUtilTest.java b/archive-common/src/test/java/site/archive/common/DateTimeUtilTest.java index 9f3eeff0..591a51d4 100644 --- a/archive-common/src/test/java/site/archive/common/DateTimeUtilTest.java +++ b/archive-common/src/test/java/site/archive/common/DateTimeUtilTest.java @@ -16,25 +16,25 @@ class DateTimeUtilTest { @Test void YY_MM_DD_formatterTest() { - var convertedDate = dummyDate.format(DateTimeUtil.YY_MM_DD_FORMATTER); + var convertedDate = dummyDate.format(DateTimeUtils.getYymmddFormatter()); assertThat(convertedDate).isEqualTo("95/09/25"); } @Test void DATE_TIME_formatterTest() { - var convertedDateTime = dummyDateTime.format(DateTimeUtil.DATE_TIME_FORMATTER); + var convertedDateTime = dummyDateTime.format(DateTimeUtils.getDateTimeFormatter()); assertThat(convertedDateTime).isEqualTo("1995-09-25 11:11:11"); } @Test void dateOfMonthTest() { - DateTimeUtil.changeClock(LocalDate.of(2022, 7, 2)); - var julFirstDate = DateTimeUtil.firstDateTimeOfMonth(); + DateTimeUtils.changeClock(LocalDate.of(2022, 7, 2)); + var julFirstDate = DateTimeUtils.firstDateTimeOfMonth(); assertThat(julFirstDate).isEqualTo(LocalDateTime.of(2022, 7, 1, 0, 0)); var augFirstDate = julFirstDate.plusMonths(1); - DateTimeUtil.changeClock(LocalDate.of(2022, 8, 22)); - assertThat(augFirstDate).isEqualTo(DateTimeUtil.firstDateTimeOfMonth()); + DateTimeUtils.changeClock(LocalDate.of(2022, 8, 22)); + assertThat(augFirstDate).isEqualTo(DateTimeUtils.firstDateTimeOfMonth()); } } \ No newline at end of file diff --git a/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCommunityTimeSortType.java b/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCommunityTimeSortType.java index 085541b1..7b085a92 100644 --- a/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCommunityTimeSortType.java +++ b/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCommunityTimeSortType.java @@ -3,7 +3,7 @@ import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; import lombok.Getter; -import site.archive.common.DateTimeUtil; +import site.archive.common.DateTimeUtils; import site.archive.domain.archive.Archive; import site.archive.domain.archive.QArchive; @@ -17,13 +17,13 @@ public enum ArchiveCommunityTimeSortType { CREATED_AT("createdAt") { @Override public BooleanExpression getLtWhere(QArchive archive, final long milli) { - var lastCreatedAtOfPage = DateTimeUtil.fromMilli(milli).toLocalDateTime(); + var lastCreatedAtOfPage = DateTimeUtils.fromMilli(milli).toLocalDateTime(); return archive.createdAt.lt(lastCreatedAtOfPage); } @Override public BooleanExpression getEqWhere(QArchive archive, long milli) { - var lastCreatedAtOfPage = DateTimeUtil.fromMilli(milli).toLocalDateTime(); + var lastCreatedAtOfPage = DateTimeUtils.fromMilli(milli).toLocalDateTime(); return archive.createdAt.eq(lastCreatedAtOfPage); } @@ -34,19 +34,19 @@ public OrderSpecifier getOrderBy(QArchive archive) { @Override public long convertToMillis(Archive archive) { - return archive.getCreatedAt().atZone(DateTimeUtil.ASIA_SEOUL_ZONE).toInstant().toEpochMilli(); + return archive.getCreatedAt().atZone(DateTimeUtils.getAsiaSeoulZone()).toInstant().toEpochMilli(); } }, WATCHED_ON("watchedOn") { @Override public BooleanExpression getLtWhere(QArchive archive, final long milli) { - var lastWatchedOnOfPage = DateTimeUtil.fromMilli(milli).toLocalDate(); + var lastWatchedOnOfPage = DateTimeUtils.fromMilli(milli).toLocalDate(); return archive.watchedOn.lt(lastWatchedOnOfPage); } @Override public BooleanExpression getEqWhere(QArchive archive, long milli) { - var lastWatchedOnOfPage = DateTimeUtil.fromMilli(milli).toLocalDate(); + var lastWatchedOnOfPage = DateTimeUtils.fromMilli(milli).toLocalDate(); return archive.watchedOn.eq(lastWatchedOnOfPage); } @@ -57,7 +57,7 @@ public OrderSpecifier getOrderBy(QArchive archive) { @Override public long convertToMillis(Archive archive) { - return archive.getWatchedOn().atStartOfDay(DateTimeUtil.ASIA_SEOUL_ZONE).toInstant().toEpochMilli(); + return archive.getWatchedOn().atStartOfDay(DateTimeUtils.getAsiaSeoulZone()).toInstant().toEpochMilli(); } }; diff --git a/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCustomRepositoryImpl.java b/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCustomRepositoryImpl.java index b0721c76..53ee1aec 100644 --- a/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCustomRepositoryImpl.java +++ b/archive-domain/src/main/java/site/archive/domain/archive/custom/ArchiveCustomRepositoryImpl.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Repository; -import site.archive.common.DateTimeUtil; +import site.archive.common.DateTimeUtils; import site.archive.common.cache.CacheType; import site.archive.domain.archive.Archive; import site.archive.domain.archive.Emotion; @@ -77,7 +77,7 @@ public List findByIdInWithLike(List archiveIds, ArchivePageable p @Override public long countArchiveOfCurrentMonthByAuthorId(Long authorId) { - var firstDateOfCurrentMonth = DateTimeUtil.firstDateTimeOfMonth(); + var firstDateOfCurrentMonth = DateTimeUtils.firstDateTimeOfMonth(); var firstDateOfNextMonth = firstDateOfCurrentMonth.plusMonths(1); var currentMonthWhere = QArchive.archive.createdAt.goe(firstDateOfCurrentMonth) .and(QArchive.archive.createdAt.lt(firstDateOfNextMonth)); diff --git a/archive-domain/src/test/java/site/archive/domain/archive/ArchiveRepositoryTest.java b/archive-domain/src/test/java/site/archive/domain/archive/ArchiveRepositoryTest.java index a1b3ea2b..040607af 100644 --- a/archive-domain/src/test/java/site/archive/domain/archive/ArchiveRepositoryTest.java +++ b/archive-domain/src/test/java/site/archive/domain/archive/ArchiveRepositoryTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import site.archive.common.DateTimeUtil; +import site.archive.common.DateTimeUtils; import site.archive.domain.JpaTestSupport; import java.time.LocalDate; @@ -26,7 +26,7 @@ void currentMonthCountOfArchiveTest() { var eightAuthorId = 8L; // and - set current month to 2022.08 - DateTimeUtil.changeClock(LocalDate.of(2022, 8, 11)); + DateTimeUtils.changeClock(LocalDate.of(2022, 8, 11)); // when var oneAuthorArchiveCount = archiveRepository.countArchiveOfCurrentMonthByAuthorId(oneAuthorId);