[Seminar3] 필수 과제 구현

.gitignore

@@ -15,7 +15,6 @@ build/
 .idea/workspace.xml
 .idea/libraries/
 .idea/**
-.idea/vcs.xml
 .idea
 .idea/
 *.iws

build.gradle

@@ -18,12 +18,14 @@ java {
 }
 
 dependencies {
+
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.junit.platform:junit-platform-launcher'
-
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'mysql:mysql-connector-java:8.0.32'
 
@@ -34,4 +36,8 @@ dependencies {
 
 test {
     useJUnitPlatform()
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-parameters"
 }

src/main/java/org/sopt/Diary/controller/DiariesController.java

@@ -0,0 +1,41 @@
+package org.sopt.Diary.controller;
+
+import jakarta.validation.Valid;
+import org.sopt.Diary.dto.res.DiaryListRes;
+import org.sopt.Diary.entity.Category;
+import org.sopt.Diary.entity.SortType;
+import org.sopt.Diary.service.DiariesService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+@RequestMapping("/diaries")
+@RestController
+public class DiariesController {
+
+    private final DiariesService diariesService;
+
+    public DiariesController(DiariesService diariesService) {
+        this.diariesService = diariesService;
+    }
+
+    @GetMapping()
+    public ResponseEntity<DiaryListRes> getDiaries(
+            @RequestHeader(name="userId" , required = false) Long userId,
+            @RequestParam(name = "category" , required = false, defaultValue = "ALL") final Category category,
+            @RequestParam(name = "sort",required = false, defaultValue = "LATEST") final SortType sortType) {
+
+        DiaryListRes diaryListRes = diariesService.getDiariesResponse( category,sortType, false, userId);
+        return ResponseEntity.ok(diaryListRes);
+    }
+
+    @GetMapping("/my")
+    public ResponseEntity<DiaryListRes> getMyDiaries(
+            @Valid @RequestHeader("userId") long userId,
+            @Valid @RequestParam(name = "category",required = false, defaultValue = "ALL") final Category category,
+            @RequestParam(name = "sort",required = false, defaultValue = "LATEST")final SortType sortType) {
+
+        DiaryListRes diaryListRes = diariesService.getDiariesResponse(category, sortType,true,userId);
+        return ResponseEntity.ok(diaryListRes);
+    }
+}

src/main/java/org/sopt/Diary/controller/DiaryController.java

@@ -0,0 +1,88 @@
+package org.sopt.Diary.controller;
+
+import jakarta.validation.Valid;
+import org.sopt.Diary.dto.req.DiaryUpdateReq;
+import org.sopt.Diary.dto.req.DiaryReq;
+import org.sopt.Diary.dto.res.DiaryRes;
+import org.sopt.Diary.service.DiaryService;
+import org.sopt.Diary.service.UserService;
+import org.sopt.Diary.validator.DiaryValidator;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/diary")
+@RestController
+public class DiaryController {
+
+    private final DiaryService diaryService;
+    private final UserService userService;
+
+    public DiaryController(DiaryService diaryService,UserService userService) {
+        this.diaryService = diaryService;
+        this.userService=userService;
+    }
+
+    /**
+     * 일기 작성하기
+     * @param userId 유저 Id(Header)
+     * @param diaryRequest title,content,category,isPrivate
+     * @return 200
+     */
+    @PostMapping()
+    ResponseEntity<String> postDiary(@RequestHeader("userId") long userId, @Valid @RequestBody final DiaryReq diaryRequest) {
+
+        //UserId, 내용 글자수 검증
+        userService.findByUserId(userId);
+        DiaryValidator.checkContent(diaryRequest.content());
+        DiaryValidator.checkTitle(diaryRequest.title());
+
+        diaryService.createDiary(userId, diaryRequest);
+        return ResponseEntity.ok("일기가 생성되었습니다.");
+    }
+
+    /**
+     * 일기 상세 조회
+     * @param diaryId 다이어리 아이디
+     * @return 200
+     */
+    @GetMapping("/{diaryId}")
+    ResponseEntity<DiaryRes> getDiary(@RequestHeader(name="userId",required = false) Long userId, @PathVariable("diaryId") final long diaryId) {
+        DiaryRes diaryRes  = diaryService.getDiary(userId, diaryId);
+
+        return ResponseEntity.ok(diaryRes);
+    }
+
+    /**
+     * 일기 수정
+     * @param userId 유저 아이디
+     * @param diaryId 다이어리 아이디
+     * @param diaryRequest content,category
+     * @return 200
+     */
+    @PatchMapping("/{diaryId}")
+    ResponseEntity<String> updateDiary(  @RequestHeader("userId") long userId,
+                                        @PathVariable("diaryId") final long diaryId,
+                                       @Valid @RequestBody DiaryUpdateReq diaryRequest){
+
+        //UserId, 내용 글자수 검증
+        userService.findByUserId(userId);
+        DiaryValidator.checkContent(diaryRequest.content());
+
+        diaryService.patchDiary(userId, diaryId,diaryRequest.content(),diaryRequest.category());
+        return ResponseEntity.ok("일기가 수정되었습니다.");
+    }
+
+    /**
+     * 일기 삭제하기
+     * @param userId 유저 아이디
+     * @param diaryId 다이어리 아이디
+     * @return 200
+     */
+    @DeleteMapping("/{diaryId}")
+    ResponseEntity<String> deleteDiary(@RequestHeader("userId") long userId,
+                                       @PathVariable("diaryId") final long diaryId){
+        userService.findByUserId(userId);
+        diaryService.deleteDiary(userId,diaryId);
+        return ResponseEntity.ok("일기가 삭제되었습니다.");
+    }
+}

