BP
/
poc
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin: entity 리팩토링

This commit is contained in:
geonhos 2024-05-23 12:12:37 +09:00
parent 1f901df3c5
commit 6cbe25b6b9
3 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java
View File

@ -6,8 +6,8 @@ import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.ArrayList; import java.util.HashSet;
import java.util.List; import java.util.Set;
@Getter @Getter
@Entity @Entity
@ -29,21 +29,20 @@ public class MenuGroup extends BaseEntity {
private Integer sortOrder; private Integer sortOrder;
@OneToMany(mappedBy = "menuGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true) @OneToMany(mappedBy = "menuGroup", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
private List<Menu> menus = new ArrayList<>(); private Set<Menu> menus = new HashSet<>();
private MenuGroup(String uri, String name, Integer sortOrder, List<Menu> menus) { private MenuGroup(String uri, String name, Integer sortOrder) {
this.uri = uri; this.uri = uri;
this.name = name; this.name = name;
this.sortOrder = sortOrder; this.sortOrder = sortOrder;
this.menus = menus;
} }
public static MenuGroup createOf(String uri, String name, Integer sortOrder) { public static MenuGroup createOf(String uri, String name, Integer sortOrder) {
return new MenuGroup(uri, name, sortOrder, new ArrayList<>()); return new MenuGroup(uri, name, sortOrder);
} }
public static MenuGroup updateOf(String uri, String name, Integer sortOrder) { public static MenuGroup updateOf(String uri, String name, Integer sortOrder) {
return new MenuGroup(uri, name, sortOrder, new ArrayList<>()); return new MenuGroup(uri, name, sortOrder);
} }
public void update(MenuGroup entity) { public void update(MenuGroup entity) {

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java
View File

@ -5,7 +5,6 @@ import com.bpgroup.poc.admin.domain.menu.entity.Menu;
import com.bpgroup.poc.admin.domain.role.RoleMenuType; import com.bpgroup.poc.admin.domain.role.RoleMenuType;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -31,13 +30,12 @@ public class RoleMenu extends BaseEntity {
@Column(name = "role_menu_type", nullable = false) @Column(name = "role_menu_type", nullable = false)
private RoleMenuType roleMenuType; private RoleMenuType roleMenuType;
public RoleMenu(Role role, Menu menu, RoleMenuType roleMenuType) { private RoleMenu(Role role, Menu menu, RoleMenuType roleMenuType) {
this.role = role; this.role = role;
this.menu = menu; this.menu = menu;
this.roleMenuType = roleMenuType; this.roleMenuType = roleMenuType;
} }
@Builder
public static RoleMenu createOf(Role role, Menu menu, RoleMenuType roleMenuType) { public static RoleMenu createOf(Role role, Menu menu, RoleMenuType roleMenuType) {
return new RoleMenu(role, menu, roleMenuType); return new RoleMenu(role, menu, roleMenuType);
} }

40
poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java
View File

@ -152,19 +152,19 @@ class RoleServiceTest extends MariaDBTestEnv {
flushAndClear(); flushAndClear();
roleMenuRepository.save( roleMenuRepository.save(
RoleMenu.builder() RoleMenu.createOf(
.role(saveRole) saveRole,
.menu(saveMenu1) saveMenu1,
.roleMenuType(RoleMenuType.MANAGER) RoleMenuType.MANAGER
.build() )
); );
roleMenuRepository.save( roleMenuRepository.save(
RoleMenu.builder() RoleMenu.createOf(
.role(saveRole) saveRole,
.menu(saveMenu2) saveMenu2,
.roleMenuType(RoleMenuType.MANAGER) RoleMenuType.MANAGER
.build() )
); );
flushAndClear(); flushAndClear();
@ -191,19 +191,19 @@ class RoleServiceTest extends MariaDBTestEnv {
flushAndClear(); flushAndClear();
roleMenuRepository.save( roleMenuRepository.save(
RoleMenu.builder() RoleMenu.createOf(
.role(saveRole) saveRole,
.menu(saveMenu1) saveMenu1,
.roleMenuType(RoleMenuType.MANAGER) RoleMenuType.MANAGER
.build() )
); );
roleMenuRepository.save( roleMenuRepository.save(
RoleMenu.builder() RoleMenu.createOf(
.role(saveRole) saveRole,
.menu(saveMenu2) saveMenu2,
.roleMenuType(RoleMenuType.MANAGER) RoleMenuType.MANAGER
.build() )
); );
// when // when