Feat/category

src/main/java/com/uspray/uspray/DTO/category/CategoryRequestDto.java

@@ -0,0 +1,36 @@
+package com.uspray.uspray.DTO.category;
+
+import com.uspray.uspray.domain.Category;
+import com.uspray.uspray.domain.Member;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(description = "카테고리 DTO")
+public class CategoryRequestDto {
+
+  @NotNull
+  @Schema(description = "카테고리 이름", example = "카테고리 이름")
+  private String name;
+
+  @NotNull
+  @Schema(description = "카테고리 색상", example = "#FFFFFF")
+  private String color;
+
+
+  public Category toEntity(Member member) {
+    return Category.builder()
+        .name(name)
+        .color(color)
+        .member(member)
+        .build();
+  }
+
+}

src/main/java/com/uspray/uspray/DTO/category/CategoryResponseDto.java

@@ -0,0 +1,35 @@
+package com.uspray.uspray.DTO.category;
+
+import com.uspray.uspray.domain.Category;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@Builder
+@NoArgsConstructor
+public class CategoryResponseDto {
+
+  @Schema(description = "카테고리 ID", example = "1")
+  private Long id;
+
+  @Schema(description = "카테고리 소유자 ID", example = "1")
+  private Long memberId;
+
+  @Schema(description = "카테고리 이름", example = "카테고리 이름")
+  private String name;
+
+  @Schema(description = "카테고리 색상", example = "#FFFFFF")
+  private String color;
+
+  @Schema(description = "카테고리 순서", example = "1")
+  private Integer order;
+
+  public static CategoryResponseDto of(Category category) {
+    return new CategoryResponseDto(category.getId(), category.getMember().getId(),
+        category.getName(), category.getColor(), category.getOrder());
+  }
+}

src/main/java/com/uspray/uspray/InitDb.java

@@ -1,5 +1,6 @@
 package com.uspray.uspray;
 
+import com.uspray.uspray.domain.Category;
 import com.uspray.uspray.domain.Member;
 import com.uspray.uspray.domain.Pray;
 import java.time.LocalDate;
