Skip to content

[FIX] 협업 광장, 아이디어 마켓 마감 기한을 분까지만 받도록 수정 (#148) #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redblackblossom merged 3 commits into from
Feb 6, 2025
Merged

[FIX] 협업 광장, 아이디어 마켓 마감 기한을 분까지만 받도록 수정 (#148) #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd3b71d
[REFACT] 불필요한 모듈 삭제
99hyuk Feb 5, 2025
1c0c5eb
[REFACT] deadline이 분까지만 입력받도록 수정
99hyuk Feb 5, 2025
8e68f26
[FIX] 스웨거 예시 분까지만 나오도록 수정
99hyuk Feb 6, 2025
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
8 changes: 8 additions & 0 deletions src/main/java/com/brainpix/post/dto/CollaborationHubCreateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
import java.time.LocalDateTime;
import java.util.List;

import org.springframework.format.annotation.DateTimeFormat;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.NotEmpty;
Expand All @@ -18,6 +23,9 @@ public class CollaborationHubCreateDto extends PostDto {

@Future(message = "마감일은 현재 날짜보다 미래여야 합니다.")
@NotNull(message = "마감일은 필수입니다.")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(type = "string", description = "마감일 (yyyy-MM-dd HH:mm)", example = "2025-02-10 14:30")
private LocalDateTime deadline;

private String link;
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/brainpix/post/dto/CollaborationHubUpdateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
package com.brainpix.post.dto;

import java.time.LocalDateTime;
import java.util.List;

import com.brainpix.post.entity.PostAuth;
import org.springframework.format.annotation.DateTimeFormat;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class CollaborationHubUpdateDto extends PostDto{
public class CollaborationHubUpdateDto extends PostDto {

@Future(message = "마감일은 현재 날짜보다 미래여야 합니다.")
@NotNull(message = "마감일은 필수입니다.")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(type = "string", description = "마감일 (yyyy-MM-dd HH:mm)", example = "2025-02-10 14:30")
private LocalDateTime deadline;

private String link;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/brainpix/post/dto/RequestTaskCreateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
import java.time.LocalDateTime;
import java.util.List;

import org.springframework.format.annotation.DateTimeFormat;

import com.brainpix.post.entity.request_task.RequestTaskType;
import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.NotEmpty;
Expand All @@ -24,6 +28,9 @@ public class RequestTaskCreateDto extends PostDto {

@Future(message = "마감일은 현재 날짜보다 미래여야 합니다.")
@NotNull(message = "마감일은 필수입니다.")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(type = "string", description = "마감일 (yyyy-MM-dd HH:mm)", example = "2025-02-10 14:30")
private LocalDateTime deadline;

@NotNull(message = "요청 과제 유형은 필수입니다.")
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/brainpix/post/dto/RequestTaskUpdateDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.brainpix.post.dto;

import java.time.LocalDateTime;
import java.util.List;

import com.brainpix.post.entity.PostAuth;
import org.springframework.format.annotation.DateTimeFormat;

import com.brainpix.post.entity.request_task.RequestTaskType;
import com.brainpix.profile.entity.Specialization;
import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
Expand All @@ -20,6 +21,9 @@ public class RequestTaskUpdateDto extends PostDto {

@Future(message = "마감일은 현재 날짜보다 미래여야 합니다.")
@NotNull(message = "마감일은 필수입니다.")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(type = "string", description = "마감일 (yyyy-MM-dd HH:mm)", example = "2025-02-10 14:30")
private LocalDateTime deadline;

@NotNull(message = "요청 과제 유형은 필수입니다.")
Expand Down