Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.fontory.fontorybe.font.controller.port.FontService;
import org.fontory.fontorybe.font.domain.Font;
import org.springframework.data.domain.Page;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -124,7 +123,7 @@ public ResponseEntity<?> getFontProgress(@Login UserPrincipal userPrincipal) {
@Parameter(name = "fontId", description = "μˆ˜μ •ν•  폰트 ID")
@PutMapping("/{fontId}")
public ResponseEntity<?> updateFont(
@RequestBody FontUpdateDTO fontUpdateDTO,
@RequestBody @Valid FontUpdateDTO fontUpdateDTO,
@PathVariable Long fontId,
@Login UserPrincipal userPrincipal
) {
Expand Down Expand Up @@ -260,7 +259,7 @@ public ResponseEntity<?> getPopularFonts(@Login(required = false) UserPrincipal
@Parameter(name = "fontId", description = "μˆ˜μ •ν•  폰트 ID")
@PatchMapping("/progress/{fontId}")
public ResponseEntity<?> updateFontProgress(
@RequestBody FontProgressUpdateDTO fontProgressUpdateDTO,
@RequestBody @Valid FontProgressUpdateDTO fontProgressUpdateDTO,
@PathVariable Long fontId
) {
log.info("Request received: Update font progress ID: {}, request: {}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -12,9 +13,11 @@
public class FontCreateDTO {

@NotBlank(message = "폰트 이름은 ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String name;

@NotBlank(message = "폰트 μ˜ˆμ‹œλŠ” ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 10, max = 255, message = "폰트 μ˜ˆμ‹œλŠ” 10자 이상 255자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String example;

@Pattern(regexp = "^$|^01[016-9]\\d{7,8}$", message = "νœ΄λŒ€ν° 번호 ν˜•μ‹μ΄ μ˜¬λ°”λ₯΄μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package org.fontory.fontorybe.font.controller.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import org.fontory.fontorybe.font.infrastructure.entity.FontStatus;

@Getter
@Builder
public class FontProgressUpdateDTO {
@Schema(description = "폰트의 μƒνƒœ (PROGRESS, DONE)")
@NotNull(message = "폰트 μƒνƒœλŠ” ν•„μˆ˜μž…λ‹ˆλ‹€.")
@Schema(description = "폰트의 μƒνƒœ (PROGRESS, DONE, FAILED)")
private FontStatus status;
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
package org.fontory.fontorybe.font.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class FontUpdateDTO {
@NotBlank(message = "폰트 이름은 ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String name;

@NotBlank(message = "폰트 μ˜ˆμ‹œλŠ” ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 10, max = 255, message = "폰트 μ˜ˆμ‹œλŠ” 10자 이상 255자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String example;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.Builder;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -71,7 +72,7 @@ public ResponseEntity<MyProfileResponse> getMyProfile(
@PatchMapping(consumes = MULTIPART_FORM_DATA_VALUE)
public ResponseEntity<MyProfileResponse> updateMember(
@Login UserPrincipal userPrincipal,
@RequestPart MemberUpdateRequest req,
@RequestPart @Valid MemberUpdateRequest req,
@SingleFileUpload @RequestPart("file") List<MultipartFile> files
) {
Long requestMemberId = userPrincipal.getId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.Builder;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -58,7 +59,7 @@ public ResponseEntity<Boolean> checkDuplicate(
@PostMapping(consumes = MULTIPART_FORM_DATA_VALUE)
public ResponseEntity<MemberCreateResponse> register(
@Login UserPrincipal user,
@RequestPart InitMemberInfoRequest req,
@RequestPart @Valid InitMemberInfoRequest req,
@SingleFileUpload @RequestPart("file") List<MultipartFile> files
) {
Long requestMemberId = user.getId();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package org.fontory.fontorybe.member.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Past;
import jakarta.validation.constraints.Size;
import java.time.LocalDate;

import lombok.AllArgsConstructor;
Expand All @@ -13,8 +17,17 @@
@ToString
@AllArgsConstructor
public class InitMemberInfoRequest {
@NotBlank(message = "λ‹‰λ„€μž„μ€ ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 2, max = 20, message = "λ‹‰λ„€μž„μ€ 2자 이상 20자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String nickname;

@NotNull(message = "성별을 μ„ νƒν•΄μ£Όμ„Έμš”.")
private Gender gender;

@NotNull(message = "생년월일을 μž…λ ₯ν•΄μ£Όμ„Έμš”.")
@Past(message = "생년월일은 κ³Όκ±° λ‚ μ§œλ§Œ κ°€λŠ₯ν•©λ‹ˆλ‹€.")
private LocalDate birth;

@NotNull(message = "μ΄μš©μ•½κ΄€ λ™μ˜ μ—¬λΆ€λ₯Ό μ„ νƒν•΄μ£Όμ„Έμš”.")
private Boolean terms;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.fontory.fontorybe.member.controller.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -10,6 +13,10 @@
@ToString
@AllArgsConstructor
public class MemberUpdateRequest {
@NotBlank(message = "λ‹‰λ„€μž„μ€ ν•„μˆ˜ μž…λ ₯ κ°’μž…λ‹ˆλ‹€.")
@Size(min = 2, max = 20, message = "λ‹‰λ„€μž„μ€ 2자 이상 20자 μ΄ν•˜λ‘œ μž…λ ₯ν•΄μ£Όμ„Έμš”.")
private String nickname;

@NotNull(message = "μ΄μš©μ•½κ΄€ λ™μ˜ μ—¬λΆ€λ₯Ό μ„ νƒν•΄μ£Όμ„Έμš”.")
private Boolean terms;
}
Loading