Skip to content

refactor: 문서 목록 반환 시 각 문서의 최신버전 포함하여 반환 #89

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
hyotatoFrappuccino merged 2 commits into from
Sep 1, 2025
Merged

refactor: 문서 목록 반환 시 각 문서의 최신버전 포함하여 반환 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9858d03
refactor: 문서 목록 반환 시 각 문서의 최신버전 포함하여 반환
hyotatoFrappuccino Aug 31, 2025
5ed5338
refactor: version 타입 Long->int 변경
hyotatoFrappuccino Sep 1, 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
4 changes: 3 additions & 1 deletion src/main/java/com/jobnote/domain/document/dto/DocumentResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ public record DocumentResponse(
DocumentType type,
String title,
LocalDate lastModifiedDate,
int latestVersion,
List<ApplicationFormSimpleResponse> applicationForms
) {
public static DocumentResponse of(final Document document, final List<ApplicationFormSimpleResponse> applicationForms) {
public static DocumentResponse of(final Document document, final int latestVersion, final List<ApplicationFormSimpleResponse> applicationForms) {
return DocumentResponse.builder()
.id(document.getId())
.type(document.getType())
.title(document.getTitle())
.lastModifiedDate(document.getModifiedDate().toLocalDate())
.latestVersion(latestVersion)
.applicationForms(applicationForms)
.build();
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/jobnote/domain/document/repository/DocumentVersionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

import java.util.Optional;

public interface DocumentVersionRepository extends JpaRepository<DocumentVersion, Long> {
@Query("select v from DocumentVersion v join fetch v.document d join d.user u where u.id = :userId and d.id = :documentId order by v.version desc")
Page<DocumentVersion> findAllByUserIdAndDocumentId(final Long userId, final Long documentId, final Pageable pageable);

/* 해당 문서의 최신 버전 조회 */
@Query("select MAX(v.version) from DocumentVersion v where v.document.id = :documentId")
Optional<Integer> findLatestVersionByDocumentId(final Long documentId);
int findLatestVersionByDocumentId(final Long documentId);

/* 해당 유저의 문서 총 이용 용량 조회 */
@Query("select COALESCE(SUM(v.fileSize), 0) from DocumentVersion v join v.document d where d.user.id = :userId")
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/jobnote/domain/document/service/DocumentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Long uploadNewVersionDocument(final Long userId, final Long documentId, f
Document document = getByIdOrThrow(documentId);
document.validateOwner(userId);

int version = documentVersionRepository.findLatestVersionByDocumentId(documentId).orElse(0) + 1;
int version = documentVersionRepository.findLatestVersionByDocumentId(documentId) + 1;

return saveDocumentVersion(userId, document, request, version);
}
Expand All @@ -55,6 +55,7 @@ public Page<DocumentResponse> getAll(final Long userId, final Pageable pageable)
.map(document ->
DocumentResponse.of(
document,
documentVersionRepository.findLatestVersionByDocumentId(document.getId()),
applicationFormDocumentService.getSimpleResponsesByDocumentId(userId, document.getId())
));
}
Expand Down
Loading