@@ -14,40 +15,49 @@
 @RequiredArgsConstructor
 public class InitDb {
 
-    private final InitService initService;
-    @PostConstruct
-    public void init() {
-        initService.dbInit();
-    }
+  private final InitService initService;
 
-    @Component
-    @Transactional
-    @RequiredArgsConstructor
-    static class InitService {
-
-        private final EntityManager em;
-        private final PasswordEncoder passwordEncoder;
-
-        @Transactional
-        public void dbInit() {
-            Member member = Member.builder()
-                .userId("test")
-                .password(passwordEncoder.encode("test"))
-                .name("홍길동")
-                .phone("01012345678")
-                .birth("2002-02-01")
-                .gender("female")
-                .build();
-            em.persist(member);
-
-            Pray pray = Pray.builder()
-                .content("테스트 기도")
-                .deadline(LocalDate.parse("2025-01-01"))
-                .member(member)
-                .build();
-
-            em.persist(pray);
-        }
+  @PostConstruct
+  public void init() {
+    initService.dbInit();
+  }
+
+  @Component
+  @Transactional
+  @RequiredArgsConstructor
+  static class InitService {
 
+    private final EntityManager em;
+    private final PasswordEncoder passwordEncoder;
+
+    @Transactional
+    public void dbInit() {
+      Member member = Member.builder()
+          .userId("test")
+          .password(passwordEncoder.encode("test"))
+          .name("홍길동")
+          .phone("01012345678")
+          .birth("2002-02-01")
+          .gender("female")
+          .build();
+      em.persist(member);
+
+      Category category = Category.builder()
+          .name("기타 카테고리")
+          .color("#FFFFFF")
+          .member(member)
+          .build();
+      em.persist(category);
+
+      Pray pray = Pray.builder()
+          .content("테스트 기도")
+          .deadline(LocalDate.parse("2025-01-01"))
+          .member(member)
+          .category(category)
+          .build();
+
+      em.persist(pray);
     }
+
+  }
 }

src/main/java/com/uspray/uspray/controller/CategoryController.java

@@ -1,2 +1,87 @@
-package com.uspray.uspray.controller;public class CategoryController {
+package com.uspray.uspray.controller;
+
+import com.uspray.uspray.DTO.ApiResponseDto;
+import com.uspray.uspray.DTO.category.CategoryRequestDto;
+import com.uspray.uspray.DTO.category.CategoryResponseDto;
+import com.uspray.uspray.exception.SuccessStatus;
+import com.uspray.uspray.service.CategoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/category")
+@Tag(name = "Category API", description = "카테고리 관련 API")
+@RequiredArgsConstructor
+@SecurityRequirement(name = "JWT Auth")
+public class CategoryController {
+
+  private final CategoryService categoryService;
+
+  @Operation(summary = "카테고리 조회")
+  @ApiResponse(
+      responseCode = "200",
+      description = "카테고리 조회",
+      content = @Content(schema = @Schema(implementation = CategoryResponseDto.class)))
+  @PostMapping("/{categoryId}")
+  public ApiResponseDto<CategoryResponseDto> getCategory(
+      @Parameter(hidden = true) @AuthenticationPrincipal User user,
+      @Parameter(description = "카테고리 ID", required = true) @PathVariable("categoryId") Long categoryId
+  ) {
+    return ApiResponseDto.success(SuccessStatus.GET_CATEGORY_SUCCESS,
+        categoryService.getCategory(user.getUsername(), categoryId));
+  }
+
+  @Operation(summary = "카테고리 생성")
+  @ApiResponse(
+      responseCode = "201",
+      description = "카테고리 생성",
+      content = @Content(schema = @Schema(implementation = CategoryResponseDto.class)))
+  @PostMapping()
+  public ApiResponseDto<CategoryResponseDto> createCategory(
+      @Parameter(hidden = true) @AuthenticationPrincipal User user,
+      @RequestBody @Valid CategoryRequestDto categoryRequestDto
+  ) {
+    return ApiResponseDto.success(SuccessStatus.CREATE_CATEGORY_SUCCESS,
+        categoryService.createCategory(user.getUsername(), categoryRequestDto));
+  }
+
+  @DeleteMapping("/{categoryId}")
+  public ApiResponseDto<CategoryResponseDto> deleteCategory(
+      @Parameter(hidden = true) @AuthenticationPrincipal User user,
+      @Parameter(description = "카테고리 ID", required = true) @PathVariable("categoryId") Long categoryId
+  ) {
+    return ApiResponseDto.success(SuccessStatus.DELETE_CATEGORY_SUCCESS,
+        categoryService.deleteCategory(user.getUsername(), categoryId));
+  }
+
+  @PutMapping("/{categoryId}")
+  @ApiResponse(
+      responseCode = "200",
+      description = "카테고리 수정",
+      content = @Content(schema = @Schema(implementation = CategoryResponseDto.class)))
+  @Operation(summary = "카테고리 수정")
+  public ApiResponseDto<CategoryResponseDto> updatePray(
+      @Parameter(description = "카테고리 ID", required = true) @PathVariable("categoryId") Long categoryId,
+      @RequestBody @Valid CategoryRequestDto categoryRequestDto,
+      @Parameter(hidden = true) @AuthenticationPrincipal User user
+  ) {
+    return ApiResponseDto.success(SuccessStatus.UPDATE_CATEGORY_SUCCESS,
+        categoryService.updateCategory(user.getUsername(), categoryId, categoryRequestDto));
+  }
 }

src/main/java/com/uspray/uspray/domain/Category.java

@@ -1,11 +1,16 @@
 package com.uspray.uspray.domain;
 
+import com.uspray.uspray.DTO.category.CategoryRequestDto;
 import com.uspray.uspray.common.domain.AuditingTimeEntity;
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -18,14 +23,38 @@
 @Where(clause = "deleted=false")
 public class Category extends AuditingTimeEntity {
 
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "category_id")
   @Id
   private Long id;
   private String name;
   private String color;
+  @GeneratedValue(strategy = GenerationType.SEQUENCE)
+  @Column(name = "category_order")
   private int order;
   private final Boolean deleted = false;
 
   @ManyToOne
   @JoinColumn(name = "member_id", nullable = false)
   private Member member;
+
+  @Builder
+  public Category(
+      Long id,
+      String name,
+      String color,
+      int order,
+      Member member
+  ) {
+    this.id = id;
+    this.name = name;
+    this.color = color;
+    this.order = order;
+    this.member = member;
+  }
+
+  public void update(CategoryRequestDto categoryRequestDto) {
+    this.name = categoryRequestDto.getName();
+    this.color = categoryRequestDto.getColor();
+  }
 }

src/main/java/com/uspray/uspray/domain/Pray.java

@@ -6,6 +6,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -24,7 +25,7 @@
 public class Pray extends AuditingTimeEntity {
 
   @Id
-  @GeneratedValue
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "pray_id")
   private Long id;
   @ManyToOne

src/main/java/com/uspray/uspray/exception/ErrorStatus.java

@@ -8,31 +8,31 @@
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum ErrorStatus {
-
-    /*
-     * 400 BAD_REQUEST
-     */
-    VALIDATION_EXCEPTION(HttpStatus.BAD_REQUEST, "잘못된 요청입니다."),
-    ALREADY_EXIST_ID_EXCEPTION(HttpStatus.BAD_REQUEST, "이미 사용중인 아이디입니다."),
-    INVALID_TOKEN_INFO_EXCEPTION(HttpStatus.BAD_REQUEST, "토큰 혹은 만료시간 설정이 잘못되었습니다."),
-    SENDER_RECEIVER_SAME_EXCEPTION(HttpStatus.BAD_REQUEST, "자신에게는 기도제목을 공유할 수 없습니다."),
 
-    /*
-     * 401 UNAUTHORIZED
-     */
-    PRAY_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "해당 기도제목에 대한 권한이 없습니다."),
-    TOKEN_NOT_VALID_EXCEPTION(HttpStatus.UNAUTHORIZED, "유효하지 않는 토큰입니다."),
-    SHARE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 공유할 권한이 없습니다."),
-    DELETE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 삭제할 권한이 없습니다."),
+  /*
+   * 400 BAD_REQUEST
+   */
+  VALIDATION_EXCEPTION(HttpStatus.BAD_REQUEST, "잘못된 요청입니다."),
+  ALREADY_EXIST_ID_EXCEPTION(HttpStatus.BAD_REQUEST, "이미 사용중인 아이디입니다."),
+  INVALID_TOKEN_INFO_EXCEPTION(HttpStatus.BAD_REQUEST, "토큰 혹은 만료시간 설정이 잘못되었습니다."),
+  SENDER_RECEIVER_SAME_EXCEPTION(HttpStatus.BAD_REQUEST, "자신에게는 기도제목을 공유할 수 없습니다."),
 
-    /**
-     * 404 NOT FOUND
-     */
-    NOT_FOUND_USER_EXCEPTION(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니다"),
-    PRAY_NOT_FOUND_EXCEPTION(HttpStatus.NOT_FOUND, "해당 기도제목을 찾을 수 없습니다."),
-    PRAY_ALREADY_DELETED_EXCEPTION(HttpStatus.NOT_FOUND, "원본 기도제목이 삭제되었습니다."),
-    NOT_FOUND_SHARED_PRAY_EXCEPTION(HttpStatus.NOT_FOUND, "해당 공유기도제목을 찾을 수 없습니다."),
-  ;
+  /*
+   * 401 UNAUTHORIZED
+   */
+  PRAY_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "해당 기도제목에 대한 권한이 없습니다."),
+  TOKEN_NOT_VALID_EXCEPTION(HttpStatus.UNAUTHORIZED, "유효하지 않는 토큰입니다."),
+  SHARE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 공유할 권한이 없습니다."),
+  DELETE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 삭제할 권한이 없습니다."),
+  CATEGORY_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "해당 카테고리에 대한 권한이 없습니다."),
+
+  /**
+   * 404 NOT FOUND
+   */
+  NOT_FOUND_USER_EXCEPTION(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니다"),
+  PRAY_NOT_FOUND_EXCEPTION(HttpStatus.NOT_FOUND, "해당 기도제목을 찾을 수 없습니다."),
+  PRAY_ALREADY_DELETED_EXCEPTION(HttpStatus.NOT_FOUND, "원본 기도제목이 삭제되었습니다."),
+  NOT_FOUND_SHARED_PRAY_EXCEPTION(HttpStatus.NOT_FOUND, "해당 공유기도제목을 찾을 수 없습니다.");
 
   private final HttpStatus httpStatus;
   private final String message;