-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
260 additions
and
302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} | ||
|
31 changes: 13 additions & 18 deletions
31
cakk-api/src/main/java/com/cakk/api/annotation/OperationDay.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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>> = [] | ||
) |
7 changes: 4 additions & 3 deletions
7
cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByCategoryRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
cakk-api/src/main/java/com/cakk/api/dto/request/cake/CakeSearchByViewsRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
14 changes: 6 additions & 8 deletions
14
cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeSearchRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
14 changes: 6 additions & 8 deletions
14
cakk-api/src/main/java/com/cakk/api/dto/request/like/HeartCakeShopSearchRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
21 changes: 10 additions & 11 deletions
21
cakk-api/src/main/java/com/cakk/api/dto/request/link/UpdateLinkRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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? | ||
) |
17 changes: 7 additions & 10 deletions
17
cakk-api/src/main/java/com/cakk/api/dto/request/operation/UpdateShopOperationRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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>? | ||
) |
13 changes: 6 additions & 7 deletions
13
cakk-api/src/main/java/com/cakk/api/dto/request/search/TopSearchedListRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
30 changes: 14 additions & 16 deletions
30
cakk-api/src/main/java/com/cakk/api/dto/request/user/CertificationRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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? | ||
) |
34 changes: 15 additions & 19 deletions
34
cakk-api/src/main/java/com/cakk/api/dto/request/user/ProfileUpdateRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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? | ||
) |
21 changes: 10 additions & 11 deletions
21
cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignInRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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? | ||
) |
45 changes: 22 additions & 23 deletions
45
cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignUpRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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? | ||
) |
Oops, something went wrong.