diff --git a/src/main/java/com/khureturn/community/controller/DiaryController.java b/src/main/java/com/khureturn/community/controller/DiaryController.java index 50b18e5..1a6fc0f 100644 --- 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 createDiary(Principal principal, @RequestPart(value = "mediaList", required= false) List mediaList, - @RequestPart(value = "data")String data) throws IOException { + public ResponseEntity createDiary(@RequestPart(value = "mediaList", required= false) List 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 index 3ab046b..e4c9447 100644 --- 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 index 4ba4381..71a7ea4 100644 --- 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 index e9b33d7..69da382 100644 --- a/src/main/java/com/khureturn/community/controller/ExamController.java +++ b/src/main/java/com/khureturn/community/controller/ExamController.java @@ -1,6 +1,5 @@ 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; @@ -8,6 +7,8 @@ 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> getExamList(@RequestPar } } + + } diff --git a/src/main/java/com/khureturn/community/domain/Member.java b/src/main/java/com/khureturn/community/domain/Member.java index 918236e..dfc8421 100644 --- 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 index 50c2e43..ae9ff13 100644 --- 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 index c8ccd00..d89322b 100644 --- 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 index a6468ac..befc485 100644 --- 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 index d7ef157..3e13518 100644 --- 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 index 0c35dac..7a4c8c7 100644 --- 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 index 5f24230..8700d19 100644 --- 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 index 2114dbd..79efd58 100644 --- 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 index 4c5a0f0..287eb56 100644 --- 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 index 9bbc4e6..48f3cca 100644 --- 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 index ce59290..0270e54 100644 --- 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 { List findAllByExam(Exam exam); + Optional 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 index dfd4b37..564aabd 100644 --- 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 index a670ae6..fe20b16 100644 --- 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 index b9c8c9c..8a22fce 100644 --- 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 findAllByExam(Long examId){ .orElseThrow(() -> new NotFoundException("족보를 찾을 수 없습니다.")); return examFileRepository.findAllByExam(exam); } + }