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
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
List<Bookmark> findAllByTargetTypeAndUserIdAndTargetIdIn(
BookmarkTargetType targetType, Long userId, Set<Long> targetIds
);

int deleteByTargetTypeAndTargetId(BookmarkTargetType targetType, Long targetId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package project.flipnote.bookmark.service;

import org.springframework.stereotype.Service;

import lombok.RequiredArgsConstructor;
import project.flipnote.bookmark.entity.BookmarkTargetType;
import project.flipnote.bookmark.repository.BookmarkRepository;

@Service
@RequiredArgsConstructor
public class BookmarkWriter {
private final BookmarkRepository bookmarkRepository;

/**
* 즐겨찾기를 삭제합니다.
*
* @param targetType 즐겨찾기 삭제할 대상의 타입
* @param targetId 즐겨찾기 삭제할 대상의 ID
* @author 윤정환
*/
public void delete(BookmarkTargetType targetType, Long targetId) {
bookmarkRepository.deleteByTargetTypeAndTargetId(targetType, targetId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
Expand All @@ -22,6 +23,7 @@
import project.flipnote.cardset.model.CreateCardSetRequest;
import project.flipnote.cardset.model.CreateCardSetResponse;
import project.flipnote.cardset.service.CardSetService;
import project.flipnote.common.model.response.IdResponse;
import project.flipnote.common.model.response.PagingResponse;
import project.flipnote.common.security.dto.AuthPrinciple;

Expand Down Expand Up @@ -75,4 +77,15 @@ public ResponseEntity<PagingResponse<CardSetSummaryResponse>> getCardSets(

return ResponseEntity.ok(res);
}

@DeleteMapping("/{cardSetId}")
public ResponseEntity<IdResponse> deleteCardSet(
@PathVariable("groupId") Long groupId,
@PathVariable("cardSetId") Long cardSetId,
@AuthenticationPrincipal AuthPrinciple authPrinciple
) {
IdResponse res = cardSetService.deleteCardSet(authPrinciple.userId(), groupId, cardSetId);

return ResponseEntity.ok(res);
}
}
38 changes: 38 additions & 0 deletions src/main/java/project/flipnote/cardset/entity/CardSetContent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package project.flipnote.cardset.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import project.flipnote.common.entity.BaseEntity;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "cardset_contents")
@Entity
public class CardSetContent extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "cardset_id", nullable = false)
private Long cardSetId;

@Lob
@Column(nullable = false)
private String content;

@Builder
private CardSetContent(Long cardSetId, String content) {
this.cardSetId = cardSetId;
this.content = content;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package project.flipnote.cardset.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import project.flipnote.common.entity.BaseEntity;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "cardset_incrementals")
@Entity
public class CardSetIncremental extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "cardset_id", nullable = false)
private Long cardSetId;

@Lob
@Column(name = "incremental_value", nullable = false)
private byte[] incrementalValue;

@Column(name = "is_flushed")
private boolean flushed;

