From 5c236aea6c695165a3d70e69a1c8c93690608e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Thu, 16 Dec 2021 17:42:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=EC=8B=9C?=
 =?UTF-8?q?=20=EC=9D=B4=EB=A0=A5=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcgfilemanager/controller/BoardController.java    |  8 ++++----
 .../com/dbnt/kcgfilemanager/service/BoardService.java | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
index 45df7fb..beb3f95 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
@@ -78,8 +78,8 @@ public class BoardController {
   }
 
   @GetMapping("/fileDownload")
-  public void fileDownload(Integer contentSeq, Integer fileSeq, HttpServletRequest request, HttpServletResponse response){
-    FileInfo downlodFileInfo = boardService.selectDownloadFileInfo(contentSeq, fileSeq);
+  public void fileDownload(Principal principal, Integer contentSeq, Integer fileSeq, HttpServletRequest request, HttpServletResponse response){
+    FileInfo downlodFileInfo = boardService.selectDownloadFileInfo(contentSeq, fileSeq, ((UserInfo)((UsernamePasswordAuthenticationToken) principal).getPrincipal()).getUserId());
 
     BufferedInputStream in;
     BufferedOutputStream out;
@@ -98,8 +98,8 @@ public class BoardController {
   }
 
   @GetMapping("/fileDownloadToZip")
-  public void fileDownloadToZip(Integer contentSeq, @RequestParam(value = "fileSeq") List<Integer> fileSeqList, HttpServletResponse response){
-    List<FileInfo> targetList = boardService.selectDownloadFileInfoList(contentSeq, fileSeqList);
+  public void fileDownloadToZip(Principal principal, Integer contentSeq, @RequestParam(value = "fileSeq") List<Integer> fileSeqList, HttpServletResponse response){
+    List<FileInfo> targetList = boardService.selectDownloadFileInfoList(contentSeq, fileSeqList, ((UserInfo)((UsernamePasswordAuthenticationToken) principal).getPrincipal()).getUserId());
 
     BufferedInputStream in;
     BufferedOutputStream out;
diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
index 6377cf8..0de7c19 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
@@ -104,7 +104,7 @@ public class BoardService {
       fileInfo.setFileSize(calculationFileSize(file.getSize()));
       fileInfo.setSavePath(path);
       fileInfoRepository.save(fileInfo);
-      saveBoardLog(content.getContentSeq(), LogStatus.FILE_ADD, file.getOriginalFilename(), content.getCreateId());
+      saveBoardLog(content.getContentSeq(), LogStatus.FILE_ADD, fileInfo.getFullName(), content.getCreateId());
     }
   }
 
@@ -130,18 +130,21 @@ public class BoardService {
     return target;
   }
 
-  public List<FileInfo> selectDownloadFileInfoList(Integer contentSeq, List<Integer> fileSeqList) {
+  public List<FileInfo> selectDownloadFileInfoList(Integer contentSeq, List<Integer> fileSeqList, String userId) {
     List<FileInfo> fileList = fileInfoRepository.findByContentSeqOrderByFileSeqAsc(contentSeq);
     List<FileInfo> targetList = new ArrayList<>();
     for(FileInfo file: fileList){
       if(fileSeqList.contains(file.getFileSeq())){
         targetList.add(file);
+        saveBoardLog(contentSeq, LogStatus.FILE_DOWN, file.getFullName(), userId);
       }
     }
     return targetList;
   }
-  public FileInfo selectDownloadFileInfo(Integer contestSeq, Integer fileSeq){
-    return fileInfoRepository.findById(new FileInfo.FileInfoId(contestSeq, fileSeq)).orElse(null);
+  public FileInfo selectDownloadFileInfo(Integer contestSeq, Integer fileSeq, String userId){
+    FileInfo fileInfo = fileInfoRepository.findById(new FileInfo.FileInfoId(contestSeq, fileSeq)).orElse(null);
+    saveBoardLog(contestSeq, LogStatus.FILE_DOWN, fileInfo.getFullName(), userId);
+    return fileInfo;
   }
 
   public List<BoardLog> selectContentLog(Integer contentSeq){