-
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.
* Chore | CAKK-92 | Security 관련 의존성 추가 * Feature | CAKK-92 | 인증 어드민 관련 기능 구현 * Refactor | CAKK-92 | 어드민 서버 코드 리팩토링
- Loading branch information
Showing
38 changed files
with
471 additions
and
665 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
5 changes: 5 additions & 0 deletions
5
cakk-admin/src/main/kotlin/com/cakk/admin/annotation/AdminUser.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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package com.cakk.admin.annotation | ||
|
||
@Target(AnnotationTarget.VALUE_PARAMETER) | ||
@Retention(AnnotationRetention.RUNTIME) | ||
annotation class AdminUser |
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
60 changes: 33 additions & 27 deletions
60
cakk-admin/src/main/kotlin/com/cakk/admin/controller/BusinessInformationController.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,38 +1,44 @@ | ||
package com.cakk.admin.controller | ||
|
||
import com.cakk.admin.dto.request.PromotionRequest | ||
import com.cakk.admin.dto.response.CakeShopOwnerCandidateResponse | ||
import com.cakk.admin.dto.response.CakeShopOwnerCandidatesResponse | ||
import com.cakk.admin.service.BusinessInformationService | ||
import com.cakk.common.response.ApiResponse | ||
import jakarta.validation.Valid | ||
|
||
import org.springframework.web.bind.annotation.* | ||
|
||
import com.cakk.admin.dto.request.PromotionRequest | ||
import com.cakk.admin.mapper.supplyPromotionParamBy | ||
import com.cakk.common.response.ApiResponse | ||
import com.cakk.core.dto.response.shop.CakeShopOwnerCandidateResponse | ||
import com.cakk.core.dto.response.shop.CakeShopOwnerCandidatesResponse | ||
import com.cakk.core.service.shop.ShopService | ||
|
||
@RestController | ||
@RequestMapping("/business-information") | ||
class BusinessInformationController( | ||
private val businessInformationService: BusinessInformationService | ||
private val shopService: ShopService | ||
) { | ||
|
||
@GetMapping("/candidates") | ||
fun getBusinessOwnerCandidates(): ApiResponse<CakeShopOwnerCandidatesResponse> { | ||
val response = businessInformationService.getBusinessOwnerCandidates() | ||
return ApiResponse.success(response) | ||
} | ||
|
||
@GetMapping("/candidates/{userId}") | ||
fun getCandidateSpecificationInformation( | ||
@PathVariable userId: Long | ||
): ApiResponse<CakeShopOwnerCandidateResponse> { | ||
val response = businessInformationService.getCandidateInformation(userId) | ||
return ApiResponse.success(response) | ||
} | ||
|
||
@PutMapping("/promote") | ||
fun promoteUser( | ||
@RequestBody @Valid promotionRequest: PromotionRequest | ||
): ApiResponse<Unit> { | ||
businessInformationService.promoteUserToBusinessOwner(promotionRequest) | ||
return ApiResponse.success() | ||
} | ||
@GetMapping("/candidates") | ||
fun getBusinessOwnerCandidates(): ApiResponse<CakeShopOwnerCandidatesResponse> { | ||
val response = shopService.getBusinessOwnerCandidates() | ||
return ApiResponse.success(response) | ||
} | ||
|
||
@GetMapping("/candidates/{userId}") | ||
fun getCandidateSpecificationInformation( | ||
@PathVariable userId: Long | ||
): ApiResponse<CakeShopOwnerCandidateResponse> { | ||
val response = shopService.getCandidateInformation(userId) | ||
|
||
return ApiResponse.success(response) | ||
} | ||
|
||
@PutMapping("/promote") | ||
fun promoteUser( | ||
@RequestBody @Valid promotionRequest: PromotionRequest | ||
): ApiResponse<Unit> { | ||
val param = supplyPromotionParamBy(promotionRequest) | ||
shopService.promoteUserToBusinessOwner(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
} |
77 changes: 45 additions & 32 deletions
77
cakk-admin/src/main/kotlin/com/cakk/admin/controller/CakeController.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,44 +1,57 @@ | ||
package com.cakk.admin.controller | ||
|
||
import jakarta.validation.Valid | ||
|
||
import org.springframework.web.bind.annotation.* | ||
|
||
import com.cakk.admin.annotation.AdminUser | ||
import com.cakk.admin.dto.request.CakeCreateByAdminRequest | ||
import com.cakk.admin.dto.request.CakeUpdateByAdminRequest | ||
import com.cakk.admin.service.CakeService | ||
import com.cakk.admin.mapper.supplyCakeCreateParamBy | ||
import com.cakk.admin.mapper.supplyCakeUpdateParamBy | ||
import com.cakk.common.response.ApiResponse | ||
import jakarta.validation.Valid | ||
import org.springframework.web.bind.annotation.* | ||
import com.cakk.core.service.cake.CakeService | ||
import com.cakk.domain.mysql.entity.user.User | ||
|
||
@RestController | ||
@RequestMapping("/shops/{cakeShopId}/cakes") | ||
class CakeController( | ||
private val cakeService: CakeService | ||
private val cakeService: CakeService | ||
) { | ||
|
||
@PostMapping | ||
fun create( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid dto: CakeCreateByAdminRequest | ||
): ApiResponse<Unit> { | ||
cakeService.createCake(dto.toParam(cakeShopId)) | ||
return ApiResponse.success() | ||
} | ||
|
||
@PutMapping("/{cakeId}") | ||
fun update( | ||
@PathVariable cakeShopId: Long, | ||
@PathVariable cakeId: Long, | ||
@RequestBody @Valid dto: CakeUpdateByAdminRequest | ||
): ApiResponse<Unit> { | ||
cakeService.updateCake(dto.toParam(cakeShopId)) | ||
return ApiResponse.success() | ||
} | ||
|
||
@DeleteMapping("/{cakeId}") | ||
fun delete( | ||
@PathVariable cakeShopId: Long, | ||
@PathVariable cakeId: Long | ||
): ApiResponse<Unit> { | ||
cakeService.deleteCake(cakeId) | ||
|
||
return ApiResponse.success() | ||
} | ||
@PostMapping | ||
fun create( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid dto: CakeCreateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyCakeCreateParamBy(dto, admin, cakeShopId) | ||
cakeService.createCake(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
|
||
@PutMapping("/{cakeId}") | ||
fun update( | ||
@PathVariable cakeShopId: Long, | ||
@PathVariable cakeId: Long, | ||
@RequestBody @Valid dto: CakeUpdateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyCakeUpdateParamBy(dto, admin, cakeShopId) | ||
cakeService.updateCake(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
|
||
@DeleteMapping("/{cakeId}") | ||
fun delete( | ||
@PathVariable cakeShopId: Long, | ||
@PathVariable cakeId: Long, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
cakeService.deleteCake(admin, cakeId) | ||
|
||
return ApiResponse.success() | ||
} | ||
} |
102 changes: 58 additions & 44 deletions
102
cakk-admin/src/main/kotlin/com/cakk/admin/controller/ShopController.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,64 +1,78 @@ | ||
package com.cakk.admin.controller | ||
|
||
import com.cakk.admin.dto.request.* | ||
import com.cakk.admin.dto.response.CakeShopCreateResponse | ||
import com.cakk.admin.service.ShopService | ||
import com.cakk.common.response.ApiResponse | ||
import jakarta.validation.Valid | ||
|
||
import org.springframework.web.bind.annotation.* | ||
|
||
import com.cakk.admin.annotation.AdminUser | ||
import com.cakk.admin.dto.request.* | ||
import com.cakk.admin.mapper.* | ||
import com.cakk.common.response.ApiResponse | ||
import com.cakk.core.dto.response.shop.CakeShopCreateResponse | ||
import com.cakk.core.service.shop.ShopService | ||
import com.cakk.domain.mysql.entity.user.User | ||
|
||
@RestController | ||
@RequestMapping("/shops") | ||
class ShopController( | ||
private val shopService: ShopService | ||
private val shopService: ShopService | ||
) { | ||
|
||
@PostMapping | ||
fun createByAdmin( | ||
@RequestBody @Valid request: CakeShopCreateByAdminRequest | ||
): ApiResponse<CakeShopCreateResponse> { | ||
val response = shopService.createCakeShopByCertification(request.toParam()) | ||
@PostMapping | ||
fun createByAdmin( | ||
@RequestBody @Valid request: CakeShopCreateByAdminRequest | ||
): ApiResponse<CakeShopCreateResponse> { | ||
val param = supplyCreateShopParamBy(request) | ||
val response = shopService.createCakeShopByCertification(param) | ||
|
||
return ApiResponse.success(response) | ||
} | ||
return ApiResponse.success(response) | ||
} | ||
|
||
@PutMapping("/{cakeShopId}") | ||
fun updateBasicInformation( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: CakeShopUpdateByAdminRequest | ||
): ApiResponse<Unit> { | ||
shopService.updateBasicInformation(request.toParam(cakeShopId)) | ||
@PutMapping("/{cakeShopId}") | ||
fun updateBasicInformation( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: CakeShopUpdateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyCakeShopUpdateParamBy(request, admin, cakeShopId) | ||
shopService.updateBasicInformation(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
return ApiResponse.success() | ||
} | ||
|
||
@PutMapping("/{cakeShopId}/links") | ||
fun updateLinks( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody request: @Valid LinkUpdateByAdminRequest | ||
): ApiResponse<Unit> { | ||
shopService.updateShopLinks(request.toParam(cakeShopId)) | ||
@PutMapping("/{cakeShopId}/links") | ||
fun updateLinks( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: LinkUpdateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyUpdateLinkParamBy(request, admin, cakeShopId) | ||
shopService.updateShopLinks(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
return ApiResponse.success() | ||
} | ||
|
||
@PutMapping("/{cakeShopId}/operation-days") | ||
fun updateOperationDays( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: ShopOperationUpdateByAdminRequest | ||
): ApiResponse<Unit> { | ||
shopService.updateShopOperationDays(request.toParam(cakeShopId)) | ||
@PutMapping("/{cakeShopId}/operation-days") | ||
fun updateOperationDays( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: ShopOperationUpdateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyUpdateShopOperationParamBy(request, admin, cakeShopId) | ||
shopService.updateShopOperationDays(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
return ApiResponse.success() | ||
} | ||
|
||
@PutMapping("/{cakeShopId}/address") | ||
fun updateAddress( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: AddressUpdateByAdminRequest | ||
): ApiResponse<Unit> { | ||
shopService.updateShopAddress(request.toParam(cakeShopId)) | ||
@PutMapping("/{cakeShopId}/address") | ||
fun updateAddress( | ||
@PathVariable cakeShopId: Long, | ||
@RequestBody @Valid request: AddressUpdateByAdminRequest, | ||
@AdminUser admin: User | ||
): ApiResponse<Unit> { | ||
val param = supplyUpdateShopAddressParamBy(request, admin, cakeShopId) | ||
shopService.updateShopAddress(param) | ||
|
||
return ApiResponse.success() | ||
} | ||
return ApiResponse.success() | ||
} | ||
} |
11 changes: 0 additions & 11 deletions
11
cakk-admin/src/main/kotlin/com/cakk/admin/dto/param/CakeCreateByAdminParam.kt
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
cakk-admin/src/main/kotlin/com/cakk/admin/dto/param/CakeShopCreateByAdminParam.kt
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
cakk-admin/src/main/kotlin/com/cakk/admin/dto/param/CakeUpdateByAdminParam.kt
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
cakk-admin/src/main/kotlin/com/cakk/admin/dto/param/OwnerCandidateParam.kt
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
cakk-admin/src/main/kotlin/com/cakk/admin/dto/param/ShopLinkParam.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.