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

bugfix menu tree dnd update

Browse Source
This commit is contained in:
shinmj
2021-11-19 17:09:08 +09:00
parent 5068dca753
commit d289bc883d
20 changed files with 726 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/api/board/dto/BoardListResponseDto.java
View File

@@ -58,6 +58,11 @@ public class BoardListResponseDto implements Serializable {
*/
private LocalDateTime createdDate;
/**
* 게시글이 있는지 여부
*/
private Boolean isPosts;
/**
* 게시판 목록 응답 DTO 생성자
*
@@ -66,10 +71,11 @@ public class BoardListResponseDto implements Serializable {
* @param skinTypeCode 스킨 유형 코드
*/
@QueryProjection
public BoardListResponseDto(Integer boardNo, String boardName, String skinTypeCode) {
public BoardListResponseDto(Integer boardNo, String boardName, String skinTypeCode, Boolean isPosts) {
this.boardNo = boardNo;
this.boardName = boardName;
this.skinTypeCode = skinTypeCode;
this.isPosts = isPosts;
}
/**
@@ -82,12 +88,13 @@ public class BoardListResponseDto implements Serializable {
* @param createdDate 생성 일시
*/
@QueryProjection
public BoardListResponseDto(Integer boardNo, String boardName, String skinTypeCode, String skinTypeCodeName, LocalDateTime createdDate) {
public BoardListResponseDto(Integer boardNo, String boardName, String skinTypeCode, String skinTypeCodeName, LocalDateTime createdDate, Boolean isPosts) {
this.boardNo = boardNo;
this.boardName = boardName;
this.skinTypeCode = skinTypeCode;
this.skinTypeCodeName = skinTypeCodeName;
this.createdDate = createdDate;
this.isPosts = isPosts;
}
}

4
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/api/posts/dto/PostsDeleteRequestDto.java
View File

@@ -1,6 +1,7 @@
package org.egovframe.cloud.boardservice.api.posts.dto;
import lombok.Getter;
import org.egovframe.cloud.boardservice.domain.board.Board;
import org.egovframe.cloud.boardservice.domain.posts.Posts;
import org.egovframe.cloud.boardservice.domain.posts.PostsId;
@@ -49,6 +50,9 @@ public class PostsDeleteRequestDto {
.boardNo(boardNo)
.postsNo(postsNo)
.build())
.board(Board.builder()
.boardNo(boardNo)
.build())
.build();
}

4
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/api/posts/dto/PostsSimpleResponseDto.java
View File

@@ -1,6 +1,7 @@
package org.egovframe.cloud.boardservice.api.posts.dto;
import com.querydsl.core.annotations.QueryProjection;
import java.time.LocalDate;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.egovframe.cloud.boardservice.api.board.dto.BoardResponseDto;
@@ -92,7 +93,8 @@ public class PostsSimpleResponseDto implements Serializable {
*/
public PostsSimpleResponseDto setIsNew(BoardResponseDto boardResponseDto) {
if (boardResponseDto.getNewDisplayDayCount() != null) {
this.isNew = createdDate.plusDays(boardResponseDto.getNewDisplayDayCount()).compareTo(LocalDateTime.now()) <= 0;
int compareTo = createdDate.toLocalDate().compareTo(LocalDate.now());
this.isNew = 0 <= compareTo && compareTo <= boardResponseDto.getNewDisplayDayCount();
} else {
this.isNew = false;
}

9
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/board/Board.java
View File

@@ -1,12 +1,17 @@
package org.egovframe.cloud.boardservice.domain.board;
import java.util.ArrayList;
import java.util.List;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.egovframe.cloud.boardservice.domain.posts.Posts;
import org.egovframe.cloud.servlet.domain.BaseEntity;
import javax.persistence.*;
import java.math.BigDecimal;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
/**
* org.egovframe.cloud.boardservice.domain.board.Board
@@ -113,9 +118,9 @@ public class Board extends BaseEntity {
/**
* 게시물 엔티티
*/
/*@OneToMany(mappedBy = "board", fetch = FetchType.LAZY)
@OneToMany(mappedBy = "board", fetch = FetchType.LAZY)
@OnDelete(action = OnDeleteAction.CASCADE)
private List<Posts> posts;*/
private List<Posts> posts = new ArrayList<>();
/**
* 빌더 패턴 클래스 생성자

11
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/board/BoardRepositoryImpl.java
View File

@@ -1,11 +1,14 @@
package org.egovframe.cloud.boardservice.domain.board;
import static com.querydsl.core.types.Projections.constructor;
import com.google.common.base.CaseFormat;
import com.querydsl.core.QueryResults;
import com.querydsl.core.types.Order;
import com.querydsl.core.types.OrderSpecifier;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.CaseBuilder;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.JPQLQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -58,12 +61,16 @@ public class BoardRepositoryImpl implements BoardRepositoryCustom {
@Override
public Page<BoardListResponseDto> findPage(RequestDto requestDto, Pageable pageable) {
JPQLQuery<BoardListResponseDto> query = jpaQueryFactory
.select(new QBoardListResponseDto(
.select(constructor(BoardListResponseDto.class,
QBoard.board.boardNo,
QBoard.board.boardName,
QBoard.board.skinTypeCode,
Expressions.as(QCode.code.codeName, "skinTypeCodeName"),
QBoard.board.createdDate
QBoard.board.createdDate,
new CaseBuilder()
.when(QBoard.board.posts.size().gt(0))
.then(Boolean.TRUE)
.otherwise(Boolean.FALSE).as("isPosts")
))
.from(QBoard.board)
.leftJoin(QCode.code).on(QBoard.board.skinTypeCode.eq(QCode.code.codeId).and(QCode.code.parentCodeId.eq("skin_type_code")))

12
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/posts/Posts.java
View File

@@ -128,7 +128,6 @@ public class Posts extends BaseEntity {
String postsContent, String postsAnswerContent, String attachmentCode,
Integer readCount, Boolean noticeAt, Integer deleteAt,
User creator, List<Comment> comments) {
this.board = board;
this.postsId = postsId;
this.postsTitle = postsTitle;
this.postsContent = postsContent;
@@ -139,6 +138,17 @@ public class Posts extends BaseEntity {
this.deleteAt = deleteAt;
this.creator = creator;
this.comments = comments == null ? null : new ArrayList<>(comments);
setBoard(board);
}
/**
* 연관관계 설정
*
* @param board
*/
public void setBoard(Board board) {
this.board = board;
board.getPosts().add(this);
}
/**

24
backend/board-service/src/main/java/org/egovframe/cloud/boardservice/service/posts/PostsService.java
View File

@@ -1,23 +1,9 @@
package org.egovframe.cloud.boardservice.service.posts;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.egovframe.cloud.boardservice.api.board.dto.BoardResponseDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsDeleteRequestDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsListResponseDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsResponseDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsSaveRequestDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsSimpleResponseDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsSimpleSaveRequestDto;
import org.egovframe.cloud.boardservice.api.posts.dto.PostsUpdateRequestDto;
import org.egovframe.cloud.boardservice.domain.posts.Posts;
import org.egovframe.cloud.boardservice.domain.posts.PostsId;
import org.egovframe.cloud.boardservice.domain.posts.PostsRead;
import org.egovframe.cloud.boardservice.domain.posts.PostsReadRepository;
import org.egovframe.cloud.boardservice.domain.posts.PostsRepository;
import org.egovframe.cloud.boardservice.api.posts.dto.*;
import org.egovframe.cloud.boardservice.domain.posts.*;
import org.egovframe.cloud.boardservice.service.board.BoardService;
import org.egovframe.cloud.common.dto.AttachmentEntityMessage;
import org.egovframe.cloud.common.dto.RequestDto;
@@ -32,6 +18,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* org.egovframe.cloud.postsservice.service.posts.PostsService
* <p>
@@ -111,7 +102,6 @@ public class PostsService extends AbstractService {
board.setNewestPosts(posts.stream().map(post -> post.setIsNew(board))
.collect(Collectors.toList()));
}
data.put(board.getBoardNo(), board);
}

2
backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/menu/MenuApiController.java
View File

@@ -66,7 +66,7 @@ public class MenuApiController {
*/
@GetMapping("/api/v1/menus/{menuId}")
public MenuResponseDto findById(@PathVariable Long menuId) {
return menuService.findById(menuId);
return menuService.findMenuResponseDtoById(menuId);
}
/**

4
backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/api/menu/dto/MenuTreeResponseDto.java
View File

@@ -1,5 +1,6 @@
package org.egovframe.cloud.portalservice.api.menu.dto;
import java.util.Comparator;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -52,6 +53,9 @@ public class MenuTreeResponseDto {
this.level = entity.getLevel();
this.children = entity.getChildren().stream()
.map(children -> new MenuTreeResponseDto(children))
.sorted(Comparator.comparing(MenuTreeResponseDto::getSortSeq))
.collect(Collectors.toList());
}
}

29
backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/domain/menu/Menu.java
View File

@@ -127,20 +127,9 @@ public class Menu extends BaseEntity {
public Menu updateDnD(Menu parent, Integer sortSeq, Integer level) {
this.sortSeq = sortSeq;
this.level = level;
if (parent == null) {
Menu oldParent = this.getParent();
if (oldParent == null) {
return this;
}
Menu old = oldParent.getChildren().stream().filter(item -> item.getId().equals(this.id)).findAny().orElse(null);
if (old != null) {
oldParent.getChildren().remove(old);
}
this.parent = null;
return this;
return updateOldParent();
}
if (parent.equals(this.parent)) {
@@ -149,7 +138,21 @@ public class Menu extends BaseEntity {
this.parent = parent;
parent.getChildren().add(this);
return this;
}
private Menu updateOldParent() {
Menu oldParent = this.getParent();
if (oldParent == null) {
return this;
}
Menu old = oldParent.getChildren().stream().filter(item -> item.getId().equals(this.id)).findAny().orElse(null);
if (old != null) {
oldParent.getChildren().remove(old);
}
this.parent = null;
return this;
}

46
backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/menu/MenuService.java
View File

@@ -35,7 +35,7 @@ import java.util.List;
*/
@Slf4j
@RequiredArgsConstructor
@Transactional(readOnly = true)
@Transactional
@Service
public class MenuService extends AbstractService {
@@ -48,6 +48,7 @@ public class MenuService extends AbstractService {
* @param siteId
* @return
*/
@Transactional(readOnly = true)
public List<MenuTreeResponseDto> findTreeBySiteId(Long siteId) {
return menuRepository.findTreeBySiteId(siteId);
}
@@ -58,7 +59,8 @@ public class MenuService extends AbstractService {
* @param menuId
* @return
*/
public MenuResponseDto findById(Long menuId) {
@Transactional(readOnly = true)
public MenuResponseDto findMenuResponseDtoById(Long menuId) {
return menuRepository.findByIdWithConnectName(menuId);
}
@@ -68,7 +70,6 @@ public class MenuService extends AbstractService {
* @param menuTreeRequestDto
* @return
*/
@Transactional
public MenuTreeResponseDto save(MenuTreeRequestDto menuTreeRequestDto) {
Site site = siteRepository.findById(menuTreeRequestDto.getSiteId())
.orElseThrow(() ->
@@ -77,9 +78,7 @@ public class MenuService extends AbstractService {
Menu parent = null;
if (menuTreeRequestDto.getParentId() != null) {
parent = menuRepository.findById(menuTreeRequestDto.getParentId())
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + menuTreeRequestDto.getParentId()));
parent = findById(menuTreeRequestDto.getParentId());
}
Menu menu = menuRepository.save(Menu.builder()
@@ -102,11 +101,8 @@ public class MenuService extends AbstractService {
* @param name
* @return
*/
@Transactional
public MenuTreeResponseDto updateName(Long menuId, String name) throws EntityNotFoundException {
Menu menu = menuRepository.findById(menuId)
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + menuId));
Menu menu = findById(menuId);
menu.updateName(name);
@@ -121,11 +117,8 @@ public class MenuService extends AbstractService {
* @param updateRequestDto
* @return
*/
@Transactional
public MenuResponseDto update(Long menuId, MenuUpdateRequestDto updateRequestDto) throws EntityNotFoundException, BusinessMessageException {
Menu menu = menuRepository.findById(menuId)
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + menuId));
Menu menu = findById(menuId);
//컨텐츠 or 게시판인 경우 connectId 필수
if ("contents".equals(updateRequestDto.getMenuType()) || "board".equals(updateRequestDto.getMenuType())) {
@@ -153,11 +146,8 @@ public class MenuService extends AbstractService {
*
* @param menuId
*/
@Transactional
public void delete(Long menuId) {
Menu menu = menuRepository.findById(menuId)
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + menuId));
Menu menu = findById(menuId);
menuRepository.delete(menu);
}
@@ -170,10 +160,10 @@ public class MenuService extends AbstractService {
* @param level
*/
private void recursive(MenuDnDRequestDto dto, Menu parent, Integer sortSeq, Integer level) {
Menu menu = menuRepository.findById(dto.getMenuId())
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + dto.getMenuId()));
Menu menu = findById(dto.getMenuId());
menu.updateDnD(parent, sortSeq, level);
if (dto.getChildren() == null || dto.getChildren().size() <= 0) {
return;
}
@@ -191,11 +181,21 @@ public class MenuService extends AbstractService {
* @param menuDnDRequestDtoList
* @return
*/
@Transactional
public Long updateDnD(Long siteId, List<MenuDnDRequestDto> menuDnDRequestDtoList) {
for (int i = 0; i < menuDnDRequestDtoList.size(); i++) {
recursive(menuDnDRequestDtoList.get(i), null, i+1, 1);
MenuDnDRequestDto requestDto = menuDnDRequestDtoList.get(i);
Menu parent = null;
if (requestDto.getParentId() != null) {
parent = findById(requestDto.getParentId());
}
recursive(requestDto, parent, requestDto.getSortSeq(), requestDto.getLevel());
}
return siteId;
}
private Menu findById(Long id) {
return menuRepository.findById(id)
.orElseThrow(() ->
new EntityNotFoundException(getMessage("valid.notexists.format", new Object[]{getMessage("menu")}) + " ID= " + id));
}
}