Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0db2e33
refactor: ์ดˆ๋Œ€ ์ˆ˜๋ฝ ์‹œ mapId ๋ฐ˜ํ™˜
bumstone Sep 21, 2025
72ce986
refactor: ์ดˆ๋Œ€ ์ด๋ฉ”์ผ HTML ๋ฉ”์„ธ์ง€ ํ˜•์‹์˜ ์ดˆ๋Œ€ ๋งํฌ ์ „์†ก, ์ดˆ๋Œ€ ๋งํฌ ์ ‘๊ทผ์˜ ์š”์ฒญ ์ˆ˜๋ฝ/๊ฑฐ์ ˆ์— ๋Œ€ํ•œ ์•Œ๋ฆผ ์ „์†ก
bumstone Sep 21, 2025
55d1d54
refactor: ์ดˆ๋Œ€ ์ˆ˜๋ฝ/๊ฑฐ์ ˆ, ์ดˆ๋Œ€ ์š”์ฒญ ์ˆ˜๋ฝ/๊ฑฐ์ ˆ ์ด๋ฏธ ์ฒ˜๋ฆฌ๋œ ์ดˆ๋Œ€๋œ ์ฒ˜๋ฆฌ ์—ฌ๋ถ€ ๊ฒ€์‚ฌ
bumstone Sep 21, 2025
167de22
refactor: ์ดˆ๋Œ€ ๋งํฌ ์š”์ฒญ ์ ‘๊ทผ ๊ธฐ์กด ๋ฉค๋ฒ„ ์—ฌ๋ถ€ ๊ฒ€์‚ฌ
bumstone Sep 21, 2025
ac6a8d3
refactor: ์ดˆ๋Œ€ ๋งํฌ ์ƒ์„ฑ - ํ”„๋ก ํŠธ ๊ธฐ์ค€ ๋ณ€๊ฒฝ
bumstone Sep 21, 2025
97aeab7
refactor: ์ดˆ๋Œ€ ๋งํฌ ์š”์ฒญ ์Šน์ธ ์•Œ๋ฆผ์˜ mapId ์ „์†ก
bumstone Sep 21, 2025
9147c20
feat: ๋งˆ์ธ๋“œ๋งต ์ƒ์„ธ ์กฐํšŒ ์‹œ ๋ฐฉ๋ฌธ๊ธฐ๋ก ์ƒ์„ฑ ๋˜๋Š” ๊ฐฑ์‹ 
bumstone Sep 21, 2025
b6ebaa2
style: ์ฃผ์„ - ์ด๋ชจ์ง€ ์Šคํƒ€์ผ ํ™•์ธ
bumstone Sep 22, 2025
518d213
feat: ํ”„๋กฌํ”„ํŠธ ํ™•์žฅ ๋ฉ”์„œ๋“œ ์ถ”๊ฐ€
bumstone Sep 22, 2025
856d40b
fix: ๋งˆ์ธ๋“œ๋งต ์ƒ์„ธ ์กฐํšŒ ํŠธ๋žœ์žญ์…˜ ์ฝ๊ธฐ ๊ถŒํ•œ ์˜ค๋ฅ˜
bumstone Sep 22, 2025
6609170
feat: ํ”„๋กฌํ”„ํŠธ ๋ถ„์„ ์š”์ฒญ ํ›„ ์•Œ๋ฆผ ํ™•์ธ
bumstone Sep 22, 2025
2387d7c
feat: ํ”„๋กฌํ”„ํŠธ ๋ถ„์„ ์š”์ฒญ ํ›„ ์ ์šฉ ์—ฌ๋ถ€ ํ™•์ธ ํ›„ ์•Œ๋ฆผ
bumstone Sep 22, 2025
028766e
feat: ํ”„๋กฌํ”„ํŠธ ๋ถ„์„ ์š”์ฒญ ํ›„ ์ ์šฉ ์—ฌ๋ถ€ ํ™•์ธ ํ›„ ์•Œ๋ฆผ์œ ํ˜• ๋ณ€๊ฒฝ ์ ์šฉ
bumstone Sep 22, 2025
a699d59
feat: CodeReference, CodeReviw, Comment ์—”ํ‹ฐํ‹ฐ
bumstone Sep 22, 2025
ff208b1
feat: Comment ๋„๋ฉ”์ธ ๊ตฌํ˜„
bumstone Sep 22, 2025
87c59b8
feat: CodeReview ๋„๋ฉ”์ธ ๊ตฌํ˜„
bumstone Sep 22, 2025
2edcc8c
feat: CommentAttachment ์‚ญ์ œ ๊ด€๋ จ
bumstone Sep 22, 2025
3dae7e2
feat: CodeReference ๋„๋ฉ”์ธ ๊ตฌํ˜„
bumstone Sep 22, 2025
8ec79bc
feat: CodeReference ๋„๋ฉ”์ธ ๊ตฌํ˜„
bumstone Sep 22, 2025
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,70 @@
package com.teamEWSN.gitdeun.codereference.controller;

