Refactor | CAKK-87 | kt 전환

CAKK-DEV · Sep 25, 2024 · e224ced · e224ced
1 parent 05d0a5e
commit e224ced
Show file tree

Hide file tree

Showing 24 changed files with 260 additions and 302 deletions.
diff --git a/cakk-api/src/main/java/com/cakk/api/Application.kt b/cakk-api/src/main/java/com/cakk/api/Application.kt
@@ -1,22 +1,22 @@
-package com.cakk.api;
+package com.cakk.api
 
-import java.util.TimeZone;
+import java.util.*
 
-import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
 
 @SpringBootApplication
-public class Application {
+class Application
 
-	@PostConstruct
-	public static void started() {
-		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
-	}
+@PostConstruct
+fun started() {
+	TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"))
+}
 
-	public static void main(String[] args) {
-		started();
-		SpringApplication.run(Application.class, args);
-	}
+fun main(args: Array<String>) {
+	started()
+	runApplication<Application>(*args)
 }
+
diff --git a/cakk-api/src/main/java/com/cakk/api/annotation/OperationDay.kt b/cakk-api/src/main/java/com/cakk/api/annotation/OperationDay.kt
@@ -1,23 +1,18 @@
-package com.cakk.api.annotation;
+package com.cakk.api.annotation
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import jakarta.validation.Constraint
+import jakarta.validation.Payload
 
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import kotlin.reflect.KClass
 
-import com.cakk.api.validator.OperationValidator;
+import com.cakk.api.validator.OperationValidator
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Constraint(validatedBy = OperationValidator.class)
-public @interface OperationDay {
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FIELD)
+@Constraint(validatedBy = [OperationValidator::class])
+annotation class OperationDay(
 
-	String message() default "영업 일자 형식이 잘못됐습니다.";
-
-	Class<?>[] groups() default { };
-
-	Class<? extends Payload>[] payload() default { };
-}
+    val message: String = "영업 일자 형식이 잘못됐습니다.",
+    val groups: Array<KClass<*>> = [],
+    val payload: Array<KClass<out Payload>> = []
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByCategoryRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByCategoryRequest.kt
@@ -1,12 +1,13 @@
 package com.cakk.api.dto.request.cake
 
-import com.cakk.common.enums.CakeDesignCategory
 import jakarta.validation.constraints.NotNull
 
+import com.cakk.common.enums.CakeDesignCategory
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
+
 data class CakeSearchByCategoryRequest(
 	val cakeId: Long?,
 	@field:NotNull
 	val category:  CakeDesignCategory?,
-	@field:NotNull
-	val pageSize: Int = 10
+	val pageSize: Int = DEFAULT_PAGE_SIZE
 )
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByLocationRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByLocationRequest.kt
@@ -3,12 +3,14 @@ package com.cakk.api.dto.request.cake
 import jakarta.validation.constraints.Max
 import jakarta.validation.constraints.Min
 
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
+
 data class CakeSearchByLocationRequest(
     val cakeId: Long?,
     val keyword: String?,
     @field:Min(-90) @field:Max(90)
     val latitude: Double?,
     @field:Min(-180) @field:Max(180)
     val longitude: Double?,
-    val pageSize: Int = 10
+    val pageSize: Int? = DEFAULT_PAGE_SIZE
 )
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByShopRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByShopRequest.kt
@@ -2,10 +2,11 @@ package com.cakk.api.dto.request.cake
 
 import jakarta.validation.constraints.NotNull
 
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
+
 data class CakeSearchByShopRequest(
     val cakeId: Long? = null,
     @field:NotNull
     val cakeShopId: Long?,
-    @field:NotNull
-    val pageSize: Int? = 10
+    val pageSize: Int? = DEFAULT_PAGE_SIZE
 )
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByViewsRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByViewsRequest.kt
@@ -1,6 +1,8 @@
 package com.cakk.api.dto.request.cake
 
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
+
 data class CakeSearchByViewsRequest(
 	 val offset: Long = 0,
-	 val pageSize: Int = 10
+	 val pageSize: Int? = DEFAULT_PAGE_SIZE
 )
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeSearchRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeSearchRequest.kt
@@ -1,10 +1,8 @@
-package com.cakk.api.dto.request.like;
+package com.cakk.api.dto.request.like
 
-import jakarta.validation.constraints.NotNull;
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
 
-public record HeartCakeSearchRequest(
-	Long cakeHeartId,
-	@NotNull
-	Integer pageSize
-) {
-}
+data class HeartCakeSearchRequest(
+    val cakeHeartId: Long? = null,
+    val pageSize: Int? = DEFAULT_PAGE_SIZE
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeShopSearchRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeShopSearchRequest.kt
@@ -1,10 +1,8 @@
-package com.cakk.api.dto.request.like;
+package com.cakk.api.dto.request.like
 
-import jakarta.validation.constraints.NotNull;
+import com.cakk.common.utils.DEFAULT_PAGE_SIZE
 
-public record HeartCakeShopSearchRequest(
-	Long cakeShopHeartId,
-	@NotNull
-	Integer pageSize
-) {
-}
+data class HeartCakeShopSearchRequest(
+    val cakeShopHeartId: Long? = null,
+    val pageSize: Int? = DEFAULT_PAGE_SIZE
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/link/UpdateLinkRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/link/UpdateLinkRequest.kt
@@ -1,13 +1,12 @@
-package com.cakk.api.dto.request.link;
+package com.cakk.api.dto.request.link
 
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Size
 
-public record UpdateLinkRequest(
-	@Size(min = 1, max = 200)
-	String instagram,
-	@Size(min = 1, max = 200)
-	String kakao,
-	@Size(min = 1, max = 200)
-	String web
-) {
-}
+data class UpdateLinkRequest(
+	@field:Size(min = 1, max = 200)
+	val instagram: String?,
+	@field:Size(min = 1, max = 200)
+	val kakao: String?,
+	@field:Size(min = 1, max = 200)
+	val web: String?
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/operation/UpdateShopOperationRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/operation/UpdateShopOperationRequest.kt
@@ -1,13 +1,10 @@
-package com.cakk.api.dto.request.operation;
+package com.cakk.api.dto.request.operation
 
-import java.util.List;
+import jakarta.validation.constraints.NotNull
 
-import jakarta.validation.constraints.NotNull;
+import com.cakk.core.dto.param.shop.ShopOperationParam
 
-import com.cakk.core.dto.param.shop.ShopOperationParam;
-
-public record UpdateShopOperationRequest(
-	@NotNull
-	List<ShopOperationParam> operationDays
-) {
-}
+data class UpdateShopOperationRequest(
+	@field:NotNull
+    val operationDays: MutableList<ShopOperationParam>?
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/search/TopSearchedListRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/search/TopSearchedListRequest.kt
@@ -1,9 +1,8 @@
-package com.cakk.api.dto.request.search;
+package com.cakk.api.dto.request.search
 
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull
 
-public record TopSearchedListRequest(
-	@NotNull
-	Long count
-) {
-}
+data class TopSearchedListRequest(
+	@field:NotNull
+    val count: Long? = 10
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/user/CertificationRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/user/CertificationRequest.kt
@@ -1,18 +1,16 @@
-package com.cakk.api.dto.request.user;
+package com.cakk.api.dto.request.user
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
-
-public record CertificationRequest(
-	@NotBlank
-	String businessRegistrationImageUrl,
-	@NotBlank
-	String idCardImageUrl,
-	@NotNull
-	Long cakeShopId,
-	@NotBlank
-	String emergencyContact,
-	String message
-) {
-}
+data class CertificationRequest(
+	@field:NotBlank
+    val businessRegistrationImageUrl: String?,
+	@field:NotBlank
+    val idCardImageUrl: String?,
+	@field:NotNull
+    val cakeShopId: Long?,
+	@field:NotBlank
+    val emergencyContact: String?,
+    val message: String?
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/user/ProfileUpdateRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/user/ProfileUpdateRequest.kt
@@ -1,23 +1,19 @@
-package com.cakk.api.dto.request.user;
+package com.cakk.api.dto.request.user
 
-import java.time.LocalDate;
+import java.time.LocalDate
 
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty
+import jakarta.validation.constraints.NotNull
 
-import lombok.Builder;
+import com.cakk.common.enums.Gender
 
-import com.cakk.common.enums.Gender;
-
-@Builder
-public record ProfileUpdateRequest(
-	String profileImageUrl,
-	@NotEmpty
-	String nickname,
-	@NotEmpty
-	String email,
-	@NotNull
-	Gender gender,
-	LocalDate birthday
-) {
-}
+data class ProfileUpdateRequest(
+    val profileImageUrl: String?,
+	@field:NotEmpty
+    val nickname: String?,
+	@field:NotEmpty
+    val email: String?,
+	@field:NotNull
+    val gender: Gender?,
+    val birthday: LocalDate?
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignInRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignInRequest.kt
@@ -1,14 +1,13 @@
-package com.cakk.api.dto.request.user;
+package com.cakk.api.dto.request.user
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
-import com.cakk.common.enums.Provider;
+import com.cakk.common.enums.Provider
 
-public record UserSignInRequest(
-	@NotNull
-	Provider provider,
-	@NotBlank
-	String idToken
-) {
-}
+data class UserSignInRequest(
+	@field:NotNull
+    val provider: Provider?,
+	@field:NotBlank
+    val idToken: String?
+)
diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignUpRequest.kt b/cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignUpRequest.kt
@@ -1,27 +1,26 @@
-package com.cakk.api.dto.request.user;
+package com.cakk.api.dto.request.user
 
-import java.time.LocalDate;
+import java.time.LocalDate
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
-import com.cakk.common.enums.Gender;
-import com.cakk.common.enums.Provider;
+import com.cakk.common.enums.Gender
+import com.cakk.common.enums.Provider
 
-public record UserSignUpRequest(
-	@NotNull
-	Provider provider,
-	@NotBlank
-	String idToken,
-	String deviceOs,
-	String deviceToken,
-	@NotBlank
-	String nickname,
-	@NotBlank
-	String email,
-	@NotNull
-	LocalDate birthday,
-	@NotNull
-	Gender gender
-) {
-}
+data class UserSignUpRequest(
+	@field:NotNull
+    val provider: Provider?,
+	@field:NotBlank
+    val idToken: String?,
+    val deviceOs: String?,
+    val deviceToken: String?,
+	@field:NotBlank
+    val nickname: String?,
+	@field:NotBlank
+    val email: String?,
+	@field:NotNull
+    val birthday: LocalDate?,
+	@field:NotNull
+    val gender: Gender?
+)