Skip to content

πŸ› fix: fix conflicts #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyeonahhh merged 1 commit into from
Jun 5, 2025
Merged

πŸ› fix: fix conflicts #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package umc.th.juinjang.api.note.shared.service;

import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.sql.Timestamp;

import org.hibernate.exception.LockAcquisitionException;
import org.springframework.dao.CannotAcquireLockException;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -126,7 +128,7 @@ private UsedPencil createUsedPencil(Member member, Long sharedNoteId, SharedNote

@Transactional
public void deleteSharedNote(Member member, Long sharedNoteId, LocalDateTime deletedAt) {
SharedNote sharedNote = sharedNoteFinder.getBySharedNoteIdAndMemberAndDeletedAtIsNull(sharedNoteId,member);
SharedNote sharedNote = sharedNoteFinder.getBySharedNoteIdAndMemberAndDeletedAtIsNull(sharedNoteId, member);
sharedNote.updateDeletedAt(Timestamp.valueOf(deletedAt));
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public interface SharedNoteRepository extends JpaRepository<SharedNote, Long>, S

Optional<SharedNote> findTop1ByLimjang_LimjangIdOrderByCreatedAtDesc(Long limjangId);

Optional<SharedNote> getBySharedNoteIdAndMemberAndDeletedAtIsNull(Long sharedNoteId, Member member);

@Query("SELECT s.sharedNoteId, s.viewCount FROM SharedNote s WHERE s.sharedNoteId IN :ids")
List<Object[]> findAllViewCountById(@Param("ids") List<Long> ids);
Expand Down