-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7b8a612
commit ad21ac5
Showing
9 changed files
with
188 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/main/java/com/khureturn/community/controller/ExamController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package com.khureturn.community.controller; | ||
|
||
import com.khureturn.community.domain.exam.Exam; | ||
import com.khureturn.community.dto.ExamRequestDto; | ||
import com.khureturn.community.dto.ExamResponseDto; | ||
import com.khureturn.community.service.ExamService; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.*; | ||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
import java.io.IOException; | ||
import java.security.Principal; | ||
import java.util.List; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
@RequestMapping("/exam") | ||
public class ExamController { | ||
|
||
private final ExamService examService; | ||
|
||
@PostMapping("") | ||
public ResponseEntity<ExamResponseDto.CreateExamDto> createExam(Principal principal, @RequestPart(value = "fileList", required= false) List<MultipartFile> fileList, | ||
@RequestPart(value="data") ExamRequestDto.CreateExamDto data) throws IOException{ | ||
Exam exam = examService.create(fileList, data, principal); | ||
return ResponseEntity.ok(ExamResponseDto.CreateExamDto.builder().examId(exam.getId()).build()); | ||
} | ||
|
||
@PutMapping("/{examId}") | ||
public ResponseEntity<ExamResponseDto.UpdateExamDto> updateExam(@PathVariable(name = "examId") Long examId, @RequestBody ExamRequestDto.UpdateExamDto request){ | ||
Exam exam = examService.update(examId, request); | ||
return ResponseEntity.ok(ExamResponseDto.UpdateExamDto.builder().examId(exam.getId()).build()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/main/java/com/khureturn/community/dto/ExamRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package com.khureturn.community.dto; | ||
|
||
import lombok.*; | ||
|
||
public class ExamRequestDto { | ||
@Builder | ||
@Getter | ||
@AllArgsConstructor(access = AccessLevel.PROTECTED) | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public static class CreateExamDto{ | ||
private String title; | ||
private String content; | ||
private Boolean isAnonymous; | ||
|
||
} | ||
|
||
@Builder | ||
@Getter | ||
@AllArgsConstructor(access = AccessLevel.PROTECTED) | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public static class UpdateExamDto{ | ||
private String title; | ||
private String content; | ||
private Boolean isAnonymous; | ||
|
||
} | ||
|
||
} |
24 changes: 24 additions & 0 deletions
24
src/main/java/com/khureturn/community/dto/ExamResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package com.khureturn.community.dto; | ||
|
||
import lombok.*; | ||
|
||
public class ExamResponseDto { | ||
|
||
@Builder | ||
@Getter | ||
@AllArgsConstructor(access = AccessLevel.PROTECTED) | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public static class CreateExamDto{ | ||
private Long examId; | ||
|
||
} | ||
|
||
@Builder | ||
@Getter | ||
@AllArgsConstructor(access = AccessLevel.PROTECTED) | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public static class UpdateExamDto{ | ||
private Long examId; | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/java/com/khureturn/community/service/ExamFileService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package com.khureturn.community.service; | ||
|
||
import com.khureturn.community.domain.exam.ExamFile; | ||
import lombok.NoArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.util.UUID; | ||
|
||
@Service | ||
@NoArgsConstructor | ||
public class ExamFileService { | ||
|
||
public static String fileUpload(MultipartFile file) throws IOException { | ||
|
||
String rootPath = System.getProperty("user.dir") + "/src/main/webapp/WEB-INF"; | ||
String fileDir = rootPath + "/static/examFiles"; | ||
UUID uuid = UUID.randomUUID(); | ||
String savedFileName = uuid.toString() + "_" + file.getOriginalFilename(); | ||
File saveFile = new File(fileDir, savedFileName); | ||
if(!saveFile.exists()){ | ||
saveFile.mkdir(); | ||
} | ||
file.transferTo(saveFile); | ||
return saveFile.getPath(); | ||
|
||
} | ||
} |
63 changes: 63 additions & 0 deletions
63
src/main/java/com/khureturn/community/service/ExamService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
package com.khureturn.community.service; | ||
|
||
import com.khureturn.community.domain.Member; | ||
import com.khureturn.community.domain.exam.Exam; | ||
import com.khureturn.community.domain.exam.ExamFile; | ||
import com.khureturn.community.dto.ExamRequestDto; | ||
import com.khureturn.community.exception.NotFoundException; | ||
import com.khureturn.community.repository.ExamFileRepository; | ||
import com.khureturn.community.repository.ExamRepository; | ||
import com.khureturn.community.repository.MemberRepository; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
import java.io.IOException; | ||
import java.security.Principal; | ||
import java.util.List; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class ExamService { | ||
|
||
private final ExamRepository examRepository; | ||
|
||
private final MemberRepository memberRepository; | ||
private final ExamFileRepository examFileRepository; | ||
|
||
@Transactional | ||
public Exam create(List<MultipartFile> fileList, ExamRequestDto.CreateExamDto request, Principal principal) throws IOException { | ||
Member member = memberRepository.findByName(principal.getName()); | ||
Exam exam = Exam.builder() | ||
.examTitle(request.getTitle()) | ||
.examContent(request.getContent()) | ||
.isAnonymous(request.getIsAnonymous()) | ||
.member(member) | ||
.build(); | ||
examRepository.save(exam); | ||
|
||
if(fileList != null){ | ||
for(MultipartFile file: fileList){ | ||
ExamFile examFile = ExamFile.builder() | ||
.examFileUrl(ExamFileService.fileUpload(file)) | ||
.exam(exam) | ||
.build(); | ||
examFileRepository.save(examFile); | ||
|
||
} | ||
} | ||
return exam; | ||
} | ||
|
||
@Transactional | ||
public Exam update(Long examId, ExamRequestDto.UpdateExamDto request){ | ||
Exam exam = examRepository.findById(examId) | ||
.orElseThrow(()-> new NotFoundException("족보를 찾을 수 없습니다.")); | ||
exam.update(request.getTitle(), request.getContent(), request.getIsAnonymous()); | ||
return exam; | ||
} | ||
|
||
|
||
|
||
} |