feat/#6-seminar3-essential

.gitignore

@@ -3,20 +3,24 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.yml
+*.yml
+*.xml
 
 ### IntelliJ IDEA ###
 .idea/modules.xml
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea/dataSources.xml
+.idea/inspectionProfiles/*
+.idea/
 *.iws
 *.iml
 *.ipr
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
-.yml
-*.yml
 
 ### Eclipse ###
 .apt_generated

build.gradle

@@ -25,7 +25,16 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+//    // 스프링 시큐리티를 사용하기 위한 스타터 추가
+//    implementation 'org.springframework.boot:spring-boot-starter-security'
+//    // 타임리프에서 스프링 시큐리티를 사용하기 위한 의존성 추가
+//    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+//    // 스프링 시큐리티를 테스트하기 위한 의존성 추가
+//    testImplementation 'org.springframework.security:spring-security-test'
+
     runtimeOnly 'com.h2database:h2'
+    runtimeOnly 'mysql:mysql-connector-java:8.0.32'
 
     testImplementation platform('org.junit:junit-bom:5.10.0')
     testImplementation 'org.junit.jupiter:junit-jupiter'

src/main/java/org/sopt/diary/api/controller/DiaryController.java

@@ -5,7 +5,10 @@
 import org.sopt.diary.api.dto.response.DetailDiaryResponse;
 import org.sopt.diary.api.dto.response.DiaryListResponse;
 import org.sopt.diary.api.dto.response.DiaryResponse;
+import org.sopt.diary.api.dto.response.ErrorCode;
+import org.sopt.diary.api.exception.DiaryException;
 import org.sopt.diary.domain.Diary;
+import org.sopt.diary.domain.entity.DiaryEntity.Category;
 import org.sopt.diary.service.DiaryService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -26,34 +29,68 @@ public DiaryController(DiaryService diaryService) {
         this.diaryService = diaryService;
     }
 
+    // 일기 작성
     @PostMapping("/diaries")
-    ResponseEntity<DiaryResponse> post(@Validated @RequestBody DiaryRequest diaryRequest) {
+    ResponseEntity<DiaryResponse> post(
+            @RequestHeader("Member-Id") Long memberId,
+            @Validated @RequestBody DiaryRequest diaryRequest
+    ) {
         // 다이어리 생성
-        long diaryId = diaryService.createDiary(diaryRequest.getTitle(), diaryRequest.getContent());
+        long diaryId = diaryService.createDiary(
+                diaryRequest.getTitle(),
+                diaryRequest.getContent(),
+                validateCreateCategory(diaryRequest.getCategory()),
+                diaryRequest.getIsPublic(),
+                memberId
+        );
         return ResponseEntity.ok(new DiaryResponse(diaryId));
     }
 
+    // 전체 일기 리스트 조회
     @GetMapping("/diaries")
-    ResponseEntity<DiaryListResponse> getDiaryList() {
-        List<Diary> diaries = diaryService.getDiaries();
+    ResponseEntity<DiaryListResponse> getDiaryList(
+            @RequestParam(value = "category", required = false) String category
+    ) {
+        List<Diary> diaries = diaryService.getDiaries(validateGetCategory(category));
         return ResponseEntity.ok(DiaryListResponse.from(diaries));
     }
 
+    // 특정 사용자의 일기 목록 조회
+    @GetMapping("/diaries/me")
+    ResponseEntity<DiaryListResponse> getMyDiaryList(
+            @RequestHeader("Member-Id") Long memberId,
+            @RequestParam(value = "category", required = false) String category
+    ) {
+        List<Diary> diaries = diaryService.getMyDiaries(memberId, validateGetCategory(category));
+        return ResponseEntity.ok(DiaryListResponse.from(diaries));
+    }
+
+    // 일기 상세 조회
     @GetMapping("/diaries/{diaryId}")
-    ResponseEntity<DetailDiaryResponse> getDiary(@PathVariable long diaryId) {
+    ResponseEntity<DetailDiaryResponse> getDiary(
+            @PathVariable @Min(value = 1L, message = "다이어리 식별자는 양수로 이루어져야 합니다.") long diaryId
+    ) {
         Diary diary = diaryService.getDiaryDetailById(diaryId);
         return ResponseEntity.ok(DetailDiaryResponse.from(diary));
     }
 
+    // 일기 수정
     @PatchMapping("/diaries/{diaryId}")
     ResponseEntity<DetailDiaryResponse> updateDiary(
             @PathVariable @Min(value = 1L, message = "다이어리 식별자는 양수로 이루어져야 합니다.") long diaryId,
+            @RequestHeader("Member-Id") Long memberId,
             @Validated @RequestBody DiaryRequest diaryRequest)
     {
-        Diary updateDiary = diaryService.updateDiary(diaryId, diaryRequest.getTitle(), diaryRequest.getContent());
+        Diary updateDiary = diaryService.updateDiary(
+                diaryId,
+                diaryRequest.getTitle(),
+                diaryRequest.getContent(),
+                memberId
+        );
         return ResponseEntity.ok(DetailDiaryResponse.from(updateDiary));
     }
 
+    // 일기 삭제
     @DeleteMapping("/diaries/{diaryId}")
     ResponseEntity<DiaryResponse> deleteDiary(
             @PathVariable @Min(value = 1L, message = "다이어리 식별자는 양수로 이루어져야 합니다.") long diaryId
@@ -62,5 +99,28 @@ ResponseEntity<DiaryResponse> deleteDiary(
         diaryService.deleteDiary(diaryId);
         return ResponseEntity.ok().build();
     }
+
+    // 카테고리 유효성 검사 메서드 (POST에서 사용, null 불가)
+    private Category validateCreateCategory(String category) {
+        if (category == null) {
+            throw new DiaryException(ErrorCode.INVALID_INPUT_CATEGORY_VALUE);
+        }
+        return validateCategory(category);
+    }
+
+    // 카테고리 유효성 검사 메서드 (GET에서 사용, null 허용)
+    private Category validateGetCategory(String category) {
+        if (category == null) return null;
+        return validateCategory(category);
+    }
+
+    // 카테고리 값을 검증하고 변환하는 메서드
+    private Category validateCategory(String categoryName) {
+        try {
+            return Category.valueOf(categoryName.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new DiaryException(ErrorCode.CATEGORY_NOT_FOUND);
+        }
+    }
 }
 

src/main/java/org/sopt/diary/api/controller/MemberController.java

@@ -0,0 +1,38 @@
+package org.sopt.diary.api.controller;
+
+import jakarta.validation.Valid;
+import org.sopt.diary.api.dto.request.LoginRequest;
+import org.sopt.diary.api.dto.request.SignupRequest;
+import org.sopt.diary.api.dto.response.MemberResponse;
+import org.sopt.diary.service.MemberService;
+import org.springframework.http.ResponseEntity;
+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("/luckybicky")
+public class MemberController {
+    private final MemberService memberService;
+
+    public MemberController(MemberService memberService) {
+        this.memberService = memberService;
+    }
+
+    @PostMapping("/signup")
+    public ResponseEntity<MemberResponse> signup(
+            @Valid @RequestBody SignupRequest memberRequest
+    ) {
+        Long memberId = memberService.signupUser(memberRequest.getUsername(), memberRequest.getPassword(), memberRequest.getNickname(), memberRequest.getAge());
+        return ResponseEntity.ok(new MemberResponse(memberId));
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity<MemberResponse> login(
+            @Valid @RequestBody LoginRequest memberRequest
+    ) {
+        Long memberId = memberService.loginUser(memberRequest.getUsername(), memberRequest.getPassword());
+        return ResponseEntity.ok(new MemberResponse(memberId));
+    }
+}

src/main/java/org/sopt/diary/api/dto/request/DiaryRequest.java

@@ -6,23 +6,25 @@
 
 public class DiaryRequest {
     @NotBlank(message = "제목을 입력해주세요.")
-    @Size(max = 30, message = "제목은 30자를 초과할 수 없습니다.")
+    @Size(max = 10, message = "제목은 10자를 초과할 수 없습니다.")
     private final String title;
 
     @NotBlank(message = "내용을 입력해주세요.")
-    @Size(max = 100, message = "내용은 100자를 초과할 수 없습니다.")
+    @Size(max = 30, message = "내용은 30자를 초과할 수 없습니다.")
     private final String content;
 
-    public DiaryRequest(String title, String content) {
+    private final String category;
+    private final Boolean isPublic;
+
+    public DiaryRequest(String title, String content, String category, Boolean isPublic) {
         this.title = title;
         this.content = content;
+        this.category = category;
+        this.isPublic = isPublic;
     }
 
-    public String getTitle() {
-        return title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-}
+    public String getTitle() { return title; }
+    public String getContent() { return content; }
+    public String getCategory() { return category; }
+    public Boolean getIsPublic() { return isPublic; }
+}

src/main/java/org/sopt/diary/api/dto/request/LoginRequest.java

@@ -0,0 +1,19 @@
+package org.sopt.diary.api.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+
+public class LoginRequest {
+    @NotBlank(message = "유저이름을 입력해주세요.")
+    private final String username;
+
+    @NotBlank(message = "비밀번호를 입력해주세요.")
+    private final String password;
+
+    public LoginRequest(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() { return username; }
+    public String getPassword() { return password; }
+}

src/main/java/org/sopt/diary/api/dto/request/SignupRequest.java

@@ -0,0 +1,30 @@
+package org.sopt.diary.api.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public class SignupRequest {
+    @NotBlank(message = "유저이름을 입력해주세요.")
+    private final String username;
+
+    @NotBlank(message = "비밀번호를 입력해주세요.")
+    private final String password;
+
+    @NotBlank(message = "닉네임을 입력해주세요.")
+    private final String nickname;
+
+    @NotNull(message = "나이를 입력해주세요.")
+    private final Integer age;
+
+    public SignupRequest(String username, String password, String nickname, Integer age) {
+        this.username = username;
+        this.password = password;
+        this.nickname = nickname;
+        this.age = age;
+    }
+
+    public String getUsername() { return username; }
+    public String getPassword() { return password; }
+    public String getNickname() { return nickname; }
+    public Integer getAge() { return age; }
+}

src/main/java/org/sopt/diary/api/dto/response/DetailDiaryResponse.java

@@ -9,7 +9,9 @@
 다이어리 상세 조회 시 필요한 모든 정보(id, title, content, createdAt, updatedAt)를 제공하는 DTO
  */
 @JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드는 포함하지 않음
