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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
jooho
2021-10-28 11:31:31 +09:00
parent 4b01da23b6 53cfcf0e6c
commit 03a9ca4524
4 changed files with 228 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java
View File

@@ -37,7 +37,6 @@ import org.springframework.test.context.TestPropertySource;
@ActiveProfiles(profiles = "test")
class MenuApiControllerTest {
@Autowired
private TestRestTemplate restTemplate;
@@ -85,7 +84,7 @@ class MenuApiControllerTest {
}
//when
ResponseEntity<List<MenuTreeResponseDto>> responseEntity = restTemplate.exchange("/api/v1/"+site.getId()+"/menus", HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuTreeResponseDto>>(){});
ResponseEntity<List<MenuTreeResponseDto>> responseEntity = restTemplate.exchange("/api/v1/menus/"+site.getId()+"/tree", HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuTreeResponseDto>>(){});
//then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -198,17 +197,18 @@ class MenuApiControllerTest {
Menu parentMenu = menuRepository.save(Menu.builder()
.menuKorName("parent")
.menuKorName("parenteng")
.sortSeq(1)
.site(site)
.build());
//when
String url = "/api/v1/manager/menus/"+parentMenu.getId();
String url = "/api/v1/menus/"+parentMenu.getId();
ResponseEntity<MenuResponseDto> responseEntity = restTemplate.getForEntity(url, MenuResponseDto.class);
//then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(responseEntity.getBody()).extracting("name").isEqualTo(parentMenu.getMenuKorName());
assertThat(responseEntity.getBody()).extracting("menuKorName").isEqualTo(parentMenu.getMenuKorName());
System.out.println(responseEntity.getBody());
}
@@ -237,11 +237,6 @@ class MenuApiControllerTest {
}
/**
* @TODO
* bulk update 수정 필요
* @throws Exception
*/
@Test
public void 메뉴관리_트리_드래그앤드랍_순서_및_부모메뉴_변경() throws Exception {
//given
@@ -287,12 +282,11 @@ class MenuApiControllerTest {
String url = "/api/v1/menus/"+site.getId()+"/tree";
//when
ResponseEntity<List<MenuTreeResponseDto>> responseEntity =
restTemplate.exchange(url, HttpMethod.PUT, httpEntity, new ParameterizedTypeReference<List<MenuTreeResponseDto>>(){});
ResponseEntity<Long> responseEntity =
restTemplate.exchange(url, HttpMethod.PUT, httpEntity, Long.class);
//then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
responseEntity.getBody().stream().forEach(System.out::println);
}

22
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java
View File

@@ -15,6 +15,7 @@ import org.egovframe.cloud.portalservice.domain.menu.MenuRole;
import org.egovframe.cloud.portalservice.domain.menu.MenuRoleRepository;
import org.egovframe.cloud.portalservice.domain.menu.Site;
import org.egovframe.cloud.portalservice.domain.menu.SiteRepository;
import org.egovframe.cloud.portalservice.domain.user.Role;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -36,7 +37,6 @@ import org.springframework.test.context.TestPropertySource;
@ActiveProfiles(profiles = "test")
class MenuRoleApiControllerTest {
@Autowired
private TestRestTemplate restTemplate;
@@ -108,8 +108,11 @@ class MenuRoleApiControllerTest {
Menu child1 = menus.stream().filter(menu -> menu.getMenuKorName().equals("child_1")).collect(Collectors.toList()).get(0);
List<MenuRole> menuRoles = new ArrayList<>();
menuRoles.add(MenuRole.builder().roleId("role").menu(parent).build());
menuRoles.add(MenuRole.builder().roleId("role").menu(child1).build());
MenuRole menuRole1 = MenuRole.builder().roleId("ROLE").menu(parent).build();
menuRoles.add(menuRole1);
MenuRole menuRole2 = MenuRole.builder().roleId("ROLE").menu(child1).build();
menuRoles.add(menuRole2);
menuRoleRepository.saveAll(menuRoles);
Site site = siteRepository.findAll().get(0);
@@ -122,8 +125,8 @@ class MenuRoleApiControllerTest {
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
List<MenuRoleResponseDto> body = responseEntity.getBody();
assertThat(body.size()).isEqualTo(1);
assertThat(body.get(0).getIsChecked()).isTrue();
body.stream().forEach(System.out::println);
assertThat(body.get(0).getIsChecked()).isTrue();
assertThat(body.get(0).getChildren().size()).isEqualTo(3);
body.stream().forEach(menuTreeResponseDto -> {
menuTreeResponseDto.getChildren().stream().forEach(child -> {
@@ -151,7 +154,7 @@ class MenuRoleApiControllerTest {
children.add(MenuRoleRequestDto.builder()
.menuRoleId(menuRoleResponseDto.getMenuRoleId())
.isChecked(true)
.roleId("role")
.roleId("ROLE")
.id(menuRoleResponseDto.getId())
.build());
@@ -159,7 +162,7 @@ class MenuRoleApiControllerTest {
children.add(MenuRoleRequestDto.builder()
.menuRoleId(menuRoleResponseDto.getMenuRoleId())
.isChecked(false)
.roleId("role")
.roleId("ROLE")
.id(menuRoleResponseDto.getId())
.build());
}
@@ -168,6 +171,7 @@ class MenuRoleApiControllerTest {
requestDtoList.add(MenuRoleRequestDto.builder()
.menuRoleId(list.get(0).getMenuRoleId())
.isChecked(true)
.roleId("ROLE")
.id(list.get(0).getId())
.children(children)
.build());
@@ -200,9 +204,10 @@ class MenuRoleApiControllerTest {
.menuKorName("parent-any")
.sortSeq(1)
.site(site)
.isUse(true)
.build());
MenuRole parentMenuRole = MenuRole.builder()
.roleId("ROLE_ANONYMOUS")
.roleId(Role.ANONYMOUS.getKey())
.menu(parentMenu)
.build();
parentMenuRole.setMenu(parentMenu);
@@ -214,11 +219,12 @@ class MenuRoleApiControllerTest {
.site(site)
.parent(parentMenu)
.sortSeq(i + 1)
.isUse(true)
.build();
childMenu.setParentMenu(parentMenu);
menuRepository.save(childMenu);
MenuRole role_any = MenuRole.builder()
.roleId("ROLE_ANONYMOUS")
.roleId(Role.ANONYMOUS.getKey())
.menu(childMenu)
.build();
role_any.setMenu(childMenu);

13
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/policy/PolicyApiControllerTest.java
View File

@@ -88,10 +88,9 @@ class PolicyApiControllerTest {
.contents(contents)
.build();
String url = "http://localhost:"+port+API_URL;
//when
ResponseEntity<Long> responseEntity = restTemplate.postForEntity(url, requestDto, Long.class);
ResponseEntity<Long> responseEntity = restTemplate.postForEntity(API_URL, requestDto, Long.class);
//then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -104,7 +103,7 @@ class PolicyApiControllerTest {
@Test
public void 목록조회한다() throws Exception {
String url = "http://localhost:"+port+API_URL+"?size=3%page=0";
String url = API_URL+"?size=3%page=0";
//when
ResponseEntity<RestResponsePage<PolicyResponseDto>> responseEntity =
restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<PolicyResponseDto>>() {});
@@ -134,7 +133,7 @@ class PolicyApiControllerTest {
@Test
public void ID로_한건조회_정상() throws Exception {
String url = "http://localhost:"+port+API_URL +"/9";
String url = API_URL +"/9";
//when
ResponseEntity<PolicyResponseDto> responseEntity = restTemplate.getForEntity(url, PolicyResponseDto.class);
@@ -153,7 +152,7 @@ class PolicyApiControllerTest {
.contents("contents!!!!")
.build()
).getId();
String url = "http://localhost:"+port+API_URL +"/"+id;
String url = API_URL +"/"+id;
PolicyUpdateRequestDto requestDto = PolicyUpdateRequestDto.builder()
.title("update title")
@@ -183,7 +182,7 @@ class PolicyApiControllerTest {
.contents("contents!!!!")
.build()
).getId();
String url = "http://localhost:"+port+API_URL +"/"+id;
String url = API_URL +"/"+id;
//when
restTemplate.delete(url);
@@ -203,7 +202,7 @@ class PolicyApiControllerTest {
.contents("contents!!!")
.build()
).getId();
String url = "http://localhost:"+port+API_URL +"/"+id+"/"+false;
String url = API_URL +"/"+id+"/"+false;
//when
ResponseEntity<Long> responseEntity = restTemplate.exchange(url, HttpMethod.PUT, null, Long.class);

6
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/statistics/StatisticsApiControllerTest.java
View File

@@ -2,6 +2,7 @@ package org.egovframe.cloud.portalservice.api.statistics;
import static org.assertj.core.api.Assertions.assertThat;
import java.time.LocalDate;
import java.util.List;
import org.egovframe.cloud.portalservice.api.statistics.dto.StatisticsResponseDto;
@@ -33,7 +34,6 @@ class StatisticsApiControllerTest {
@Autowired
private StatisticsRepository statisticsRepository;
@BeforeEach
public void setup() {
for (int i = 0; i < 10; i++) {
@@ -70,9 +70,11 @@ class StatisticsApiControllerTest {
public void 일별접속통계_조회_성공() throws Exception {
Long siteId = 1L;
LocalDate now = LocalDate.now();
// when
ResponseEntity< List<StatisticsResponseDto>> responseEntity =
restTemplate.exchange("/api/v1/statistics/daily/"+siteId+"?year=2021&month=9",
restTemplate.exchange("/api/v1/statistics/daily/"+siteId+"?year="+now.getYear()+"&month="+now.getMonthValue(),
HttpMethod.GET,
null,
new ParameterizedTypeReference<List<StatisticsResponseDto>>(){});