officer/egovframe-msa-edu
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed: response status 변경, list 객체 바인딩 수정

Browse Source
This commit is contained in:
shinmj
2021-11-11 09:57:07 +09:00
parent 8c34a5f56e
commit 5af904b97a
39 changed files with 96 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/user-service/src/main/java/org/egovframe/cloud/userservice/api/role/AuthorizationApiController.java
View File

@@ -12,6 +12,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -115,6 +116,7 @@ public class AuthorizationApiController {
* @return AuthorizationResponseDto 인가 상세 응답 DTO
*/
@PostMapping("/api/v1/authorizations")
@ResponseStatus(HttpStatus.CREATED)
public AuthorizationResponseDto save(@RequestBody @Valid AuthorizationSaveRequestDto requestDto) {
return authorizationService.save(requestDto);
}
@@ -137,6 +139,7 @@ public class AuthorizationApiController {
* @param authorizationNo 인가 번호
*/
@DeleteMapping("/api/v1/authorizations/{authorizationNo}")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void delete(@PathVariable Integer authorizationNo) {
authorizationService.delete(authorizationNo);
}

3
backend/user-service/src/main/java/org/egovframe/cloud/userservice/api/role/RoleAuthorizationApiController.java
View File

@@ -8,6 +8,7 @@ import org.egovframe.cloud.userservice.api.role.dto.RoleAuthorizationSaveRequest
import org.egovframe.cloud.userservice.service.role.RoleAuthorizationService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -59,6 +60,7 @@ public class RoleAuthorizationApiController {
* @return List<RoleAuthorizationListResponseDto> 등록한 권한 인가 목록 응답 DTO
*/
@PostMapping("/api/v1/role-authorizations")
@ResponseStatus(HttpStatus.CREATED)
public List<RoleAuthorizationListResponseDto> save(@RequestBody @Valid List<RoleAuthorizationSaveRequestDto> requestDtoList) {
return roleAuthorizationService.save(requestDtoList);
}
@@ -69,6 +71,7 @@ public class RoleAuthorizationApiController {
* @param requestDtoList 권한 인가 삭제 요청 DTO List
*/
@PutMapping("/api/v1/role-authorizations")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void delete(@RequestBody @Valid List<RoleAuthorizationDeleteRequestDto> requestDtoList) {
roleAuthorizationService.delete(requestDtoList);
}

3
backend/user-service/src/main/java/org/egovframe/cloud/userservice/api/user/UserApiController.java
View File

@@ -11,6 +11,7 @@ import org.springframework.core.env.Environment;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
@@ -72,6 +73,7 @@ public class UserApiController {
* @return
*/
@PostMapping("/api/v1/users")
@ResponseStatus(HttpStatus.CREATED)
public Long save(@RequestBody @Valid UserSaveRequestDto requestDto) {
return userService.save(requestDto);
}
@@ -153,6 +155,7 @@ public class UserApiController {
* @return Boolean 성공 여부
*/
@PostMapping("/api/v1/users/join")
@ResponseStatus(HttpStatus.CREATED)
public Boolean join(@RequestBody @Valid UserJoinRequestDto requestDto) {
return userService.join(requestDto);
}

2
backend/user-service/src/main/java/org/egovframe/cloud/userservice/domain/role/Authorization.java
View File

@@ -90,7 +90,7 @@ public class Authorization extends BaseEntity {
this.urlPatternValue = urlPatternValue;
this.httpMethodCode = httpMethodCode;
this.sortSeq = sortSeq;
this.roleAuthorizations = new ArrayList<>(roleAuthorizations);
this.roleAuthorizations = roleAuthorizations == null ? null : new ArrayList<>(roleAuthorizations);
}
/**

4
backend/user-service/src/test/java/org/egovframe/cloud/userservice/api/role/AuthorizationApiControllerTest.java
View File

@@ -245,7 +245,7 @@ class AuthorizationApiControllerTest {
// then
resultActions
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk());
.andExpect(MockMvcResultMatchers.status().isCreated());
String responseData = resultActions.andReturn().getResponse().getContentAsString();
JSONObject jsonObject = new JSONObject(responseData);
@@ -333,7 +333,7 @@ class AuthorizationApiControllerTest {
// then
resultActions
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk());
.andExpect(MockMvcResultMatchers.status().isNoContent());
Optional<Authorization> authorization = selectData(authorizationNo);
assertThat(authorization).isNotPresent();

4
backend/user-service/src/test/java/org/egovframe/cloud/userservice/api/role/RoleAuthorizationApiControllerTest.java
View File

@@ -228,7 +228,7 @@ class RoleAuthorizationApiControllerTest {
// then
resultActions
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk());
.andExpect(MockMvcResultMatchers.status().isCreated());
String responseData = resultActions.andReturn().getResponse().getContentAsString();
JSONArray jsonArray = new JSONArray(responseData);
@@ -282,7 +282,7 @@ class RoleAuthorizationApiControllerTest {
// then
resultActions
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk());
.andExpect(MockMvcResultMatchers.status().isNoContent());
List<RoleAuthorization> entityList = roleAuthorizationRepository.findAll(Sort.by(Sort.Direction.ASC, "roleAuthorizationId.authorizationNo"));
for (int i = entityList.size() - 1; i >= 0; i--) {

2
backend/user-service/src/test/java/org/egovframe/cloud/userservice/api/user/UserApiControllerTest.java
View File

@@ -324,7 +324,7 @@ class UserApiControllerTest {
// then
resultActions
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andExpect(MockMvcResultMatchers.status().isCreated())
.andExpect(MockMvcResultMatchers.content().string("true"));
// userRepository.findByEmail("test_join" + TEST_COM).ifPresent(u -> deleteUser(u.getId()));