-public record DetailDiaryResponse(long id, String title, String content, String createdAt, String updatedAt) {
+public record DetailDiaryResponse(
+        long id, String title, String content, String createdAt, String updatedAt, String category, String nickname
+) {
 
     public static DetailDiaryResponse from(Diary diary) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss");
@@ -18,7 +20,9 @@ public static DetailDiaryResponse from(Diary diary) {
                 diary.getTitle(),
                 diary.getContent(),
                 diary.getCreatedAt().format(formatter),
-                diary.getUpdatedAt() != null ? diary.getUpdatedAt().format(formatter) : null
+                diary.getUpdatedAt() != null ? diary.getUpdatedAt().format(formatter) : null,
+                diary.getCategory(),
+                diary.getNickname()
         );
     }
 }

src/main/java/org/sopt/diary/api/dto/response/DiaryListResponse.java

@@ -13,7 +13,7 @@ public record DiaryListResponse(List<DiaryResponse> diaries) {
     // Diary 리스트를 받아 DiaryResponse 리스트로 변환
     public static DiaryListResponse from(List<Diary> diaries) {
         List<DiaryResponse> diaryResponses = diaries.stream()
-                .map(diary -> new DiaryResponse(diary.getId(), diary.getTitle()))
+                .map(diary -> new DiaryResponse(diary.getId(), diary.getTitle(), diary.getCreatedAt(), diary.getNickname()))
                 .collect(Collectors.toList());
         return new DiaryListResponse(diaryResponses);
     }

src/main/java/org/sopt/diary/api/dto/response/DiaryResponse.java

@@ -3,13 +3,17 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.sopt.diary.domain.entity.DiaryEntity;
 
+import java.time.LocalDateTime;
+
 /*
-다이어리 목록 조회 시 필요한 정보(id, title)를 제공하는 DTO
+다이어리 목록 조회 시 필요한 정보(id, title, createdAt, nickname)를 제공하는 DTO
  */
 @JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드는 포함하지 않음
 public class DiaryResponse {
     private final long id;
     private String title;
+    private LocalDateTime createdAt;
+    private String nickname;
 
     // id만 반환하는 생성자
     public DiaryResponse(long id) {
@@ -22,18 +26,29 @@ public DiaryResponse(long id, String title) {
         this.title = title;
     }
 
+    // id와 title, createdAt, nickname 을 모두 반환하는 생성자
+    public DiaryResponse(long id, String title, LocalDateTime createdAt, String nickname) {
+        this.id = id;
+        this.title = title;
+        this.createdAt = createdAt;
+        this.nickname = nickname;
+    }
+
     public static DiaryResponse from(DiaryEntity diaryEntity) {
         return new DiaryResponse(
                 diaryEntity.getId(),
-                diaryEntity.getTitle()
+                diaryEntity.getTitle(),
+                diaryEntity.getCreatedAt(),
+                diaryEntity.getNickname()
         );
     }
 
     public long getId() {
         return id;
     }
-
     public String getTitle() {
         return title;
     }
+    public LocalDateTime getCreatedAt() { return createdAt; }
+    public String getNickname() { return nickname; }
 }