parent
b8d422f45c
commit
c3e18d658c
|
@ -33,16 +33,17 @@ class AdminSignatureCanController(private val service: AdminSignatureCanService)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
fun modifySignatureCan(
|
fun modifySignatureCan(
|
||||||
@RequestParam("id") id: Long,
|
@RequestParam("id") id: Long,
|
||||||
|
@RequestParam("can", required = false) can: 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?
|
||||||
) = run {
|
) = run {
|
||||||
if (image == null && isActive == null) {
|
if (can == null && image == null && isActive == null && isAdult == null) {
|
||||||
throw SodaException("변경사항이 없습니다.")
|
throw SodaException("변경사항이 없습니다.")
|
||||||
}
|
}
|
||||||
|
|
||||||
ApiResponse.ok(
|
ApiResponse.ok(
|
||||||
service.modifySignatureCan(id = id, image = image, isActive = isActive, isAdult = isAdult),
|
service.modifySignatureCan(id = id, can = can, image = image, isActive = isActive, isAdult = isAdult),
|
||||||
"수정되었습니다."
|
"수정되었습니다."
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,10 +60,14 @@ class AdminSignatureCanService(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
fun modifySignatureCan(id: Long, image: MultipartFile?, isActive: Boolean?, isAdult: Boolean?) {
|
fun modifySignatureCan(id: Long, can: Int?, image: MultipartFile?, isActive: Boolean?, isAdult: Boolean?) {
|
||||||
val signatureCan = repository.findByIdOrNull(id = id)
|
val signatureCan = repository.findByIdOrNull(id = id)
|
||||||
?: throw SodaException("잘못된 요청입니다.")
|
?: throw SodaException("잘못된 요청입니다.")
|
||||||
|
|
||||||
|
if (can != null) {
|
||||||
|
signatureCan.can = can
|
||||||
|
}
|
||||||
|
|
||||||
if (isActive != null) {
|
if (isActive != null) {
|
||||||
signatureCan.isActive = isActive
|
signatureCan.isActive = isActive
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,17 +46,21 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
|
||||||
@PutMapping
|
@PutMapping
|
||||||
fun modifySignature(
|
fun modifySignature(
|
||||||
@RequestParam("id") id: Long,
|
@RequestParam("id") id: Long,
|
||||||
|
@RequestParam("can", required = false) can: 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 (image == null && isActive == null) throw SodaException("변경사항이 없습니다.")
|
if (can == null && image == null && isActive == null && isAdult == null) {
|
||||||
|
throw SodaException("변경사항이 없습니다.")
|
||||||
|
}
|
||||||
|
|
||||||
ApiResponse.ok(
|
ApiResponse.ok(
|
||||||
service.modifySignature(
|
service.modifySignature(
|
||||||
id = id,
|
id = id,
|
||||||
|
can = can,
|
||||||
image = image,
|
image = image,
|
||||||
isActive = isActive,
|
isActive = isActive,
|
||||||
isAdult = isAdult,
|
isAdult = isAdult,
|
||||||
|
|
|
@ -58,10 +58,21 @@ class CreatorAdminSignatureService(
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
fun modifySignature(id: Long, image: MultipartFile?, isActive: Boolean?, memberId: Long, isAdult: Boolean?) {
|
fun modifySignature(
|
||||||
|
id: Long,
|
||||||
|
can: Int?,
|
||||||
|
image: MultipartFile?,
|
||||||
|
isActive: Boolean?,
|
||||||
|
memberId: Long,
|
||||||
|
isAdult: Boolean?
|
||||||
|
) {
|
||||||
val signatureCan = repository.findSignatureByIdOrNull(id = id, memberId = memberId)
|
val signatureCan = repository.findSignatureByIdOrNull(id = id, memberId = memberId)
|
||||||
?: throw SodaException("잘못된 요청입니다.")
|
?: throw SodaException("잘못된 요청입니다.")
|
||||||
|
|
||||||
|
if (can != null) {
|
||||||
|
signatureCan.can = can
|
||||||
|
}
|
||||||
|
|
||||||
if (isActive != null) {
|
if (isActive != null) {
|
||||||
signatureCan.isActive = isActive
|
signatureCan.isActive = isActive
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ import javax.persistence.ManyToOne
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
data class SignatureCan(
|
data class SignatureCan(
|
||||||
val can: Int,
|
var can: Int,
|
||||||
var isAdult: Boolean = false,
|
var isAdult: Boolean = false,
|
||||||
var isActive: Boolean = true
|
var isActive: Boolean = true
|
||||||
) : BaseEntity() {
|
) : BaseEntity() {
|
||||||
|
|
Loading…
Reference in New Issue