import com.teamEWSN.gitdeun.codereference.dto.CodeReferenceResponseDtos.*;
import com.teamEWSN.gitdeun.codereference.dto.*;
import com.teamEWSN.gitdeun.codereference.service.CodeReferenceService;
import com.teamEWSN.gitdeun.common.jwt.CustomUserDetails;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/api/mindmaps/{mapId}")
@RequiredArgsConstructor
public class CodeReferenceController {

private final CodeReferenceService codeReferenceService;

// ํŠน์ • ๋…ธ๋“œ์— ์ฝ”๋“œ ์ฐธ์กฐ ์ƒ์„ฑ
@PostMapping("/nodes/{nodeId}/code-references")
public ResponseEntity<ReferenceResponse> createCodeReference(
@PathVariable Long mapId,
@PathVariable String nodeId,
@Valid @RequestBody CodeReferenceRequestDtos.CreateRequest request,
@AuthenticationPrincipal CustomUserDetails userDetails) {
return ResponseEntity.status(HttpStatus.CREATED).body(codeReferenceService.createReference(mapId, nodeId, userDetails.getId(), request));
}

// ํŠน์ • ์ฝ”๋“œ ์ฐธ์กฐ ์ƒ์„ธ ์กฐํšŒ
@GetMapping("/code-references/{refId}")
public ResponseEntity<ReferenceResponse> getCodeReference(
@PathVariable Long mapId,
@PathVariable Long refId,
@AuthenticationPrincipal CustomUserDetails userDetails) {
return ResponseEntity.ok(codeReferenceService.getReference(mapId, refId, userDetails.getId()));
}

// ํŠน์ • ๋…ธ๋“œ์— ์—ฐ๊ฒฐ๋œ ๋ชจ๋“  ์ฝ”๋“œ ์ฐธ์กฐ ๋ชฉ๋ก ์กฐํšŒ
@GetMapping("/nodes/{nodeId}/code-references")
public ResponseEntity<List<ReferenceResponse>> getNodeCodeReferences(
@PathVariable Long mapId,
@PathVariable String nodeId,
@AuthenticationPrincipal CustomUserDetails userDetails) {
return ResponseEntity.ok(codeReferenceService.getReferencesForNode(mapId, nodeId, userDetails.getId()));
}

// ์ฝ”๋“œ ์ฐธ์กฐ ์ •๋ณด ์ˆ˜์ •
@PatchMapping("/code-references/{refId}")
public ResponseEntity<ReferenceResponse> updateCodeReference(
@PathVariable Long mapId,
@PathVariable Long refId,
@Valid @RequestBody CodeReferenceRequestDtos.CreateRequest request,
@AuthenticationPrincipal CustomUserDetails userDetails) {
return ResponseEntity.ok(codeReferenceService.updateReference(mapId, refId, userDetails.getId(), request));
}

// ์ฝ”๋“œ ์ฐธ์กฐ ์‚ญ์ œ
@DeleteMapping("/code-references/{refId}")
public ResponseEntity<Void> deleteCodeReference(
@PathVariable Long mapId,
@PathVariable Long refId,
@AuthenticationPrincipal CustomUserDetails userDetails) {
codeReferenceService.deleteReference(mapId, refId, userDetails.getId());
return ResponseEntity.noContent().build();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.teamEWSN.gitdeun.codereference.dto;


import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
import lombok.NoArgsConstructor;

public class CodeReferenceRequestDtos {

@Getter
@NoArgsConstructor
public static class CreateRequest {
@NotEmpty(message = "ํŒŒ์ผ ๊ฒฝ๋กœ๋Š” ๋น„์›Œ๋‘˜ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.")
private String filePath;
private Integer startLine;
private Integer endLine;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.teamEWSN.gitdeun.codereference.dto;

import lombok.*;

public class CodeReferenceResponseDtos {

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor(access = AccessLevel.PROTECTED)
public static class ReferenceResponse {
private Long referenceId;
private String nodeId;
private String filePath;
private Integer startLine;
private Integer endLine;
}

}
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
package com.teamEWSN.gitdeun.codereference.entity;

import com.teamEWSN.gitdeun.codereview.entity.CodeReview;
import com.teamEWSN.gitdeun.common.util.AuditedEntity;
import com.teamEWSN.gitdeun.mindmap.entity.Mindmap;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.*;

import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "code_reference")
public class CodeReference {
public class CodeReference extends AuditedEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -20,12 +25,26 @@ public class CodeReference {
@JoinColumn(name = "mindmap_id", nullable = false)
private Mindmap mindmap;

@Column(name = "node_id", nullable = false)
private String nodeId;

@Column(name = "file_path", columnDefinition = "TEXT", nullable = false)
private String filePath;

@Column(name = "start_line", length = 255)
private String startLine;
@Column(name = "start_line")
private Integer startLine;

@Column(name = "end_line")
private Integer endLine;

@Builder.Default
@OneToMany(mappedBy = "codeReference", cascade = CascadeType.ALL, orphanRemoval = true)
private List<CodeReview> codeReviews = new ArrayList<>();


@Column(name = "end_line", length = 255)
private String endLine;
public void update(String filePath, Integer startLine, Integer endLine) {
this.filePath = filePath;
this.startLine = startLine;
this.endLine = endLine;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.teamEWSN.gitdeun.codereference.mapper;

import com.teamEWSN.gitdeun.codereference.dto.CodeReferenceResponseDtos.*;
import com.teamEWSN.gitdeun.codereference.entity.CodeReference;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;

@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface CodeReferenceMapper {

@Mapping(target = "referenceId", source = "id")
ReferenceResponse toReferenceResponse(CodeReference codeReference);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
package com.teamEWSN.gitdeun.codereference.repository;

public class CodeReferenceRepository {

import com.teamEWSN.gitdeun.codereference.entity.CodeReference;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Optional;

@Repository
public interface CodeReferenceRepository extends JpaRepository<CodeReference, Long> {

List<CodeReference> findByMindmapIdAndNodeId(Long mindmapId, String nodeId);

Optional<CodeReference> findByMindmapIdAndId(Long mindmapId, Long id);

boolean existsByMindmapIdAndId(Long mindmapId, Long id);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,120 @@
package com.teamEWSN.gitdeun.codereference.service;


import com.teamEWSN.gitdeun.codereference.dto.CodeReferenceRequestDtos.*;
import com.teamEWSN.gitdeun.codereference.dto.CodeReferenceResponseDtos.*;
import com.teamEWSN.gitdeun.codereference.entity.CodeReference;
import com.teamEWSN.gitdeun.codereference.mapper.CodeReferenceMapper;
import com.teamEWSN.gitdeun.codereference.repository.CodeReferenceRepository;
import com.teamEWSN.gitdeun.common.exception.ErrorCode;
import com.teamEWSN.gitdeun.common.exception.GlobalException;
import com.teamEWSN.gitdeun.mindmap.entity.Mindmap;
import com.teamEWSN.gitdeun.mindmap.repository.MindmapRepository;
import com.teamEWSN.gitdeun.mindmapmember.service.MindmapAuthService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
public class CodeReferenceService {

}

private final CodeReferenceRepository codeReferenceRepository;
private final MindmapRepository mindmapRepository;
private final MindmapAuthService mindmapAuthService;
private final CodeReferenceMapper codeReferenceMapper;

@Transactional
public ReferenceResponse createReference(Long mapId, String nodeId, Long userId, CreateRequest request) {
// 1. ๊ถŒํ•œ ํ™•์ธ
if (!mindmapAuthService.hasEdit(mapId, userId)) {
throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
}

// 2. ๋งˆ์ธ๋“œ๋งต ์กด์žฌ ์—ฌ๋ถ€ ํ™•์ธ
Mindmap mindmap = mindmapRepository.findById(mapId)
.orElseThrow(() -> new GlobalException(ErrorCode.MINDMAP_NOT_FOUND));

// 3. CodeReference ์—”ํ‹ฐํ‹ฐ ์ƒ์„ฑ ๋ฐ ์ €์žฅ
CodeReference codeReference = CodeReference.builder()
.mindmap(mindmap)
.nodeId(nodeId)
.filePath(request.getFilePath())
.startLine(request.getStartLine())
.endLine(request.getEndLine())
.build();

CodeReference savedReference = codeReferenceRepository.save(codeReference);

// 4. DTO๋กœ ๋ณ€ํ™˜ํ•˜์—ฌ ๋ฐ˜ํ™˜
return codeReferenceMapper.toReferenceResponse(savedReference);
}

@Transactional(readOnly = true)
public ReferenceResponse getReference(Long mapId, Long refId, Long userId) {
// 1. ๊ถŒํ•œ ํ™•์ธ
if (!mindmapAuthService.hasView(mapId, userId)) {
throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
}

// 2. ํ•ด๋‹น ๋งˆ์ธ๋“œ๋งต์— ์†ํ•œ ์ฝ”๋“œ ์ฐธ์กฐ์ธ์ง€ ํ™•์ธ
CodeReference codeReference = codeReferenceRepository.findByMindmapIdAndId(mapId, refId)
.orElseThrow(() -> new GlobalException(ErrorCode.CODE_REFERENCE_NOT_FOUND));

// 3. DTO๋กœ ๋ณ€ํ™˜ํ•˜์—ฌ ๋ฐ˜ํ™˜
return codeReferenceMapper.toReferenceResponse(codeReference);
}

@Transactional(readOnly = true)
public List<ReferenceResponse> getReferencesForNode(Long mapId, String nodeId, Long userId) {
// 1. ๊ถŒํ•œ ํ™•์ธ (์ฝ๊ธฐ)
if (!mindmapAuthService.hasView(mapId, userId)) {
throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
}

// 2. ํŠน์ • ๋…ธ๋“œ์— ์†ํ•œ ๋ชจ๋“  ์ฝ”๋“œ ์ฐธ์กฐ ์กฐํšŒ
List<CodeReference> references = codeReferenceRepository.findByMindmapIdAndNodeId(mapId, nodeId);

// 3. DTO ๋ฆฌ์ŠคํŠธ๋กœ ๋ณ€ํ™˜ํ•˜์—ฌ ๋ฐ˜ํ™˜
return references.stream()
.map(codeReferenceMapper::toReferenceResponse)
.collect(Collectors.toList());
}

@Transactional
public ReferenceResponse updateReference(Long mapId, Long refId, Long userId, CreateRequest request) {
// 1. ๊ถŒํ•œ ํ™•์ธ (์“ฐ๊ธฐ)
if (!mindmapAuthService.hasEdit(mapId, userId)) {
throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
}

// 2. ํ•ด๋‹น ๋งˆ์ธ๋“œ๋งต์— ์†ํ•œ ์ฝ”๋“œ ์ฐธ์กฐ์ธ์ง€ ํ™•์ธ ํ›„ ์กฐํšŒ
CodeReference codeReference = codeReferenceRepository.findByMindmapIdAndId(mapId, refId)
.orElseThrow(() -> new GlobalException(ErrorCode.CODE_REFERENCE_NOT_FOUND));

// 3. ์—”ํ‹ฐํ‹ฐ ์ •๋ณด ์—…๋ฐ์ดํŠธ
codeReference.update(request.getFilePath(), request.getStartLine(), request.getEndLine());

// 4. DTO๋กœ ๋ณ€ํ™˜ํ•˜์—ฌ ๋ฐ˜ํ™˜ (JPA์˜ Dirty Checking์— ์˜ํ•ด ์ž๋™ ์ €์žฅ๋จ)
return codeReferenceMapper.toReferenceResponse(codeReference);
}

@Transactional
public void deleteReference(Long mapId, Long refId, Long userId) {
// 1. ๊ถŒํ•œ ํ™•์ธ
if (!mindmapAuthService.hasEdit(mapId, userId)) {
throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
}

// 2. ํ•ด๋‹น ๋งˆ์ธ๋“œ๋งต์— ์ฝ”๋“œ ์ฐธ์กฐ๊ฐ€ ์กด์žฌํ•˜๋Š”์ง€ ํ™•์ธ
if (!codeReferenceRepository.existsByMindmapIdAndId(mapId, refId)) {
throw new GlobalException(ErrorCode.CODE_REFERENCE_NOT_FOUND);
}

// 3. ์ฝ”๋“œ ์ฐธ์กฐ ์‚ญ์ œ
codeReferenceRepository.deleteById(refId);
}
}
Loading