parent
b775781fd7
commit
cf03eae4ec
|
@ -31,6 +31,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
|
||||||
@PostMapping
|
@PostMapping
|
||||||
fun createSignature(
|
fun createSignature(
|
||||||
@RequestParam("can") can: Int,
|
@RequestParam("can") can: Int,
|
||||||
|
@RequestParam("time") time: Int,
|
||||||
@RequestParam("image") image: MultipartFile,
|
@RequestParam("image") image: MultipartFile,
|
||||||
@RequestParam("isAdult", required = false) isAdult: Boolean = false,
|
@RequestParam("isAdult", required = false) isAdult: Boolean = false,
|
||||||
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
||||||
|
@ -38,7 +39,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
|
||||||
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
|
|
||||||
ApiResponse.ok(
|
ApiResponse.ok(
|
||||||
service.createSignature(can = can, image = image, isAdult = isAdult, memberId = member.id!!),
|
service.createSignature(can = can, time = time, image = image, isAdult = isAdult, memberId = member.id!!),
|
||||||
"등록되었습니다."
|
"등록되었습니다."
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -47,13 +48,14 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
|
||||||
fun modifySignature(
|
fun modifySignature(
|
||||||
@RequestParam("id") id: Long,
|
@RequestParam("id") id: Long,
|
||||||
@RequestParam("can", required = false) can: Int?,
|
@RequestParam("can", required = false) can: Int?,
|
||||||
|
@RequestParam("time", required = false) time: Int?,
|
||||||
@RequestParam("image", required = false) image: MultipartFile?,
|
@RequestParam("image", required = false) image: MultipartFile?,
|
||||||
@RequestParam("isActive", required = false) isActive: Boolean?,
|
@RequestParam("isActive", required = false) isActive: Boolean?,
|
||||||
@RequestParam("isAdult", required = false) isAdult: Boolean?,
|
@RequestParam("isAdult", required = false) isAdult: Boolean?,
|
||||||
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
||||||
) = run {
|
) = run {
|
||||||
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
if (can == null && image == null && isActive == null && isAdult == null) {
|
if (can == null && time == null && image == null && isActive == null && isAdult == null) {
|
||||||
throw SodaException("변경사항이 없습니다.")
|
throw SodaException("변경사항이 없습니다.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,6 +63,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
|
||||||
service.modifySignature(
|
service.modifySignature(
|
||||||
id = id,
|
id = id,
|
||||||
can = can,
|
can = can,
|
||||||
|
time = time,
|
||||||
image = image,
|
image = image,
|
||||||
isActive = isActive,
|
isActive = isActive,
|
||||||
isAdult = isAdult,
|
isAdult = isAdult,
|
||||||
|
|
|
@ -40,6 +40,7 @@ class CreatorAdminSignatureQueryRepositoryImpl(
|
||||||
QGetSignatureListItem(
|
QGetSignatureListItem(
|
||||||
signatureCan.id,
|
signatureCan.id,
|
||||||
signatureCan.can,
|
signatureCan.can,
|
||||||
|
signatureCan.time,
|
||||||
signatureCan.image.prepend("/").prepend(imageHost),
|
signatureCan.image.prepend("/").prepend(imageHost),
|
||||||
signatureCan.isAdult,
|
signatureCan.isAdult,
|
||||||
member.nickname
|
member.nickname
|
||||||
|
|
|
@ -37,11 +37,11 @@ class CreatorAdminSignatureService(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
fun createSignature(can: Int, image: MultipartFile, memberId: Long, isAdult: Boolean) {
|
fun createSignature(can: Int, time: Int, image: MultipartFile, memberId: Long, isAdult: Boolean) {
|
||||||
val member = memberRepository.findCreatorByIdOrNull(memberId = memberId)
|
val member = memberRepository.findCreatorByIdOrNull(memberId = memberId)
|
||||||
?: throw SodaException("잘못된 접근입니다.")
|
?: throw SodaException("잘못된 접근입니다.")
|
||||||
|
|
||||||
val signatureCan = SignatureCan(can = can, isAdult = isAdult)
|
val signatureCan = SignatureCan(can = can, time = time, isAdult = isAdult)
|
||||||
signatureCan.creator = member
|
signatureCan.creator = member
|
||||||
repository.save(signatureCan)
|
repository.save(signatureCan)
|
||||||
|
|
||||||
|
@ -61,6 +61,7 @@ class CreatorAdminSignatureService(
|
||||||
fun modifySignature(
|
fun modifySignature(
|
||||||
id: Long,
|
id: Long,
|
||||||
can: Int?,
|
can: Int?,
|
||||||
|
time: Int?,
|
||||||
image: MultipartFile?,
|
image: MultipartFile?,
|
||||||
isActive: Boolean?,
|
isActive: Boolean?,
|
||||||
memberId: Long,
|
memberId: Long,
|
||||||
|
@ -73,6 +74,10 @@ class CreatorAdminSignatureService(
|
||||||
signatureCan.can = can
|
signatureCan.can = can
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (time != null) {
|
||||||
|
signatureCan.time = time
|
||||||
|
}
|
||||||
|
|
||||||
if (isActive != null) {
|
if (isActive != null) {
|
||||||
signatureCan.isActive = isActive
|
signatureCan.isActive = isActive
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ data class GetSignatureListResponse(
|
||||||
data class GetSignatureListItem @QueryProjection constructor(
|
data class GetSignatureListItem @QueryProjection constructor(
|
||||||
val id: Long,
|
val id: Long,
|
||||||
val can: Int,
|
val can: Int,
|
||||||
|
val time: Int,
|
||||||
val image: String,
|
val image: String,
|
||||||
val isAdult: Boolean,
|
val isAdult: Boolean,
|
||||||
val nickname: String
|
val nickname: String
|
||||||
|
|
|
@ -10,6 +10,7 @@ import javax.persistence.ManyToOne
|
||||||
@Entity
|
@Entity
|
||||||
data class SignatureCan(
|
data class SignatureCan(
|
||||||
var can: Int,
|
var can: Int,
|
||||||
|
var time: Int = 7,
|
||||||
var isAdult: Boolean = false,
|
var isAdult: Boolean = false,
|
||||||
var isActive: Boolean = true
|
var isActive: Boolean = true
|
||||||
) : BaseEntity() {
|
) : BaseEntity() {
|
||||||
|
|
Loading…
Reference in New Issue