Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/com/going/server/domain/graph/dto/NodeDto.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.going.server.domain.graph.dto;

import com.going.server.domain.graph.entity.GraphNode;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
Expand All @@ -14,7 +15,7 @@ public class NodeDto {
private String image; //노드 이미지 주소
private String description; //노드 확대 시 나올 설명

public static NodeDto from(String id, String label, Long level, String image, String description) {
return NodeDto.builder().id(id).label(label).level(level).image(image).description(description).build();
public static NodeDto from(GraphNode node, String image) {
return NodeDto.builder().id(node.getIdAsString()).label(node.getLabel()).level(node.getLevel()).image(image).description(node.getIncludeSentence()).build();
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.going.server.domain.graph.repository;

import com.going.server.domain.graph.entity.Graph;
import com.going.server.domain.graph.exception.GraphNotFoundException;
import jdk.jfr.Registered;
import org.springframework.data.neo4j.repository.Neo4jRepository;

@Registered
public interface GraphRepository extends Neo4jRepository<Graph, Long> {
default Graph getByGraph(Long graphId) {
return findById(graphId).orElseThrow(GraphNotFoundException::new);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.going.server.domain.graph.dto.*;
import com.going.server.domain.graph.entity.Graph;
import com.going.server.domain.graph.entity.GraphEdge;
import com.going.server.domain.graph.entity.GraphNode;
import com.going.server.domain.graph.repository.GraphRepository;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -32,21 +34,30 @@ public GraphListDto getGraphList() {

@Override
public void deleteGraph(Long graphId) {
//TODO : graphId로 그래프 찾기
//TODO : 그래프 삭제하는 코드 작성
Graph graph = graphRepository.getByGraph(graphId);
graphRepository.deleteById(graph.getId());
}

@Override
public KnowledgeGraphDto getGraph(Long graphId) {
//TODO : graphId로 그래프 찾기
Graph graph = graphRepository.getByGraph(graphId);

//TODO : nodeDto에 값 매핑하는 코드 작성
List<NodeDto> nodeDto = new ArrayList<>();
List<NodeDto> nodeDtoList = new ArrayList<>();
List<EdgeDto> edgeDtoList = new ArrayList<>();

//TODO : edgeDto에 값 매핑하는 코드 작성
List<EdgeDto> edgeDto = new ArrayList<>();
for (GraphNode node : graph.getNodes()) {
NodeDto nodeDto = NodeDto.from(node, null);
nodeDtoList.add(nodeDto);

return KnowledgeGraphDto.of(nodeDto,edgeDto);
if (node.getEdges() != null) {
for (GraphEdge edge : node.getEdges()) {
EdgeDto edgeDto = EdgeDto.from(edge.getSource(),edge.getTarget().getNodeId().toString(),edge.getLabel());
edgeDtoList.add(edgeDto);
}
}
}

return KnowledgeGraphDto.of(nodeDtoList, edgeDtoList);
}

@Override
Expand Down