Skip to content

Commit db03c23

Browse files
tape4tape4
committed
Merge remote-tracking branch 'origin/develop' into fix/regiseter
2 parents e444c37 + 9bbdc55 commit db03c23

16 files changed

+138
-14
lines changed

‎.github/ISSUE_TEMPLATE/♻️--refactor--리펙토링.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "♻️ [Refactor] 리펙토링"
3+
about: 리펙토링을 위한 이슈 템플릿
4+
title: "♻️ [Refactor] "
5+
labels: "♻️refactor"
6+
assignees: ''
7+
8+
---
9+
10+
## 📝 개요
11+
- 자세한 개요 작성
12+
13+
## ✔️ To-Do
14+
- [ ] 투두 내용 작성
15+
16+
## 👀 ETC
17+
- 참고자료 등 기타 내용 작성

‎.github/ISSUE_TEMPLATE/✨--feat--기능-추가.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "✨ [Feat] 기능 추가"
3+
about: 새로운 기능을 추가하기 위한 이슈 템플릿
4+
title: "✨ [Feat] "
5+
labels: "✨feature"
6+
assignees: ''
7+
8+
---
9+
10+
## 📝 개요
11+
- 자세한 개요 작성
12+
13+
## ✔️ To-Do
14+
- [ ] 투두 내용 작성
15+
16+
## 👀 ETC
17+
- 참고자료 등 기타 내용 작성

‎.github/ISSUE_TEMPLATE/🐛--fix--수정.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "🐛 [Fix] 수정"
3+
about: 오류 수정을 위한 이슈 템플릿
4+
title: "🐛 [Fix] "
5+
labels: "🐛Bug"
6+
assignees: ''
7+
8+
---
9+
10+
## 📝 개요
11+
- 자세한 개요 작성
12+
13+
## ✔️ To-Do
14+
- [ ] 투두 내용 작성
15+
16+
## 👀 ETC
17+
- 참고자료 등 기타 내용 작성

‎.github/ISSUE_TEMPLATE/🚀--chore--기타-수정-사항.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "🚀 [Chore] 기타 수정 사항"
3+
about: 기타 수정 사항을 위한 이슈 템플릿
4+
title: "🚀 [Chore] "
5+
labels: "🚀chore"
6+
assignees: ''
7+
8+
---
9+
10+
## 📝 개요
11+
- 자세한 개요 작성
12+
13+
## ✔️ To-Do
14+
- [ ] 투두 내용 작성
15+
16+
## 👀 ETC
17+
- 참고자료 등 기타 내용 작성

‎.github/pull_request_template.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## 📍 PR 타입 (하나 이상 선택)
2+
- [ ] 기능 추가
3+
- [ ] 버그 수정
4+
- [ ] 의존성, 환경 변수, 빌드 관련 코드 업데이트
5+
- [ ] 기타 사소한 수정
6+
7+
## ❗️ 관련 이슈 링크
8+
Close #
9+
10+
## 📌 개요
11+
-
12+
13+
## 🔁 변경 사항 (커밋 코드와 함께)
14+
15+
## 📸 스크린샷 (필수 x)
16+
17+
## 👀 기타 더 이야기해볼 점 (필수 x)
18+
19+
## ✅ 체크 리스트
20+
- [ ] PR 템플릿에 맞추어 작성했어요.
21+
- [ ] 변경 내용에 대한 테스트를 진행했어요.
22+
- [ ] 프로그램이 정상적으로 동작해요.
23+
- [ ] PR에 적절한 라벨을 선택했어요.
24+
- [ ] 불필요한 코드는 삭제했어요.

‎.github/workflows/PROD_SERVER_CICD.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ jobs:
7979
echo "spring.datasource.username=${{ secrets.DATASOURCE_DB_USERNAME }}" >> ./src/main/resources/application-prod.properties
8080
echo "spring.datasource.password=${{ secrets.DATASOURCE_DB_PASSWORD }}" >> ./src/main/resources/application-prod.properties
8181
echo "spring.data.redis.host=${{ secrets.REDIS_URL }}" >> ./src/main/resources/application-prod.properties
82-
echo "spring.security.user.name=${{ secrets.SECURITY_USER_NAME }} >> ./src/main/resources/application-prod.properties
83-
echo "spring.security.user.password=${{ secrets.SECURITY_USER_PASSWORD }} >> ./src/main/resources/application-prod.properties
82+
83+
echo "spring.security.user.name=${{ secrets.SPRING_SECURITY_USER_NAME }}" >> ./src/main/resources/application-prod.properties
84+
echo "spring.security.user.password=${{ secrets.SPRING_SECURITY_USER_PASSWORD }}" >> ./src/main/resources/application-prod.properties
8485
8586
echo "jwt.access-secret-key=${{ secrets.JWT_SECRETKEY }}" >> ./src/main/resources/application.properties
8687
echo "jwt.refresh-secret-key=${{ secrets.JWT_REFESH_SECRETKEY }}" >> ./src/main/resources/application.properties

