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

250
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") @ActiveProfiles(profiles = "test")
class MenuApiControllerTest { class MenuApiControllerTest {
@Autowired @Autowired
private TestRestTemplate restTemplate; private TestRestTemplate restTemplate;
@@ -51,9 +50,9 @@ class MenuApiControllerTest {
@BeforeEach @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
siteRepository.save(Site.builder() siteRepository.save(Site.builder()
.name("site") .name("site")
.isUse(true) .isUse(true)
.build() .build()
); );
} }
@@ -68,24 +67,24 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu = menuRepository.save(Menu.builder() Menu parentMenu = menuRepository.save(Menu.builder()
.menuKorName("parent") .menuKorName("parent")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu = Menu.builder() Menu childMenu = Menu.builder()
.menuKorName("child_" + i) .menuKorName("child_" + i)
.site(site) .site(site)
.parent(parentMenu) .parent(parentMenu)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu.setParentMenu(parentMenu); childMenu.setParentMenu(parentMenu);
menuRepository.save(childMenu); menuRepository.save(childMenu);
} }
//when //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 //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -102,14 +101,14 @@ class MenuApiControllerTest {
public void 메뉴관리_사이트콤보_목록_조회한다() throws Exception { public void 메뉴관리_사이트콤보_목록_조회한다() throws Exception {
//given //given
siteRepository.save(Site.builder() siteRepository.save(Site.builder()
.name("portal") .name("portal")
.isUse(true) .isUse(true)
.build() .build()
); );
siteRepository.save(Site.builder() siteRepository.save(Site.builder()
.name("admin") .name("admin")
.isUse(true) .isUse(true)
.build() .build()
); );
//when //when
@@ -127,50 +126,50 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
Menu parentMenu2 = menuRepository.save(Menu.builder() Menu parentMenu2 = menuRepository.save(Menu.builder()
.menuKorName("parent_2") .menuKorName("parent_2")
.sortSeq(2) .sortSeq(2)
.site(site) .site(site)
.build()); .build());
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu1 = Menu.builder() Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i) .menuKorName("child_1_" + i)
.site(site) .site(site)
.parent(parentMenu1) .parent(parentMenu1)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu1); childMenu1.setParentMenu(parentMenu1);
menuRepository.save(childMenu1); menuRepository.save(childMenu1);
if (i == 1) { if (i == 1) {
Menu childChildMenu = Menu.builder() Menu childChildMenu = Menu.builder()
.menuKorName("child_child_1") .menuKorName("child_child_1")
.site(site) .site(site)
.parent(childMenu1) .parent(childMenu1)
.sortSeq(1) .sortSeq(1)
.build(); .build();
childChildMenu.setParentMenu(childMenu1); childChildMenu.setParentMenu(childMenu1);
menuRepository.save(childChildMenu); menuRepository.save(childChildMenu);
Menu childChildMenu2 = Menu.builder() Menu childChildMenu2 = Menu.builder()
.menuKorName("child_child_1") .menuKorName("child_child_1")
.site(site) .site(site)
.parent(childMenu1) .parent(childMenu1)
.sortSeq(2) .sortSeq(2)
.build(); .build();
childChildMenu2.setParentMenu(childMenu1); childChildMenu2.setParentMenu(childMenu1);
menuRepository.save(childChildMenu2); menuRepository.save(childChildMenu2);
} }
Menu childMenu2 = Menu.builder() Menu childMenu2 = Menu.builder()
.menuKorName("child_2_" + i) .menuKorName("child_2_" + i)
.site(site) .site(site)
.parent(parentMenu2) .parent(parentMenu2)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu2); childMenu1.setParentMenu(parentMenu2);
menuRepository.save(childMenu2); menuRepository.save(childMenu2);
} }
@@ -197,18 +196,19 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu = menuRepository.save(Menu.builder() Menu parentMenu = menuRepository.save(Menu.builder()
.menuKorName("parent") .menuKorName("parent")
.sortSeq(1) .menuKorName("parenteng")
.site(site) .sortSeq(1)
.build()); .site(site)
.build());
//when //when
String url = "/api/v1/manager/menus/"+parentMenu.getId(); String url = "/api/v1/menus/"+parentMenu.getId();
ResponseEntity<MenuResponseDto> responseEntity = restTemplate.getForEntity(url, MenuResponseDto.class); ResponseEntity<MenuResponseDto> responseEntity = restTemplate.getForEntity(url, MenuResponseDto.class);
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); 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()); System.out.println(responseEntity.getBody());
} }
@@ -219,11 +219,11 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
MenuTreeRequestDto menuTreeRequestDto = MenuTreeRequestDto.builder() MenuTreeRequestDto menuTreeRequestDto = MenuTreeRequestDto.builder()
.parentId(null) .parentId(null)
.siteId(site.getId()) .siteId(site.getId())
.name("parent") .name("parent")
.sortSeq(1) .sortSeq(1)
.build(); .build();
String url = "/api/v1/menus"; String url = "/api/v1/menus";
@@ -237,35 +237,30 @@ class MenuApiControllerTest {
} }
/**
* @TODO
* bulk update 수정 필요
* @throws Exception
*/
@Test @Test
public void 메뉴관리_트리_드래그앤드랍_순서_및_부모메뉴_변경() throws Exception { public void 메뉴관리_트리_드래그앤드랍_순서_및_부모메뉴_변경() throws Exception {
//given //given
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
Menu parentMenu2 = menuRepository.save(Menu.builder() Menu parentMenu2 = menuRepository.save(Menu.builder()
.menuKorName("parent_2") .menuKorName("parent_2")
.sortSeq(2) .sortSeq(2)
.site(site) .site(site)
.build()); .build());
Long menuId = 0L; Long menuId = 0L;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu1 = Menu.builder() Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i) .menuKorName("child_1_" + i)
.site(site) .site(site)
.parent(parentMenu1) .parent(parentMenu1)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu1); childMenu1.setParentMenu(parentMenu1);
Menu save = menuRepository.save(childMenu1); Menu save = menuRepository.save(childMenu1);
menuId = save.getId(); menuId = save.getId();
@@ -274,25 +269,24 @@ class MenuApiControllerTest {
List<MenuDnDRequestDto> updateList = new ArrayList<>(); List<MenuDnDRequestDto> updateList = new ArrayList<>();
updateList.add(MenuDnDRequestDto.builder() updateList.add(MenuDnDRequestDto.builder()
.menuId(menuId) .menuId(menuId)
.sortSeq(1) .sortSeq(1)
.parentId(parentMenu2.getId()) .parentId(parentMenu2.getId())
.build()); .build());
HttpEntity<List<MenuDnDRequestDto>> httpEntity = new HttpEntity<>( HttpEntity<List<MenuDnDRequestDto>> httpEntity = new HttpEntity<>(
updateList updateList
); );
String url = "/api/v1/menus/"+site.getId()+"/tree"; String url = "/api/v1/menus/"+site.getId()+"/tree";
//when //when
ResponseEntity<List<MenuTreeResponseDto>> responseEntity = ResponseEntity<Long> responseEntity =
restTemplate.exchange(url, HttpMethod.PUT, httpEntity, new ParameterizedTypeReference<List<MenuTreeResponseDto>>(){}); restTemplate.exchange(url, HttpMethod.PUT, httpEntity, Long.class);
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
responseEntity.getBody().stream().forEach(System.out::println);
} }
@@ -301,19 +295,19 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
Long menuId = 0L; Long menuId = 0L;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu1 = Menu.builder() Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i) .menuKorName("child_1_" + i)
.site(site) .site(site)
.parent(parentMenu1) .parent(parentMenu1)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu1); childMenu1.setParentMenu(parentMenu1);
Menu save = menuRepository.save(childMenu1); Menu save = menuRepository.save(childMenu1);
menuId = save.getId(); menuId = save.getId();
@@ -323,7 +317,7 @@ class MenuApiControllerTest {
//when //when
ResponseEntity<MenuTreeResponseDto> responseEntity = ResponseEntity<MenuTreeResponseDto> responseEntity =
restTemplate.exchange(url, HttpMethod.PUT, null, MenuTreeResponseDto.class); restTemplate.exchange(url, HttpMethod.PUT, null, MenuTreeResponseDto.class);
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(responseEntity.getBody().getName()).isEqualTo("updateName"); assertThat(responseEntity.getBody().getName()).isEqualTo("updateName");
@@ -336,31 +330,31 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
String url = "/api/v1/menus/"+parentMenu1.getId(); String url = "/api/v1/menus/"+parentMenu1.getId();
HttpEntity<MenuUpdateRequestDto> httpEntity = new HttpEntity<>( HttpEntity<MenuUpdateRequestDto> httpEntity = new HttpEntity<>(
MenuUpdateRequestDto.builder() MenuUpdateRequestDto.builder()
.description("상위메뉴") .description("상위메뉴")
.connectId(1) .connectId(1)
.menuType("menuType") .menuType("menuType")
.urlPath("/index") .urlPath("/index")
.subName("subname") .subName("subname")
.isUse(true) .isUse(true)
.isShow(true) .isShow(true)
.isBlank(false) .isBlank(false)
.icon("icon") .icon("icon")
.build() .build()
); );
//when //when
ResponseEntity<MenuResponseDto> responseEntity = ResponseEntity<MenuResponseDto> responseEntity =
restTemplate.exchange(url, HttpMethod.PUT, httpEntity, MenuResponseDto.class); restTemplate.exchange(url, HttpMethod.PUT, httpEntity, MenuResponseDto.class);
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -375,19 +369,19 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
Long menuId = 0L; Long menuId = 0L;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu1 = Menu.builder() Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i) .menuKorName("child_1_" + i)
.site(site) .site(site)
.parent(parentMenu1) .parent(parentMenu1)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu1); childMenu1.setParentMenu(parentMenu1);
Menu save = menuRepository.save(childMenu1); Menu save = menuRepository.save(childMenu1);
menuId = save.getId(); menuId = save.getId();
@@ -409,19 +403,19 @@ class MenuApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu1 = menuRepository.save(Menu.builder() Menu parentMenu1 = menuRepository.save(Menu.builder()
.menuKorName("parent_1") .menuKorName("parent_1")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
Long menuId = 0L; Long menuId = 0L;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu1 = Menu.builder() Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i) .menuKorName("child_1_" + i)
.site(site) .site(site)
.parent(parentMenu1) .parent(parentMenu1)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu1.setParentMenu(parentMenu1); childMenu1.setParentMenu(parentMenu1);
Menu save = menuRepository.save(childMenu1); Menu save = menuRepository.save(childMenu1);
menuId = save.getId(); menuId = save.getId();

108
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.MenuRoleRepository;
import org.egovframe.cloud.portalservice.domain.menu.Site; import org.egovframe.cloud.portalservice.domain.menu.Site;
import org.egovframe.cloud.portalservice.domain.menu.SiteRepository; 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.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -36,7 +37,6 @@ import org.springframework.test.context.TestPropertySource;
@ActiveProfiles(profiles = "test") @ActiveProfiles(profiles = "test")
class MenuRoleApiControllerTest { class MenuRoleApiControllerTest {
@Autowired @Autowired
private TestRestTemplate restTemplate; private TestRestTemplate restTemplate;
@@ -52,24 +52,24 @@ class MenuRoleApiControllerTest {
@BeforeEach @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
Site site = Site.builder() Site site = Site.builder()
.name("site") .name("site")
.isUse(true) .isUse(true)
.build(); .build();
siteRepository.save(site); siteRepository.save(site);
Menu parentMenu = menuRepository.save(Menu.builder() Menu parentMenu = menuRepository.save(Menu.builder()
.menuKorName("parent") .menuKorName("parent")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .build());
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu = Menu.builder() Menu childMenu = Menu.builder()
.menuKorName("child_" + i) .menuKorName("child_" + i)
.site(site) .site(site)
.parent(parentMenu) .parent(parentMenu)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .build();
childMenu.setParentMenu(parentMenu); childMenu.setParentMenu(parentMenu);
menuRepository.save(childMenu); menuRepository.save(childMenu);
} }
@@ -87,7 +87,7 @@ class MenuRoleApiControllerTest {
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
//when //when
ResponseEntity<List<MenuRoleResponseDto>> responseEntity = ResponseEntity<List<MenuRoleResponseDto>> responseEntity =
restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuRoleResponseDto>>(){}); restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuRoleResponseDto>>(){});
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -108,22 +108,25 @@ class MenuRoleApiControllerTest {
Menu child1 = menus.stream().filter(menu -> menu.getMenuKorName().equals("child_1")).collect(Collectors.toList()).get(0); Menu child1 = menus.stream().filter(menu -> menu.getMenuKorName().equals("child_1")).collect(Collectors.toList()).get(0);
List<MenuRole> menuRoles = new ArrayList<>(); List<MenuRole> menuRoles = new ArrayList<>();
menuRoles.add(MenuRole.builder().roleId("role").menu(parent).build()); MenuRole menuRole1 = MenuRole.builder().roleId("ROLE").menu(parent).build();
menuRoles.add(MenuRole.builder().roleId("role").menu(child1).build()); menuRoles.add(menuRole1);
MenuRole menuRole2 = MenuRole.builder().roleId("ROLE").menu(child1).build();
menuRoles.add(menuRole2);
menuRoleRepository.saveAll(menuRoles); menuRoleRepository.saveAll(menuRoles);
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
//when //when
ResponseEntity<List<MenuRoleResponseDto>> responseEntity = ResponseEntity<List<MenuRoleResponseDto>> responseEntity =
restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuRoleResponseDto>>(){}); restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuRoleResponseDto>>(){});
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
List<MenuRoleResponseDto> body = responseEntity.getBody(); List<MenuRoleResponseDto> body = responseEntity.getBody();
assertThat(body.size()).isEqualTo(1); assertThat(body.size()).isEqualTo(1);
assertThat(body.get(0).getIsChecked()).isTrue();
body.stream().forEach(System.out::println); body.stream().forEach(System.out::println);
assertThat(body.get(0).getIsChecked()).isTrue();
assertThat(body.get(0).getChildren().size()).isEqualTo(3); assertThat(body.get(0).getChildren().size()).isEqualTo(3);
body.stream().forEach(menuTreeResponseDto -> { body.stream().forEach(menuTreeResponseDto -> {
menuTreeResponseDto.getChildren().stream().forEach(child -> { menuTreeResponseDto.getChildren().stream().forEach(child -> {
@@ -149,38 +152,39 @@ class MenuRoleApiControllerTest {
list.get(0).getChildren().stream().forEach(menuRoleResponseDto -> { list.get(0).getChildren().stream().forEach(menuRoleResponseDto -> {
if (menuRoleResponseDto.getKorName().equals("child_1")) { if (menuRoleResponseDto.getKorName().equals("child_1")) {
children.add(MenuRoleRequestDto.builder() children.add(MenuRoleRequestDto.builder()
.menuRoleId(menuRoleResponseDto.getMenuRoleId()) .menuRoleId(menuRoleResponseDto.getMenuRoleId())
.isChecked(true) .isChecked(true)
.roleId("role") .roleId("ROLE")
.id(menuRoleResponseDto.getId()) .id(menuRoleResponseDto.getId())
.build()); .build());
}else { }else {
children.add(MenuRoleRequestDto.builder() children.add(MenuRoleRequestDto.builder()
.menuRoleId(menuRoleResponseDto.getMenuRoleId()) .menuRoleId(menuRoleResponseDto.getMenuRoleId())
.isChecked(false) .isChecked(false)
.roleId("role") .roleId("ROLE")
.id(menuRoleResponseDto.getId()) .id(menuRoleResponseDto.getId())
.build()); .build());
} }
}); });
requestDtoList.add(MenuRoleRequestDto.builder() requestDtoList.add(MenuRoleRequestDto.builder()
.menuRoleId(list.get(0).getMenuRoleId()) .menuRoleId(list.get(0).getMenuRoleId())
.isChecked(true) .isChecked(true)
.id(list.get(0).getId()) .roleId("ROLE")
.children(children) .id(list.get(0).getId())
.build()); .children(children)
.build());
HttpEntity<List<MenuRoleRequestDto>> httpEntity = new HttpEntity<>( HttpEntity<List<MenuRoleRequestDto>> httpEntity = new HttpEntity<>(
requestDtoList requestDtoList
); );
//when //when
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.exchange("/api/v1/menu-roles", HttpMethod.POST, httpEntity, String.class); restTemplate.exchange("/api/v1/menu-roles", HttpMethod.POST, httpEntity, String.class);
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -197,36 +201,38 @@ class MenuRoleApiControllerTest {
//given //given
Site site = siteRepository.findAll().get(0); Site site = siteRepository.findAll().get(0);
Menu parentMenu = menuRepository.save(Menu.builder() Menu parentMenu = menuRepository.save(Menu.builder()
.menuKorName("parent-any") .menuKorName("parent-any")
.sortSeq(1) .sortSeq(1)
.site(site) .site(site)
.build()); .isUse(true)
.build());
MenuRole parentMenuRole = MenuRole.builder() MenuRole parentMenuRole = MenuRole.builder()
.roleId("ROLE_ANONYMOUS") .roleId(Role.ANONYMOUS.getKey())
.menu(parentMenu) .menu(parentMenu)
.build(); .build();
parentMenuRole.setMenu(parentMenu); parentMenuRole.setMenu(parentMenu);
menuRoleRepository.save(parentMenuRole); menuRoleRepository.save(parentMenuRole);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
Menu childMenu = Menu.builder() Menu childMenu = Menu.builder()
.menuKorName("child-any_" + i) .menuKorName("child-any_" + i)
.site(site) .site(site)
.parent(parentMenu) .parent(parentMenu)
.sortSeq(i + 1) .sortSeq(i + 1)
.build(); .isUse(true)
.build();
childMenu.setParentMenu(parentMenu); childMenu.setParentMenu(parentMenu);
menuRepository.save(childMenu); menuRepository.save(childMenu);
MenuRole role_any = MenuRole.builder() MenuRole role_any = MenuRole.builder()
.roleId("ROLE_ANONYMOUS") .roleId(Role.ANONYMOUS.getKey())
.menu(childMenu) .menu(childMenu)
.build(); .build();
role_any.setMenu(childMenu); role_any.setMenu(childMenu);
menuRoleRepository.save(role_any); menuRoleRepository.save(role_any);
} }
//when //when
ResponseEntity<List<MenuSideResponseDto>> responseEntity = ResponseEntity<List<MenuSideResponseDto>> responseEntity =
restTemplate.exchange("/api/v1/menu-roles/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuSideResponseDto>>(){}); restTemplate.exchange("/api/v1/menu-roles/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference<List<MenuSideResponseDto>>(){});
//then //then

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

@@ -59,12 +59,12 @@ class PolicyApiControllerTest {
} }
policyRepository.save(Policy.builder() policyRepository.save(Policy.builder()
.type(type) .type(type)
.title(title) .title(title)
.isUse(true) .isUse(true)
.regDate(ZonedDateTime.now()) .regDate(ZonedDateTime.now())
.contents(contents) .contents(contents)
.build()); .build());
} }
} }
@@ -81,17 +81,16 @@ class PolicyApiControllerTest {
String contents = "test contents"; String contents = "test contents";
PolicySaveRequestDto requestDto = PolicySaveRequestDto.builder() PolicySaveRequestDto requestDto = PolicySaveRequestDto.builder()
.type(type) .type(type)
.title(title) .title(title)
.isUse(true) .isUse(true)
.regDate(ZonedDateTime.now()) .regDate(ZonedDateTime.now())
.contents(contents) .contents(contents)
.build(); .build();
String url = "http://localhost:"+port+API_URL;
//when //when
ResponseEntity<Long> responseEntity = restTemplate.postForEntity(url, requestDto, Long.class); ResponseEntity<Long> responseEntity = restTemplate.postForEntity(API_URL, requestDto, Long.class);
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -104,10 +103,10 @@ class PolicyApiControllerTest {
@Test @Test
public void 목록조회한다() throws Exception { public void 목록조회한다() throws Exception {
String url = "http://localhost:"+port+API_URL+"?size=3%page=0"; String url = API_URL+"?size=3%page=0";
//when //when
ResponseEntity<RestResponsePage<PolicyResponseDto>> responseEntity = ResponseEntity<RestResponsePage<PolicyResponseDto>> responseEntity =
restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<PolicyResponseDto>>() {}); restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<PolicyResponseDto>>() {});
//then //then
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -134,7 +133,7 @@ class PolicyApiControllerTest {
@Test @Test
public void ID로_한건조회_정상() throws Exception { public void ID로_한건조회_정상() throws Exception {
String url = "http://localhost:"+port+API_URL +"/9"; String url = API_URL +"/9";
//when //when
ResponseEntity<PolicyResponseDto> responseEntity = restTemplate.getForEntity(url, PolicyResponseDto.class); ResponseEntity<PolicyResponseDto> responseEntity = restTemplate.getForEntity(url, PolicyResponseDto.class);
@@ -148,17 +147,17 @@ class PolicyApiControllerTest {
public void 이용약관_수정_된다() throws Exception { public void 이용약관_수정_된다() throws Exception {
//given //given
Long id = policyRepository.save(Policy.builder() Long id = policyRepository.save(Policy.builder()
.type("TOS") .type("TOS")
.title("title") .title("title")
.contents("contents!!!!") .contents("contents!!!!")
.build() .build()
).getId(); ).getId();
String url = "http://localhost:"+port+API_URL +"/"+id; String url = API_URL +"/"+id;
PolicyUpdateRequestDto requestDto = PolicyUpdateRequestDto.builder() PolicyUpdateRequestDto requestDto = PolicyUpdateRequestDto.builder()
.title("update title") .title("update title")
.contents("update Details") .contents("update Details")
.build(); .build();
//when //when
HttpEntity<PolicyUpdateRequestDto> requestEntity = new HttpEntity<>(requestDto); HttpEntity<PolicyUpdateRequestDto> requestEntity = new HttpEntity<>(requestDto);
@@ -178,12 +177,12 @@ class PolicyApiControllerTest {
public void 이용약관_삭제_한다() { public void 이용약관_삭제_한다() {
//given //given
Long id = policyRepository.save(Policy.builder() Long id = policyRepository.save(Policy.builder()
.type("TOS") .type("TOS")
.title("title") .title("title")
.contents("contents!!!!") .contents("contents!!!!")
.build() .build()
).getId(); ).getId();
String url = "http://localhost:"+port+API_URL +"/"+id; String url = API_URL +"/"+id;
//when //when
restTemplate.delete(url); restTemplate.delete(url);
@@ -197,13 +196,13 @@ class PolicyApiControllerTest {
public void 사용여부_수정_한다() throws Exception { public void 사용여부_수정_한다() throws Exception {
//given //given
Long id = policyRepository.save(Policy.builder() Long id = policyRepository.save(Policy.builder()
.type("TOS") .type("TOS")
.title("title") .title("title")
.isUse(true) .isUse(true)
.contents("contents!!!") .contents("contents!!!")
.build() .build()
).getId(); ).getId();
String url = "http://localhost:"+port+API_URL +"/"+id+"/"+false; String url = API_URL +"/"+id+"/"+false;
//when //when
ResponseEntity<Long> responseEntity = restTemplate.exchange(url, HttpMethod.PUT, null, Long.class); ResponseEntity<Long> responseEntity = restTemplate.exchange(url, HttpMethod.PUT, null, Long.class);

26
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 static org.assertj.core.api.Assertions.assertThat;
import java.time.LocalDate;
import java.util.List; import java.util.List;
import org.egovframe.cloud.portalservice.api.statistics.dto.StatisticsResponseDto; import org.egovframe.cloud.portalservice.api.statistics.dto.StatisticsResponseDto;
@@ -33,14 +34,13 @@ class StatisticsApiControllerTest {
@Autowired @Autowired
private StatisticsRepository statisticsRepository; private StatisticsRepository statisticsRepository;
@BeforeEach @BeforeEach
public void setup() { public void setup() {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
statisticsRepository.save(Statistics.builder() statisticsRepository.save(Statistics.builder()
.siteId(1L) .siteId(1L)
.remoteIp("testip") .remoteIp("testip")
.build()); .build());
} }
} }
@@ -55,10 +55,10 @@ class StatisticsApiControllerTest {
Long siteId = 1L; Long siteId = 1L;
// when // when
ResponseEntity< List<StatisticsResponseDto>> responseEntity = ResponseEntity< List<StatisticsResponseDto>> responseEntity =
restTemplate.exchange("/api/v1/statistics/monthly/"+siteId, restTemplate.exchange("/api/v1/statistics/monthly/"+siteId,
HttpMethod.GET, HttpMethod.GET,
null, null,
new ParameterizedTypeReference<List<StatisticsResponseDto>>(){}); new ParameterizedTypeReference<List<StatisticsResponseDto>>(){});
responseEntity.getBody().forEach(System.out::println); responseEntity.getBody().forEach(System.out::println);
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -70,12 +70,14 @@ class StatisticsApiControllerTest {
public void 일별접속통계_조회_성공() throws Exception { public void 일별접속통계_조회_성공() throws Exception {
Long siteId = 1L; Long siteId = 1L;
LocalDate now = LocalDate.now();
// when // when
ResponseEntity< List<StatisticsResponseDto>> responseEntity = 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, HttpMethod.GET,
null, null,
new ParameterizedTypeReference<List<StatisticsResponseDto>>(){}); new ParameterizedTypeReference<List<StatisticsResponseDto>>(){});
responseEntity.getBody().forEach(System.out::println); responseEntity.getBody().forEach(System.out::println);
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);