fix: Fix Diary

KHU-RETURN · Aug 15, 2023 · afbf7e0 · afbf7e0
2 parents 15a97f8 + 7f70374
commit afbf7e0
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 27 deletions.
diff --git a/src/main/java/com/khureturn/community/controller/DiaryController.java b/src/main/java/com/khureturn/community/controller/DiaryController.java
@@ -13,8 +13,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,8 +32,8 @@ public class DiaryController {
 
     @PreAuthorize("isAuthenticated()")
     @PostMapping(value ="", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-    public ResponseEntity<DiaryResponseDto.CreateDiaryDto> createDiary(Principal principal, @RequestPart(value = "mediaList", required= false) List<MultipartFile> mediaList,
-                                                                       @RequestPart(value = "data")String data) throws IOException {
+    public ResponseEntity<DiaryResponseDto.CreateDiaryDto> createDiary(@RequestPart(value = "mediaList", required= false) List<MultipartFile> mediaList,
+                                                                       @RequestPart(value = "data")String data, Principal principal) throws IOException {
 
         Diary diary = diaryService.create(mediaList, data, principal);
         return ResponseEntity.ok(DiaryResponseDto.CreateDiaryDto.builder().postId(diary.getId()).build());

diff --git a/src/main/java/com/khureturn/community/controller/DiaryLikeController.java b/src/main/java/com/khureturn/community/controller/DiaryLikeController.java
@@ -1,9 +1,7 @@
 package com.khureturn.community.controller;
 
 
-import com.khureturn.community.domain.Member;
 import com.khureturn.community.service.DiaryLikeService;
-import com.khureturn.community.service.MemberService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

diff --git a/src/main/java/com/khureturn/community/controller/DiaryScrapController.java b/src/main/java/com/khureturn/community/controller/DiaryScrapController.java
@@ -1,8 +1,6 @@
 package com.khureturn.community.controller;
 
-import com.khureturn.community.domain.Member;
 import com.khureturn.community.service.DiaryScrapService;
-import com.khureturn.community.service.MemberService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

diff --git a/src/main/java/com/khureturn/community/controller/ExamController.java b/src/main/java/com/khureturn/community/controller/ExamController.java
@@ -1,13 +1,14 @@
 package com.khureturn.community.controller;
 
-import com.khureturn.community.domain.diary.Diary;
 import com.khureturn.community.domain.exam.Exam;
 import com.khureturn.community.domain.exam.ExamFile;
 import com.khureturn.community.dto.ExamRequestDto;
 import com.khureturn.community.dto.ExamResponseDto;
 import com.khureturn.community.service.ExamFileService;
 import com.khureturn.community.service.ExamService;
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -77,4 +78,6 @@ public ResponseEntity<List<ExamResponseDto.ExamSortDto>> getExamList(@RequestPar
         }
     }
 
+
+
 }
diff --git a/src/main/java/com/khureturn/community/domain/Member.java b/src/main/java/com/khureturn/community/domain/Member.java
@@ -27,7 +27,7 @@
 @Getter
 public class Member extends BaseEntity {
 
-    @Id @GeneratedValue
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "member_id")
     private Long memberId;
 

diff --git a/src/main/java/com/khureturn/community/domain/base/BaseEntity.java b/src/main/java/com/khureturn/community/domain/base/BaseEntity.java
@@ -13,6 +13,7 @@
 @EntityListeners(AuditingEntityListener.class)
 @Getter
 public class BaseEntity {
+
     @CreatedDate
     private LocalDateTime createdAt;
 

diff --git a/src/main/java/com/khureturn/community/domain/diary/DiaryLike.java b/src/main/java/com/khureturn/community/domain/diary/DiaryLike.java
@@ -11,6 +11,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class DiaryLike {
+
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name ="diary_like_id")
     private Long id;

diff --git a/src/main/java/com/khureturn/community/domain/exam/Exam.java b/src/main/java/com/khureturn/community/domain/exam/Exam.java
@@ -13,6 +13,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class Exam extends BaseEntity {
+
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "exam_id")
     private Long id;

diff --git a/src/main/java/com/khureturn/community/domain/notice/Notice.java b/src/main/java/com/khureturn/community/domain/notice/Notice.java
@@ -13,7 +13,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class  Notice extends BaseEntity {
-    @Id @GeneratedValue
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "notice_id")
     private Long id;
     @Column(nullable = false)

diff --git a/src/main/java/com/khureturn/community/domain/notice/NoticeComment.java b/src/main/java/com/khureturn/community/domain/notice/NoticeComment.java
@@ -13,7 +13,7 @@
 @Getter
 public class NoticeComment extends BaseEntity {
 
-    @Id @GeneratedValue
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "notice_comment_id")
     private Long id;
 

diff --git a/src/main/java/com/khureturn/community/domain/notice/NoticeFile.java b/src/main/java/com/khureturn/community/domain/notice/NoticeFile.java
@@ -12,8 +12,7 @@
 @Getter
 public class NoticeFile extends BaseEntity {
 
-    @Id
-    @GeneratedValue
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "notice_file_id")
     private Long id;
 

diff --git a/src/main/java/com/khureturn/community/domain/notice/NoticeLike.java b/src/main/java/com/khureturn/community/domain/notice/NoticeLike.java
@@ -11,8 +11,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class NoticeLike {
-    @Id
-    @GeneratedValue
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name ="notice_like_id")
     private Long id;
 

diff --git a/src/main/java/com/khureturn/community/domain/notice/NoticeScrap.java b/src/main/java/com/khureturn/community/domain/notice/NoticeScrap.java
@@ -10,8 +10,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class NoticeScrap {
-    @Id
-    @GeneratedValue
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name ="notice_scrap_id")
     private Long id;
 

diff --git a/src/main/java/com/khureturn/community/dto/converter/DiaryConverter.java b/src/main/java/com/khureturn/community/dto/converter/DiaryConverter.java
@@ -2,11 +2,7 @@
 
 import com.khureturn.community.domain.Member;
 import com.khureturn.community.domain.diary.Diary;
-import com.khureturn.community.domain.diary.DiaryFile;
 import com.khureturn.community.dto.DiaryRequestDto;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
 
 public class DiaryConverter {
 

diff --git a/src/main/java/com/khureturn/community/repository/ExamFileRepository.java b/src/main/java/com/khureturn/community/repository/ExamFileRepository.java
@@ -5,8 +5,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface ExamFileRepository extends JpaRepository<ExamFile, Long> {
 
     List<ExamFile> findAllByExam(Exam exam);
+    Optional<ExamFile> findByIdAndExam(Long examFileId, Exam exam);
 }
diff --git a/src/main/java/com/khureturn/community/service/DiaryFileService.java b/src/main/java/com/khureturn/community/service/DiaryFileService.java
@@ -7,14 +7,11 @@
 import com.khureturn.community.repository.DiaryFileRepository;
 import com.khureturn.community.repository.DiaryRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 
 @Service
@@ -29,9 +26,10 @@ public static DiaryFile fileUpload(MultipartFile media, Diary diary) throws IOEx
         String rootPath = System.getProperty("user.dir") + "/src/main/webapp/WEB-INF";
         String fileDir = rootPath + "/static/thumbnailDiaryMedia";
         MediaType mediaType = null;
-        if(media.getContentType().startsWith("image")){
+        String extension = media.getOriginalFilename().substring(media.getOriginalFilename().lastIndexOf("."));
+        if(extension.equals("png") || extension.equals("jpeg") || extension.equals("gif") || extension.equals("jpg") || extension.equals("PNG") || extension.equals("JPEG") || extension.equals("GIF") || extension.equals("JPG")){
             mediaType = MediaType.IMAGE;
-        }else{
+        } else{
             mediaType = MediaType.VIDEO;
         }
         UUID uuid = UUID.randomUUID();

diff --git a/src/main/java/com/khureturn/community/service/DiaryService.java b/src/main/java/com/khureturn/community/service/DiaryService.java
@@ -80,6 +80,7 @@ public DiaryResponseDto.DiaryDto findDiary(Diary diary, DiaryFile diaryFile, Pri
         Boolean isBookmarked = diaryScrapRepository.existsDiaryScrapByMemberAndDiary(nowMember, diary);
         Boolean isMyPost = diaryRepository.existsByMember(nowMember);
         DiaryResponseDto.DiaryDto result = DiaryResponseDto.DiaryDto.builder()
+                .diaryId(diary.getId())
                 .isLiked(isLiked)
                 .isBookmarked(isBookmarked)
                 .member(MemberResponseDto.MemberDto.builder().memberId(diaryMember.getMemberId()).profileImgURL(diaryMember.getProfileImg()).name(diaryMember.getName()).phoneNumber(diaryMember.getPhoneNumber()).build())

diff --git a/src/main/java/com/khureturn/community/service/ExamFileService.java b/src/main/java/com/khureturn/community/service/ExamFileService.java
@@ -5,6 +5,8 @@
 import com.khureturn.community.exception.NotFoundException;
 import com.khureturn.community.repository.ExamFileRepository;
 import com.khureturn.community.repository.ExamRepository;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,4 +43,5 @@ public List<ExamFile> findAllByExam(Long examId){
                 .orElseThrow(() -> new NotFoundException("족보를 찾을 수 없습니다."));
         return examFileRepository.findAllByExam(exam);
     }
+
 }