src/main/java/org/sopt/Diary/controller/UserController.java

@@ -0,0 +1,45 @@
+package org.sopt.Diary.controller;
+
+import jakarta.validation.Valid;
+import org.sopt.Diary.dto.req.SignInReq;
+import org.sopt.Diary.dto.req.SignUpReq;
+import org.sopt.Diary.dto.res.UserRes;
+import org.sopt.Diary.service.UserService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/users")
+public class UserController {
+
+    private final UserService userService;
+
+    public UserController(final  UserService userService){this.userService=userService;}
+
+    /**
+     * 회원가입
+     * @param signUpRequest  Id, Pwd, Nickname
+     */
+    @PostMapping("/signup")
+    private void signUp(@Valid @RequestBody SignUpReq signUpRequest){
+        // 제약사항 따로 없음
+        //@Valid 를 통해 RequestBody @NotNull 체크해줌
+        userService.join(signUpRequest);
+    }
+
+    /**
+     * 로그인
+     * @param signInReq Id, Pwd
+     * @return 200
+     */
+    @PostMapping("/signin")
+    private UserRes signIn(@Valid @RequestBody SignInReq signInReq){
+        Long userId= userService.login(signInReq);
+        return new UserRes(userId);
+
+    }
+
+
+}

src/main/java/org/sopt/Diary/dto/req/DiaryReq.java

@@ -0,0 +1,12 @@
+package org.sopt.Diary.dto.req;
+
+
+import jakarta.validation.constraints.NotNull;
+import org.sopt.Diary.entity.Category;
+
+
+public record DiaryReq(@NotNull String title,
+                       @NotNull String content,
+                       @NotNull Category category,
+                       boolean isPrivate){
+}

src/main/java/org/sopt/Diary/dto/req/DiaryUpdateReq.java

@@ -0,0 +1,8 @@
+package org.sopt.Diary.dto.req;
+
+
+import jakarta.validation.constraints.NotNull;
+import org.sopt.Diary.entity.Category;
+
+public record DiaryUpdateReq(@NotNull String content , @NotNull Category category) {
+}

src/main/java/org/sopt/Diary/dto/req/SignInReq.java

@@ -0,0 +1,6 @@
+package org.sopt.Diary.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+
+public record SignInReq (@NotNull String loginId, @NotNull String password){
+}

src/main/java/org/sopt/Diary/dto/req/SignUpReq.java

@@ -0,0 +1,9 @@
+package org.sopt.Diary.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+
+//입력값의 Null 검증을 위한 @Valid, @NotNull
+public record SignUpReq ( @NotNull String loginId, @NotNull String password, @NotNull String nickname )
+{
+
+}

src/main/java/org/sopt/Diary/dto/res/DiariesResponse.java → src/main/java/org/sopt/Diary/dto/res/DiariesRes.java

@@ -1,6 +1,6 @@
 package org.sopt.Diary.dto.res;
 
-public record DiariesResponse(Long id, String title){
+public record DiariesRes(Long id, String username, String title, String cratedAt){
 }
 //레코드를 이용하도록 수정-
 // - 레코드를 사용하면 모든 필드가 자동으로 final이 되고

src/main/java/org/sopt/Diary/dto/res/DiaryListRes.java

@@ -0,0 +1,20 @@
+package org.sopt.Diary.dto.res;
+
+
+import java.util.List;
+
+public class DiaryListRes {
+    private List<DiariesRes> diaries;
+
+    public DiaryListRes(List<DiariesRes> diaries) {
+        this.diaries = diaries;
+    }
+
+    public List<DiariesRes> getDiaries() {
+        return diaries;
+    }
+
+    public void setDiaries(List<DiariesRes> diaries) {
+        this.diaries = diaries;
+    }
+}