Skip to content

Commit aad6b79

Browse files
author
Kim DongMin
committed
hotfix: 공지 상세조회 컨트롤러 추가, 구글폼 질문 추가, 토큰 시간 수정
1 parent d018255 commit aad6b79

5 files changed

Lines changed: 17 additions & 3 deletions

File tree

src/main/java/com/web/coreclass/domain/article/controller/ArticleController.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@ public ResponseEntity<List<ArticleDto.ArticleListResponse>> getArticleList(
5050
return ResponseEntity.ok(list);
5151
}
5252

53+
/**
54+
* (R) Read Detail: 게시글 상세 조회
55+
* [GET] /api/article/{id}
56+
*/
57+
@GetMapping("/{id}")
58+
@Operation(summary = "공지 상세 조회", description = "공지 Id 값으로 상세 내용 조회")
59+
public ResponseEntity<ArticleDto.ArticleDetailResponse> getArticleDetail(@PathVariable Long id) {
60+
ArticleDto.ArticleDetailResponse detail = articleService.getArticleDetails(id);
61+
return ResponseEntity.ok(detail);
62+
}
63+
5364
/**
5465
* (R) Read Popup List: 팝업 게시글 목록 조회
5566
* [GET] /api/article/popups

src/main/java/com/web/coreclass/domain/article/entity/Article.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Article extends BaseEntity {
2727
@Column(nullable = false)
2828
private String title; // SGEA 아카데미 오픈 특별 이벤트
2929

30-
@Column(name = "sub_title", nullable = false)
30+
@Column(name = "sub_title", nullable = true)
3131
private String subTitle; // 아카데미 런칭 기념 무료 체험 강의 및 장기 등록 할인 혜택
3232

3333
@Lob

src/main/java/com/web/coreclass/domain/googleForm/dto/GoogleFormRequestDto.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class GoogleFormRequestDto {
2525
private String overwatchClass; // entry.902463495
2626
@Schema(description = "현재 티어", example = "랭커 (TOP500), 챔피언 (Champion), 그랜드 마스터(Grand master), 마스터(Master), 다이아몬드(Diamond), 플레티넘(Platinum), 골드(Gold), 실버(Silver), 브론즈(Bronze), 언랭(Unranked)")
2727
private String overwatchTier; // entry.565147399
28-
@Schema(description = "주 포지션", example = "탱커, 척후대 (Initiator), 딜러, 힐러")
28+
@Schema(description = "주 포지션", example = "탱커, 딜러, 힐러")
2929
private String overwatchPosition; // entry.1532619185
3030

3131
// 지원자 정보
@@ -47,4 +47,6 @@ public class GoogleFormRequestDto {
4747
private String guardianName; // entry.1603110817
4848
@Schema(description = "보호자 핸드폰 번호", example = "010-0000-0000")
4949
private String guardianPhoneNumber; // entry.76570193
50+
@Schema(description = "SGEA를 어떻게 알게되셨나요?", example = "지인 추천, 인터넷 검색(네이버 / 구글), SGEA 인스타그램, 타 인스타그램, 기타(자유롭게 작성)")
51+
private String knowSgeaPath;
5052
}

src/main/java/com/web/coreclass/domain/googleForm/service/GoogleFormService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public void submitToGoogleForm(GoogleFormRequestDto request) {
4141
formData.add("entry.1475828191", request.getDiscordId());
4242
formData.add("entry.1603110817", request.getGuardianName());
4343
formData.add("entry.76570193", request.getGuardianPhoneNumber());
44+
formData.add("entry.1032992370", request.getKnowSgeaPath());
4445

4546
String pageHistory = "0"; // 기본 첫 페이지
4647

src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spring.servlet.multipart.max-request-size=10MB
4646
# ? JWT Setting (???? ??)
4747
# ==========================================
4848
jwt.secret=${JWT_SECRET}
49-
jwt.expiration-ms=3600000
49+
jwt.expiration-ms=7200000
5050

5151
# Swagger Config (?? ?? ??)
5252
springdoc.packages-to-scan=com.web.coreclass

0 commit comments

Comments
 (0)