@Builder
private CardSetIncremental(Long cardSetId, byte[] incrementalValue, boolean flushed) {
this.cardSetId = cardSetId;
this.incrementalValue = incrementalValue;
this.flushed = flushed;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package project.flipnote.cardset.repository;

import org.springframework.data.jpa.repository.JpaRepository;

import project.flipnote.cardset.entity.CardSetContent;

public interface CardSetContentRepository extends JpaRepository<CardSetContent, Long> {
void deleteByCardSetId(Long cardSetId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package project.flipnote.cardset.repository;

import org.springframework.data.jpa.repository.JpaRepository;

import project.flipnote.cardset.entity.CardSetIncremental;

public interface CardSetIncrementalRepository extends JpaRepository<CardSetIncremental, Long> {
void deleteByCardSetId(Long cardSetId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@
public interface CardSetManagerRepository extends JpaRepository<CardSetManager, Long> {

boolean existsByUser_IdAndCardSet_Id(Long userId, Long cardSetId);

int deleteByCardSet_Id(Long cardSetId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import project.flipnote.bookmark.entity.BookmarkTargetType;
import project.flipnote.bookmark.service.BookmarkReader;
import project.flipnote.bookmark.service.BookmarkService;
import project.flipnote.bookmark.service.BookmarkWriter;
import project.flipnote.cardset.entity.CardSet;
import project.flipnote.cardset.entity.CardSetManager;
import project.flipnote.cardset.entity.CardSetMetadata;
Expand All @@ -25,10 +25,13 @@
import project.flipnote.cardset.model.CardSetUpdateRequest;
import project.flipnote.cardset.model.CreateCardSetRequest;
import project.flipnote.cardset.model.CreateCardSetResponse;
import project.flipnote.cardset.repository.CardSetContentRepository;
import project.flipnote.cardset.repository.CardSetIncrementalRepository;
import project.flipnote.cardset.repository.CardSetManagerRepository;
import project.flipnote.cardset.repository.CardSetMetadataRepository;
import project.flipnote.cardset.repository.CardSetRepository;
import project.flipnote.common.exception.BizException;
import project.flipnote.common.model.response.IdResponse;
import project.flipnote.common.model.response.PagingResponse;
import project.flipnote.common.security.dto.AuthPrinciple;
import project.flipnote.group.entity.Category;
Expand All @@ -44,6 +47,7 @@
import project.flipnote.image.service.ImageService;
import project.flipnote.like.entity.LikeTargetType;
import project.flipnote.like.service.LikeReader;
import project.flipnote.like.service.LikeWriter;
import project.flipnote.user.entity.UserProfile;
import project.flipnote.user.entity.UserStatus;
import project.flipnote.user.exception.UserErrorCode;
Expand All @@ -67,6 +71,10 @@ public class CardSetService {
private final GroupService groupService;
private final LikeReader likeReader;
private final BookmarkReader bookmarkReader;
private final LikeWriter likeWriter;
private final BookmarkWriter bookmarkWriter;
private final CardSetContentRepository cardSetContentRepository;
private final CardSetIncrementalRepository cardSetIncrementalRepository;

@Value("${image.default.cardSet}")
private String defaultCardSetImage;
Expand Down Expand Up @@ -357,4 +365,40 @@ public PagingResponse<CardSetSummaryResponse> getCardSets(long groupId, CardSetS

return PagingResponse.from(res);
}

@Transactional
public IdResponse deleteCardSet(Long userId, Long groupId, Long cardSetId) {
CardSet cardSet = cardSetPolicyService.findByIdAndGroupIdOrThrow(groupId, cardSetId);

cardSetPolicyService.validateCardSetEditable(userId, cardSetId);

// 카드셋 관리자
cardSetManagerRepository.deleteByCardSet_Id(cardSetId);

// 카드셋 내용
cardSetContentRepository.deleteByCardSetId(cardSetId);

// 카드셋 증분값
cardSetIncrementalRepository.deleteByCardSetId(cardSetId);

// 카드셋 스냅샷

Comment on lines +384 to +385
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

CardSetSnapshot 삭제 로직을 구현하거나 TODO로 명확히 표시하세요.

카드셋 스냅샷 삭제가 주석 처리되어 있어 해당 데이터가 고아 데이터로 남을 수 있습니다. 스냅샷 기능이 아직 구현되지 않았다면 TODO 주석을 추가하고, 구현되었다면 삭제 로직을 추가해야 합니다.

스냅샷 삭제 구현이 필요하다면 코드를 생성해드릴 수 있습니다. 필요하신가요?

🤖 Prompt for AI Agents
In src/main/java/project/flipnote/cardset/service/CardSetService.java around
lines 384-385, the CardSetSnapshot deletion is commented out leaving potential
orphaned snapshot data; either implement the deletion logic or add a clear TODO
explaining why it's omitted. If implementing, load related CardSetSnapshot
entities (by cardset id or relevant FK), delete them within the same
transactional context as the parent CardSet (or use cascade remove if modeled),
handle nulls and exceptions, and ensure tests cover snapshot removal; if not
implementing now, add a TODO comment explaining the missing feature, link to an
issue/PR, and include a FIXME with intended behavior and owner.

// 카드셋 메타데이터
cardSetMetadataRepository.deleteById(cardSetId);

// 이미지
imageRefService.findByTypeAndReferenceId(REFERENCE_TYPE, cardSetId)
.ifPresent(imageRef -> imageRefService.deleteByReferenceAndId(REFERENCE_TYPE, imageRef.getId()));

// 카드셋
cardSetRepository.delete(cardSet);

// 좋아요
likeWriter.delete(LikeTargetType.CARD_SET, cardSetId);

// 즐겨찾기
bookmarkWriter.delete(BookmarkTargetType.CARD_SET, cardSetId);

return IdResponse.from(cardSetId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ public interface LikeRepository extends JpaRepository<Like, Long> {
Optional<Like> findByTargetTypeAndTargetIdAndUserId(LikeTargetType targetType, Long targetId, Long userId);

Page<Like> findByTargetTypeAndUserId(LikeTargetType targetType, Long userId, Pageable pageable);

int deleteByTargetTypeAndTargetId(LikeTargetType targetType, Long targetId);
}
24 changes: 24 additions & 0 deletions src/main/java/project/flipnote/like/service/LikeWriter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package project.flipnote.like.service;

import org.springframework.stereotype.Service;

import lombok.RequiredArgsConstructor;
import project.flipnote.like.entity.LikeTargetType;
import project.flipnote.like.repository.LikeRepository;

@RequiredArgsConstructor
@Service
public class LikeWriter {
private final LikeRepository likeRepository;

/**
* 좋아요를 삭제합니다.
*
* @param targetType 좋아요 삭제 대상의 타입
* @param targetId 좋아요 삭제 대상의 ID
* @author 윤정환
*/
public void delete(LikeTargetType targetType, Long targetId) {
likeRepository.deleteByTargetTypeAndTargetId(targetType, targetId);
}
}
Loading