chore(docs): 버전 정보 조회시 최근 문서 버전 전달

Team-INSERT · Apr 25, 2024 · a8bd834 · a8bd834
1 parent b9fa20e
commit a8bd834
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/project/bumawiki/domain/docs/service/QueryDocsService.java b/src/main/java/com/project/bumawiki/domain/docs/service/QueryDocsService.java
@@ -140,12 +140,15 @@ public MergeConflictDataResponseDto getMergeConflict(String title, String conten
 		LinkedList<DiffMatchPatch.Diff> diff1 = DocsUtil.getDiff(originalDocsContent, firstDocsContent);
 		LinkedList<DiffMatchPatch.Diff> diff2 = DocsUtil.getDiff(originalDocsContent, contents);
 
+		VersionDocs lastVersion = docsReader.findLastVersion(docs);
+
 		return new MergeConflictDataResponseDto(
 			firstDocsContent,
 			contents,
 			originalDocsContent,
 			diff1,
-			diff2
+			diff2,
+			lastVersion.getVersion()
 		);
 	}