‎.github/workflows/TEST_SERVER_CICD.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ jobs:
7979
echo "spring.datasource.username=${{ secrets.DATASOURCE_DB_USERNAME }}" >> ./src/main/resources/application-prod.properties
8080
echo "spring.datasource.password=${{ secrets.DATASOURCE_DB_PASSWORD }}" >> ./src/main/resources/application-prod.properties
8181
echo "spring.data.redis.host=${{ secrets.REDIS_URL }}" >> ./src/main/resources/application-prod.properties
82-
echo "spring.security.user.name=${{ secrets.SECURITY_USER_NAME }} >> ./src/main/resources/application-prod.properties
83-
echo "spring.security.user.password=${{ secrets.SECURITY_USER_PASSWORD }} >> ./src/main/resources/application-prod.properties
82+
83+
echo "spring.security.user.name=${{ secrets.SPRING_SECURITY_USER_NAME }}" >> ./src/main/resources/application-prod.properties
84+
echo "spring.security.user.password=${{ secrets.SPRING_SECURITY_USER_PASSWORD }}" >> ./src/main/resources/application-prod.properties
8485
8586
echo "jwt.access-secret-key=${{ secrets.JWT_SECRETKEY }}" >> ./src/main/resources/application.properties
8687
echo "jwt.refresh-secret-key=${{ secrets.JWT_REFESH_SECRETKEY }}" >> ./src/main/resources/application.properties
@@ -104,9 +105,6 @@ jobs:
104105
echo "spring.cloud.aws.s3.bucket.font.prefix=${{ secrets.AWS_BUCKET_NAME_FONT_PREFIX }}" >> ./src/main/resources/application-infrastructure.properties
105106
echo "spring.cloud.aws.sqs.queue-name=${{ secrets.AWS_FONT_CREATE_QUEUE_NAME }}" >> ./src/main/resources/application-infrastructure.properties
106107
107-
echo "spring.security.user.name=${{ secrets.SPRING_SECURITY_USER_NAME }}" >> ./src/main/resources/application-prod.properties
108-
echo "spring.security.user.password=${{ secrets.SPRING_SECURITY_USER_PASSWORD }}" >> ./src/main/resources/application-prod.properties
109-
110108
echo "discord.webhook.error-url=${{ secrets.TEST_SERVER_DISCORD_WEBHOOK_ERROR_URL }}" >> ./src/main/resources/application-infrastructure.properties
111109
echo "url.base=https://fontory.co.kr" >> ./src/main/resources/application-infrastructure.properties
112110

‎src/main/java/org/fontory/fontorybe/font/controller/FontController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.fontory.fontorybe.font.controller.port.FontService;
3131
import org.fontory.fontorybe.font.domain.Font;
3232
import org.springframework.data.domain.Page;
33-
import org.springframework.http.HttpHeaders;
3433
import org.springframework.http.HttpStatus;
3534
import org.springframework.http.MediaType;
3635
import org.springframework.http.ResponseEntity;
@@ -124,7 +123,7 @@ public ResponseEntity<?> getFontProgress(@Login UserPrincipal userPrincipal) {
124123
@Parameter(name = "fontId", description = "수정할 폰트 ID")
125124
@PutMapping("/{fontId}")
126125
public ResponseEntity<?> updateFont(
127-
@RequestBody FontUpdateDTO fontUpdateDTO,
126+
@RequestBody @Valid FontUpdateDTO fontUpdateDTO,
128127
@PathVariable Long fontId,
129128
@Login UserPrincipal userPrincipal
130129
) {
@@ -260,7 +259,7 @@ public ResponseEntity<?> getPopularFonts(@Login(required = false) UserPrincipal
260259
@Parameter(name = "fontId", description = "수정할 폰트 ID")
261260
@PatchMapping("/progress/{fontId}")
262261
public ResponseEntity<?> updateFontProgress(
263-
@RequestBody FontProgressUpdateDTO fontProgressUpdateDTO,
262+
@RequestBody @Valid FontProgressUpdateDTO fontProgressUpdateDTO,
264263
@PathVariable Long fontId
265264
) {
266265
log.info("Request received: Update font progress ID: {}, request: {}",

‎src/main/java/org/fontory/fontorybe/font/controller/dto/FontCreateDTO.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jakarta.validation.constraints.NotBlank;
44
import jakarta.validation.constraints.Pattern;
5+
import jakarta.validation.constraints.Size;
56
import lombok.AllArgsConstructor;
67
import lombok.Builder;
78
import lombok.Getter;
@@ -12,9 +13,11 @@
1213
public class FontCreateDTO {
1314

1415
@NotBlank(message = "폰트 이름은 필수 입력 값입니다.")
16+
@Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 이하로 입력해주세요.")
1517
private String name;
1618

1719
@NotBlank(message = "폰트 예시는 필수 입력 값입니다.")
20+
@Size(min = 10, max = 255, message = "폰트 예시는 10자 이상 255자 이하로 입력해주세요.")
1821
private String example;
1922

2023
@Pattern(regexp = "^$|^01[016-9]\\d{7,8}$", message = "휴대폰 번호 형식이 올바르지 않습니다.")

‎src/main/java/org/fontory/fontorybe/font/controller/dto/FontProgressUpdateDTO.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package org.fontory.fontorybe.font.controller.dto;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4+
import jakarta.validation.constraints.NotNull;
45
import lombok.Builder;
56
import lombok.Getter;
67
import org.fontory.fontorybe.font.infrastructure.entity.FontStatus;
78

89
@Getter
910
@Builder
1011
public class FontProgressUpdateDTO {
11-
@Schema(description = "폰트의 상태 (PROGRESS, DONE)")
12+
@NotNull(message = "폰트 상태는 필수입니다.")
13+
@Schema(description = "폰트의 상태 (PROGRESS, DONE, FAILED)")
1214
private FontStatus status;
1315
}

0 commit comments

Comments
 (0)