Merge pull request #47 from ItRecode/feature/BE-30

[BE-30] 레코드 작성, 레코드 조회

Author: kdomo

src/main/java/com/recordit/server/controller/RecordController.java

@@ -1,7 +1,10 @@
 package com.recordit.server.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +17,7 @@
 
 import com.recordit.server.dto.record.RecordDetailResponseDto;
 import com.recordit.server.dto.record.WriteRecordRequestDto;
+import com.recordit.server.dto.record.WriteRecordResponseDto;
 import com.recordit.server.exception.ErrorMessage;
 import com.recordit.server.service.RecordService;
 
@@ -44,11 +48,11 @@ public class RecordController {
 			)
 	})
 	@PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
-	public ResponseEntity<?> writeRecord(
+	public ResponseEntity<WriteRecordResponseDto> writeRecord(
 			@ApiParam(required = true) @RequestPart(required = true) @Valid WriteRecordRequestDto writeRecordRequestDto,
-			@ApiParam @RequestPart MultipartFile file
+			@ApiParam @RequestPart(required = false) List<MultipartFile> files
 	) {
-		return null;
+		return ResponseEntity.status(HttpStatus.CREATED).body(recordService.writeRecord(writeRecordRequestDto, files));
 	}
 
 	@ApiOperation(
@@ -68,7 +72,7 @@ public ResponseEntity<?> writeRecord(
 	@GetMapping("/{recordId}")
 	public ResponseEntity<RecordDetailResponseDto> getDetailRecord(
 			@PathVariable("recordId") Long recordId) {
-		return null;
+		return ResponseEntity.ok().body(recordService.getDetailRecord(recordId));
 	}
 
 }

src/main/java/com/recordit/server/domain/Record.java

@@ -13,6 +13,8 @@
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
+import com.recordit.server.dto.record.WriteRecordRequestDto;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -54,4 +56,40 @@ public class Record extends BaseEntity {
 	@JoinColumn(name = "RECORD_ICON_ID")
 	private RecordIcon recordIcon;
 
+	private Record(
+			RecordCategory recordCategory,
+			Member writer,
+			String title,
+			String content,
+			Integer numOfImage,
+			RecordColor recordColor,
+			RecordIcon recordIcon
+	) {
+		this.recordCategory = recordCategory;
+		this.writer = writer;
+		this.title = title;
+		this.content = content;
+		this.numOfImage = numOfImage;
+		this.recordColor = recordColor;
+		this.recordIcon = recordIcon;
+	}
+
+	public static Record of(
+			WriteRecordRequestDto writeRecordRequestDto,
+			RecordCategory recordCategory,
+			Member member,
+			Integer numOfImage,
+			RecordColor recordColor,
+			RecordIcon recordIcon
+	) {
+		return new Record(
+				recordCategory,
+				member,
+				writeRecordRequestDto.getTitle(),
+				writeRecordRequestDto.getContent(),
+				numOfImage,
+				recordColor,
+				recordIcon
+		);
+	}
 }

src/main/java/com/recordit/server/dto/record/RecordDetailResponseDto.java

@@ -1,6 +1,7 @@
 package com.recordit.server.dto.record;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -18,21 +19,39 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class RecordDetailResponseDto {
+	private Long recordId;
+	private Long categoryId;
+	private String categoryName;
 	private String title;
 	private String content;
-	private String hex;
+	private String writer;
+	private String colorName;
 	private String iconName;
 	private LocalDateTime createdAt;
-	private String imageUrl;
+	private List<String> imageUrls;
 
 	@Builder
-	public RecordDetailResponseDto(String title, String content, String hex, String iconName, LocalDateTime createdAt,
-			String imageUrl) {
+	public RecordDetailResponseDto(
+			Long recordId,
+			Long categoryId,
+			String categoryName,
+			String title,
+			String content,
+			String writer,
+			String colorName,
+			String iconName,
+			LocalDateTime createdAt,
+			List<String> imageUrls
+	) {
+		this.recordId = recordId;
+		this.categoryId = categoryId;
+		this.categoryName = categoryName;
 		this.title = title;
 		this.content = content;
-		this.hex = hex;
+		this.writer = writer;
+		this.colorName = colorName;
 		this.iconName = iconName;
 		this.createdAt = createdAt;
-		this.imageUrl = imageUrl;
+		this.imageUrls = imageUrls;
 	}
 }

src/main/java/com/recordit/server/dto/record/WriteRecordRequestDto.java

@@ -2,7 +2,6 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
@@ -32,18 +31,24 @@ public class WriteRecordRequestDto {
 	@NotBlank(message = "레코드 내용은 빈 값일 수 없습니다.")
 	private String content;
 
-	@Pattern(regexp = "^#[A-Z0-9]{6}", message = "'#FFBF00'의 형태로 입력해 주세요.")
-	private String hex;
+	@NotBlank(message = "컬러 이름은 빈 값일 수 없습니다.")
+	private String colorName;
 
-	@NotBlank(message = "아이콘이름은 빈 값일 수 없습니다.")
+	@NotBlank(message = "아이콘 이름은 빈 값일 수 없습니다.")
 	private String iconName;
 
 	@Builder
-	public WriteRecordRequestDto(Long recordCategoryId, String title, String content, String hex, String iconName) {
+	public WriteRecordRequestDto(
+			Long recordCategoryId,
+			String title,
+			String content,
+			String colorName,
+			String iconName
+	) {
 		this.recordCategoryId = recordCategoryId;
 		this.title = title;
 		this.content = content;
-		this.hex = hex;
+		this.colorName = colorName;
 		this.iconName = iconName;
 	}
 }

src/main/java/com/recordit/server/dto/record/WriteRecordResponseDto.java

@@ -0,0 +1,25 @@
+package com.recordit.server.dto.record;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Getter
+@ToString
+@ApiModel
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class WriteRecordResponseDto {
+	private Long recordId;
+
+	@Builder
+	public WriteRecordResponseDto(Long recordId) {
+		this.recordId = recordId;
+	}
+}

src/main/java/com/recordit/server/exception/member/MemberNotFoundException.java

@@ -0,0 +1,7 @@
+package com.recordit.server.exception.member;
+
+public class MemberNotFoundException extends RuntimeException {
+	public MemberNotFoundException(String message) {
+		super(message);
+	}
+}

src/main/java/com/recordit/server/exception/record/RecordColorNotFoundException.java

@@ -0,0 +1,7 @@
+package com.recordit.server.exception.record;
+
+public class RecordColorNotFoundException extends RuntimeException {
+	public RecordColorNotFoundException(String message) {
+		super(message);
+	}
+}

src/main/java/com/recordit/server/exception/record/RecordExceptionHandler.java

@@ -0,0 +1,38 @@
+package com.recordit.server.exception.record;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import com.recordit.server.controller.RecordController;
+import com.recordit.server.exception.ErrorMessage;
+import com.recordit.server.exception.member.MemberNotFoundException;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestControllerAdvice(basePackageClasses = RecordController.class)
+public class RecordExceptionHandler {
+	@ExceptionHandler(MemberNotFoundException.class)
+	public ResponseEntity<ErrorMessage> handleMemberNotFoundException(
+			MemberNotFoundException exception) {
+		return ResponseEntity.badRequest()
+				.body(ErrorMessage.of(exception, HttpStatus.BAD_REQUEST));
+	}
+
+	@ExceptionHandler(RecordColorNotFoundException.class)
+	public ResponseEntity<ErrorMessage> handleRecordColorNotFoundException(
+			RecordColorNotFoundException exception) {
+		return ResponseEntity.badRequest()
+				.body(ErrorMessage.of(exception, HttpStatus.BAD_REQUEST));
+	}
+
+	@ExceptionHandler(RecordNotFoundException.class)
+	public ResponseEntity<ErrorMessage> handleRecordNotFoundException(
+			RecordNotFoundException exception) {
+		return ResponseEntity.badRequest()
+				.body(ErrorMessage.of(exception, HttpStatus.BAD_REQUEST));
+	}
+}
+

src/main/java/com/recordit/server/exception/record/RecordIconNotFoundException.java

@@ -0,0 +1,7 @@
+package com.recordit.server.exception.record;
+
+public class RecordIconNotFoundException extends RuntimeException {
+	public RecordIconNotFoundException(String message) {
+		super(message);
+	}
+}

src/main/java/com/recordit/server/exception/record/RecordNotFoundException.java

@@ -0,0 +1,7 @@
+package com.recordit.server.exception.record;
+
+public class RecordNotFoundException extends RuntimeException {
+	public RecordNotFoundException(String message) {
+		super(message);
+	}
+}