-
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.
Merge pull request #78 from le2sky/develop
[๋ฐฐํฌ] v0.5.0(PR#75,PR#76,PR#77)
- Loading branch information
Showing
58 changed files
with
1,248 additions
and
54 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
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
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
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
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
26 changes: 26 additions & 0 deletions
26
mealkitary-api/src/main/kotlin/com/mealkitary/shop/web/RegisterShopController.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,26 @@ | ||
| package com.mealkitary.shop.web | ||
|
|
||
| import com.mealkitary.common.utils.HttpResponseUtils | ||
| import com.mealkitary.shop.application.port.input.RegisterShopUseCase | ||
| import com.mealkitary.shop.web.request.RegisterShopWebRequest | ||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.web.bind.annotation.PostMapping | ||
| import org.springframework.web.bind.annotation.RequestBody | ||
| import org.springframework.web.bind.annotation.RequestMapping | ||
| import org.springframework.web.bind.annotation.RestController | ||
| import javax.validation.Valid | ||
|
|
||
| @RestController | ||
| @RequestMapping("/shops") | ||
| class RegisterShopController( | ||
| private val registerShopUseCase: RegisterShopUseCase | ||
| ) { | ||
|
|
||
| @PostMapping | ||
| fun registerShop(@Valid @RequestBody registerShopWebRequest: RegisterShopWebRequest): ResponseEntity<Unit> { | ||
| val resourceId = registerShopUseCase.register(registerShopWebRequest.mapToServiceRequest()) | ||
| val location = HttpResponseUtils.createResourceUri(resourceId) | ||
|
|
||
| return ResponseEntity.created(location).build() | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
mealkitary-api/src/main/kotlin/com/mealkitary/shop/web/UpdateShopStatusController.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,22 @@ | ||
| package com.mealkitary.shop.web | ||
|
|
||
| import com.mealkitary.shop.application.port.input.UpdateShopStatusUseCase | ||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.web.bind.annotation.PathVariable | ||
| import org.springframework.web.bind.annotation.PostMapping | ||
| import org.springframework.web.bind.annotation.RequestMapping | ||
| import org.springframework.web.bind.annotation.RestController | ||
|
|
||
| @RestController | ||
| @RequestMapping("/shops") | ||
| class UpdateShopStatusController( | ||
| private val updateShopStatusUseCase: UpdateShopStatusUseCase | ||
| ) { | ||
|
|
||
| @PostMapping("/{shopId}/status") | ||
| fun updateShopStatus(@PathVariable("shopId") shopId: Long): ResponseEntity<Unit> { | ||
| updateShopStatusUseCase.update(shopId) | ||
|
|
||
| return ResponseEntity.noContent().build() | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
mealkitary-api/src/main/kotlin/com/mealkitary/shop/web/request/RegisterShopWebRequest.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,15 @@ | ||
| package com.mealkitary.shop.web.request | ||
|
|
||
| import com.mealkitary.shop.application.port.input.RegisterShopRequest | ||
| import javax.validation.constraints.NotBlank | ||
|
|
||
| data class RegisterShopWebRequest( | ||
| @field:NotBlank(message = "๋ฑ๋ก ๋์ ๊ฐ๊ฒ์ ์ด๋ฆ์ ํ์์ ๋๋ค.") | ||
| val title: String? = null, | ||
|
|
||
| @field:NotBlank(message = "์ฌ์ ์ ๋ฒํธ๋ ํ์์ ๋๋ค.") | ||
| val brn: String? = null | ||
| ) { | ||
|
|
||
| fun mapToServiceRequest() = RegisterShopRequest(title!!, brn!!) | ||
| } |
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
55 changes: 55 additions & 0 deletions
55
mealkitary-api/src/test/kotlin/com/docs/shop/RegisterShopControllerDocsTest.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,55 @@ | ||
| package com.docs.shop | ||
|
|
||
| import com.docs.RestDocsSupport | ||
| import com.mealkitary.shop.application.port.input.RegisterShopUseCase | ||
| import com.mealkitary.shop.web.RegisterShopController | ||
| import com.mealkitary.shop.web.request.RegisterShopWebRequest | ||
| import io.mockk.every | ||
| import io.mockk.mockk | ||
| import org.springframework.http.MediaType | ||
| import org.springframework.restdocs.headers.HeaderDocumentation.headerWithName | ||
| import org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders | ||
| import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation | ||
| import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders | ||
| import org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest | ||
| import org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse | ||
| import org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint | ||
| import org.springframework.restdocs.payload.JsonFieldType | ||
| import org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath | ||
| import org.springframework.restdocs.payload.PayloadDocumentation.requestFields | ||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers.header | ||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status | ||
|
|
||
| class RegisterShopControllerDocsTest : RestDocsSupport() { | ||
|
|
||
| private val registerShopUseCase = mockk<RegisterShopUseCase>() | ||
|
|
||
| @Test | ||
| fun `api docs test - registerShop`() { | ||
| every { registerShopUseCase.register(any()) } answers { 1L } | ||
|
|
||
| val registerShopWebRequest = RegisterShopWebRequest("์ง๋ฐฅ๋๋ฑ ์์์ ", "123-23-12345") | ||
|
|
||
| mvc.perform( | ||
| RestDocumentationRequestBuilders.post("/shops") | ||
| .contentType(MediaType.APPLICATION_JSON) | ||
| .content(objectMapper.writeValueAsString(registerShopWebRequest)) | ||
| ) | ||
| .andExpect(status().isCreated) | ||
| .andExpect(header().string("Location", "http://localhost/shops/1")) | ||
| .andDo( | ||
| MockMvcRestDocumentation.document( | ||
| "shop-post", | ||
| preprocessRequest(prettyPrint()), | ||
| preprocessResponse(prettyPrint()), | ||
| requestFields( | ||
| fieldWithPath("title").type(JsonFieldType.STRING).description("๋ฑ๋ก ๋์ ๊ฐ๊ฒ ์ด๋ฆ"), | ||
| fieldWithPath("brn").type(JsonFieldType.STRING).description("์ฌ์ ์ ๋ฒํธ"), | ||
| ), | ||
| responseHeaders(headerWithName("Location").description("์์ฑ๋ ๊ฐ๊ฒ ๋ฆฌ์์ค URI")), | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun initController() = RegisterShopController(registerShopUseCase) | ||
| } |
Oops, something went wrong.