diff --git a/src/main/java/com/brainpix/joining/controller/SupportCollaborationController.java b/src/main/java/com/brainpix/joining/controller/SupportCollaborationController.java index c14d8edf..3f2f9df5 100644 --- a/src/main/java/com/brainpix/joining/controller/SupportCollaborationController.java +++ b/src/main/java/com/brainpix/joining/controller/SupportCollaborationController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import com.brainpix.api.ApiResponse; +import com.brainpix.api.swagger.SwaggerPageable; import com.brainpix.joining.dto.AcceptedCollaborationDto; import com.brainpix.joining.dto.RejectedCollaborationDto; import com.brainpix.joining.service.SupportCollaborationService; @@ -17,11 +18,13 @@ import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequestMapping("/supports/collaborations") @RequiredArgsConstructor +@Tag(name = "지원 현황 -협업광장 조회 API", description = "협업 광장 지원 현황을 조회합니다.") public class SupportCollaborationController { private final SupportCollaborationService supportCollaborationService; @@ -29,6 +32,7 @@ public class SupportCollaborationController { @Operation(summary = "지원 거절된 협업광장 게시글", description = "본인이 지원한 협업광장 게시글 중 거절된 목록들을 조회합니다.") @AllUser @GetMapping("/rejected") + @SwaggerPageable public ResponseEntity>> getRejectedList( @UserId Long userId, Pageable pageable) { @@ -40,6 +44,7 @@ public ResponseEntity>> getRejectedLi @Operation(summary = "지원 승낙된 협업광장 게시글", description = "본인이 지원한 협업광장 게시글 중 승낙된 목록들을 조회합니다.") @AllUser @GetMapping("/accepted") + @SwaggerPageable public ResponseEntity>> getAcceptedList( @UserId Long userId, Pageable pageable) { diff --git a/src/main/java/com/brainpix/joining/controller/SupportIdeaMarketController.java b/src/main/java/com/brainpix/joining/controller/SupportIdeaMarketController.java index bcfe35eb..fa778c6e 100644 --- a/src/main/java/com/brainpix/joining/controller/SupportIdeaMarketController.java +++ b/src/main/java/com/brainpix/joining/controller/SupportIdeaMarketController.java @@ -8,17 +8,20 @@ import com.brainpix.api.ApiResponse; import com.brainpix.api.CommonPageResponse; +import com.brainpix.api.swagger.SwaggerPageable; import com.brainpix.joining.dto.IdeaMarketPurchaseDto; import com.brainpix.joining.service.SupportIdeaMarketService; import com.brainpix.security.authorization.AllUser; import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequestMapping("/supports/idea-market") @RequiredArgsConstructor +@Tag(name = "지원 현황 -아이디어마켓 조회 API", description = "아이디어 마켓 구매내역을 조회합니다.") public class SupportIdeaMarketController { private final SupportIdeaMarketService supportIdeaMarketService; @@ -26,6 +29,7 @@ public class SupportIdeaMarketController { @Operation(summary = "구매 내역 조회", description = "현재 로그인한 사용자의 아이디어 마켓 구매 내역을 조회합니다.") @AllUser @GetMapping("/purchases") + @SwaggerPageable public ResponseEntity>> getPurchases( @UserId Long userId, Pageable pageable diff --git a/src/main/java/com/brainpix/joining/controller/SupportRequestTaskController.java b/src/main/java/com/brainpix/joining/controller/SupportRequestTaskController.java index ee919762..217e3cff 100644 --- a/src/main/java/com/brainpix/joining/controller/SupportRequestTaskController.java +++ b/src/main/java/com/brainpix/joining/controller/SupportRequestTaskController.java @@ -10,6 +10,7 @@ import com.brainpix.api.ApiResponse; import com.brainpix.api.CommonPageResponse; +import com.brainpix.api.swagger.SwaggerPageable; import com.brainpix.joining.dto.AcceptedRequestTaskPurchasingDto; import com.brainpix.joining.dto.RejectedRequestTaskPurchasingDto; import com.brainpix.joining.service.SupportRequestTaskService; @@ -17,11 +18,13 @@ import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequestMapping("/supports/request-tasks") @RequiredArgsConstructor +@Tag(name = "지원 현황 -요청과제 조회 API", description = "요청 과제 지원 내역을 조회합니다.") public class SupportRequestTaskController { private final SupportRequestTaskService supportRequestTaskService; @@ -29,6 +32,7 @@ public class SupportRequestTaskController { @Operation(summary = "지원 거절된 요청 과제 게시글", description = "본인이 지원한 요청과제 게시글 중 거절된 목록들을 조회합니다.") @AllUser @GetMapping("/rejected") + @SwaggerPageable public ResponseEntity>> getRejectedList( @UserId Long userId, Pageable pageable @@ -41,6 +45,7 @@ public ResponseEntity>> getAcceptedList( @UserId Long userId, Pageable pageable diff --git a/src/main/java/com/brainpix/joining/converter/CollectionGatheringConverter.java b/src/main/java/com/brainpix/joining/converter/CollectionGatheringConverter.java index 443bed61..56e3bd85 100644 --- a/src/main/java/com/brainpix/joining/converter/CollectionGatheringConverter.java +++ b/src/main/java/com/brainpix/joining/converter/CollectionGatheringConverter.java @@ -30,7 +30,7 @@ public RejectedCollaborationDto toRejectedDto(CollectionGathering cg) { .firstImage(hub.getFirstImage()) // Post#getFirstImage() .postCreatedAt(hub.getCreatedAt()) // BaseTimeEntity .postTitle(hub.getTitle()) - .postCategory("협업 광장 > " + hub.getSpecialization()) + .specialization(hub.getSpecialization()) .domain(recruitment.getDomain()) .build(); } @@ -54,7 +54,7 @@ public AcceptedCollaborationDto toAcceptedDto(CollectionGathering cg, .firstImage(hub.getFirstImage()) .postCreatedAt(hub.getCreatedAt()) .postTitle(hub.getTitle()) - .postCategory("협업 광장 > " + hub.getSpecialization()) + .specialization(hub.getSpecialization()) .domain(recruitment.getDomain()) .writerName(writerName) .writerType(writerType) diff --git a/src/main/java/com/brainpix/joining/converter/IdeaMarketPurchasingConverter.java b/src/main/java/com/brainpix/joining/converter/IdeaMarketPurchasingConverter.java index 878e5bd7..b7501596 100644 --- a/src/main/java/com/brainpix/joining/converter/IdeaMarketPurchasingConverter.java +++ b/src/main/java/com/brainpix/joining/converter/IdeaMarketPurchasingConverter.java @@ -6,9 +6,8 @@ import com.brainpix.joining.dto.IdeaMarketPurchaseDto; import com.brainpix.joining.entity.purchasing.IdeaMarketPurchasing; -import com.brainpix.joining.entity.quantity.Price; import com.brainpix.post.entity.idea_market.IdeaMarket; -import com.brainpix.post.entity.idea_market.IdeaMarketType; +import com.brainpix.profile.entity.Specialization; import com.brainpix.user.entity.Individual; import com.brainpix.user.entity.User; @@ -21,7 +20,7 @@ public IdeaMarketPurchaseDto toPurchaseDto(IdeaMarketPurchasing purchasing) { // 게시글 IdeaMarket ideaMarket = purchasing.getIdeaMarket(); - String category = "아이디어마켓 > " + ideaMarket.getSpecialization(); + Specialization category = ideaMarket.getSpecialization(); String title = ideaMarket.getTitle(); // 작성자 @@ -29,30 +28,19 @@ public IdeaMarketPurchaseDto toPurchaseDto(IdeaMarketPurchasing purchasing) { String writerName = writer.getName(); String writerType = (writer instanceof Individual) ? "개인" : "회사"; - // 아이디어마켓 타입 - IdeaMarketType type = ideaMarket.getIdeaMarketType(); - - // 수량 결정 (IDEA_SOLUTION → 1, MARKET_PLACE → price.totalQuantity) - Price priceEntity = ideaMarket.getPrice(); - Long quantity = (type == IdeaMarketType.IDEA_SOLUTION) - ? 1L - : priceEntity.getTotalQuantity(); - - // 금액 계산 - long basePrice = priceEntity.getPrice() * quantity; - long fee = (long)(basePrice * 0.01); // 1% 예시 - long finalPrice = basePrice + fee; + Long itemPrice = ideaMarket.getPrice().getPrice(); return IdeaMarketPurchaseDto.builder() .purchasingId(purchasingId) .purchasedAt(purchasedAt) - .category(category) + .specialization(category) .title(title) .writerName(writerName) .writerType(writerType) - .quantity(quantity) - .fee(fee) - .finalPrice(finalPrice) + .middlePrice(itemPrice) + .quantity(purchasing.getQuantity()) + .fee(purchasing.getVat()) + .finalPrice(purchasing.getPrice()) .build(); } } diff --git a/src/main/java/com/brainpix/joining/converter/RequestTaskPurchasingConverter.java b/src/main/java/com/brainpix/joining/converter/RequestTaskPurchasingConverter.java index e5fdd83d..de067f2b 100644 --- a/src/main/java/com/brainpix/joining/converter/RequestTaskPurchasingConverter.java +++ b/src/main/java/com/brainpix/joining/converter/RequestTaskPurchasingConverter.java @@ -19,7 +19,7 @@ public class RequestTaskPurchasingConverter { public RejectedRequestTaskPurchasingDto toRejectedDto(RequestTaskPurchasing p) { RequestTaskRecruitment recruitment = p.getRequestTaskRecruitment(); - + RequestTask requestTask = recruitment.getRequestTask(); return RejectedRequestTaskPurchasingDto.builder() @@ -27,7 +27,7 @@ public RejectedRequestTaskPurchasingDto toRejectedDto(RequestTaskPurchasing p) { .firstImage(requestTask.getFirstImage()) .postCreatedAt(requestTask.getCreatedAt()) .postTitle(requestTask.getTitle()) - .postCategory("요청 과제 > " + requestTask.getSpecialization()) + .specialization(requestTask.getSpecialization()) .domain(recruitment.getDomain()) .build(); } @@ -48,7 +48,7 @@ public AcceptedRequestTaskPurchasingDto toAcceptedDto(RequestTaskPurchasing p) { .firstImage(requestTask.getFirstImage()) .postCreatedAt(requestTask.getCreatedAt()) .postTitle(requestTask.getTitle()) - .postCategory("요청 과제 > " + requestTask.getSpecialization()) + .specialization(requestTask.getSpecialization()) .domain(recruitment.getDomain()) .writerName(writerName) .writerType(writerType) diff --git a/src/main/java/com/brainpix/joining/dto/AcceptedCollaborationDto.java b/src/main/java/com/brainpix/joining/dto/AcceptedCollaborationDto.java index fc0ee64d..98735f18 100644 --- a/src/main/java/com/brainpix/joining/dto/AcceptedCollaborationDto.java +++ b/src/main/java/com/brainpix/joining/dto/AcceptedCollaborationDto.java @@ -3,6 +3,11 @@ import java.time.LocalDateTime; import java.util.List; +import org.springframework.format.annotation.DateTimeFormat; + +import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -16,9 +21,11 @@ public class AcceptedCollaborationDto { private Long collectionGatheringId; // CollectionGathering PK private String firstImage; // 게시글 대표 이미지 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime postCreatedAt; // 게시글 작성일 private String postTitle; // 게시글 제목 - private String postCategory; // "협업 광장 > 디자인" + private Specialization specialization; private String domain; // 내가 지원한 파트 (ex: "PM") // 게시글 관리자 diff --git a/src/main/java/com/brainpix/joining/dto/AcceptedRequestTaskPurchasingDto.java b/src/main/java/com/brainpix/joining/dto/AcceptedRequestTaskPurchasingDto.java index db435e35..f2bc9ffd 100644 --- a/src/main/java/com/brainpix/joining/dto/AcceptedRequestTaskPurchasingDto.java +++ b/src/main/java/com/brainpix/joining/dto/AcceptedRequestTaskPurchasingDto.java @@ -2,6 +2,11 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -14,12 +19,14 @@ public class AcceptedRequestTaskPurchasingDto { private Long purchasingId; // RequestTaskPurchasing PK private String firstImage; // 게시글 대표 이미지 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime postCreatedAt; // 게시글 작성일 private String postTitle; // 게시글 제목 - private String postCategory; // "요청 과제 > 디자인" + private Specialization specialization; private String domain; // 지원 파트 // 게시물 작성자 정보 (이름 + 개인/회사) private String writerName; private String writerType; // "개인" or "회사" -} \ No newline at end of file +} diff --git a/src/main/java/com/brainpix/joining/dto/IdeaMarketPurchaseDto.java b/src/main/java/com/brainpix/joining/dto/IdeaMarketPurchaseDto.java index c51dd698..5bacdaa0 100644 --- a/src/main/java/com/brainpix/joining/dto/IdeaMarketPurchaseDto.java +++ b/src/main/java/com/brainpix/joining/dto/IdeaMarketPurchaseDto.java @@ -2,6 +2,11 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -13,20 +18,22 @@ @Builder public class IdeaMarketPurchaseDto { private Long purchasingId; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime purchasedAt; // 게시글 정보 - private String category; // "아이디어마켓 > IT_TECH" + private Specialization specialization; private String title; private String writerName; private String writerType; // "개인"/"회사" - + private Long middlePrice; //원가 *수량 // 수량 private Long quantity; // 결제금액 계산 private Long fee; // 수수료 private Long finalPrice; // (price × quantity) + fee - + } diff --git a/src/main/java/com/brainpix/joining/dto/RejectedCollaborationDto.java b/src/main/java/com/brainpix/joining/dto/RejectedCollaborationDto.java index 54688ec3..ee517635 100644 --- a/src/main/java/com/brainpix/joining/dto/RejectedCollaborationDto.java +++ b/src/main/java/com/brainpix/joining/dto/RejectedCollaborationDto.java @@ -2,6 +2,11 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -14,8 +19,10 @@ public class RejectedCollaborationDto { private Long collectionGatheringId; // CollectionGathering PK private String firstImage; // 게시글 대표 이미지 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime postCreatedAt; // 게시글 작성일 private String postTitle; // 게시글 제목 - private String postCategory; // "협업 광장 > 디자인" 등 + private Specialization specialization; private String domain; // 지원한 파트 } diff --git a/src/main/java/com/brainpix/joining/dto/RejectedRequestTaskPurchasingDto.java b/src/main/java/com/brainpix/joining/dto/RejectedRequestTaskPurchasingDto.java index ecb214cd..f9a16f66 100644 --- a/src/main/java/com/brainpix/joining/dto/RejectedRequestTaskPurchasingDto.java +++ b/src/main/java/com/brainpix/joining/dto/RejectedRequestTaskPurchasingDto.java @@ -2,6 +2,11 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -14,8 +19,10 @@ public class RejectedRequestTaskPurchasingDto { private Long purchasingId; // RequestTaskPurchasing PK private String firstImage; // 게시글 대표 이미지 + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDateTime postCreatedAt; // 게시글 작성일 (BaseTimeEntity) private String postTitle; // 게시글 제목 - private String postCategory; // 예: "요청 과제 > 디자인" + private Specialization specialization; private String domain; // 지원 파트 (ex: "디자이너") } \ No newline at end of file diff --git a/src/main/java/com/brainpix/post/controller/MyCollaborationController.java b/src/main/java/com/brainpix/post/controller/MyCollaborationController.java index f68b6396..b5ffcd71 100644 --- a/src/main/java/com/brainpix/post/controller/MyCollaborationController.java +++ b/src/main/java/com/brainpix/post/controller/MyCollaborationController.java @@ -11,6 +11,7 @@ import com.brainpix.api.ApiResponse; import com.brainpix.api.CommonPageResponse; +import com.brainpix.api.swagger.SwaggerPageable; import com.brainpix.post.dto.PostCollaborationResponse; import com.brainpix.post.dto.mypostdto.MyCollaborationHubDetailResponse; import com.brainpix.post.service.mypost.MyCollaborationHubService; @@ -18,11 +19,13 @@ import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequestMapping("/post-management/collaboration") @RequiredArgsConstructor +@Tag(name = "나의 협업 광장 조회", description = "내가 작성한 협업 광장 조회 API") public class MyCollaborationController { private final MyCollaborationHubService myCollaborationHubService; @@ -30,6 +33,7 @@ public class MyCollaborationController { @Operation(summary = "나의 협업 광장 조회", description = "현재 로그인한 사용자가 본인이 작성한 협업광장 리스트를 조회합니다.") @AllUser @GetMapping + @SwaggerPageable public ResponseEntity>> getSavedIdeaMarkets( @UserId Long userId, Pageable pageable) { Page result = myCollaborationHubService.findCollaborationPosts(userId, pageable); diff --git a/src/main/java/com/brainpix/post/controller/MyIdeaMarketController.java b/src/main/java/com/brainpix/post/controller/MyIdeaMarketController.java index c351f9a7..34acfd29 100644 --- a/src/main/java/com/brainpix/post/controller/MyIdeaMarketController.java +++ b/src/main/java/com/brainpix/post/controller/MyIdeaMarketController.java @@ -10,6 +10,7 @@ import com.brainpix.api.ApiResponse; import com.brainpix.api.CommonPageResponse; +import com.brainpix.api.swagger.SwaggerPageable; import com.brainpix.post.dto.PostIdeaMarketResponse; import com.brainpix.post.dto.mypostdto.MyIdeaMarketPostDetailResponse; import com.brainpix.post.service.mypost.MyIdeaMarketService; @@ -17,9 +18,11 @@ import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController +@Tag(name = "나의 아이디어 마켓 조회", description = "내가 작성한 아이디어 마켓 조회 API") @RequestMapping("/post-management/idea-market") @RequiredArgsConstructor public class MyIdeaMarketController { @@ -29,6 +32,7 @@ public class MyIdeaMarketController { @Operation(summary = "나의 아이디어 마켓 조회", description = "현재 로그인한 사용자가 본인이 작성한 아이디어 마켓리스트를 조회합니다.") @AllUser @GetMapping + @SwaggerPageable public ResponseEntity>> getSavedIdeaMarkets( @UserId Long userId, Pageable pageable) { Page result = myIdeaMarketService.findIdeaMarketPosts(userId, pageable); diff --git a/src/main/java/com/brainpix/post/controller/MyRequestTaskController.java b/src/main/java/com/brainpix/post/controller/MyRequestTaskController.java index 3e3a9cf3..f4daf5d8 100644 --- a/src/main/java/com/brainpix/post/controller/MyRequestTaskController.java +++ b/src/main/java/com/brainpix/post/controller/MyRequestTaskController.java @@ -18,10 +18,12 @@ import com.brainpix.security.authorization.UserId; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor +@Tag(name = "나의 요청 과제 조회", description = "내가 작성한 요청과제 조회 API") @RequestMapping("/post-management/request-task") public class MyRequestTaskController { private final MyRequestTaskService myRequestTaskService; diff --git a/src/main/java/com/brainpix/post/dto/PostCollaborationResponse.java b/src/main/java/com/brainpix/post/dto/PostCollaborationResponse.java index df971670..481be6cc 100644 --- a/src/main/java/com/brainpix/post/dto/PostCollaborationResponse.java +++ b/src/main/java/com/brainpix/post/dto/PostCollaborationResponse.java @@ -2,9 +2,12 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + import com.brainpix.post.entity.PostAuth; import com.brainpix.post.entity.collaboration_hub.CollaborationHub; import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; public record PostCollaborationResponse( Long ideaId, @@ -13,6 +16,8 @@ public record PostCollaborationResponse( String writerName, String thumbnailImageUrl, String title, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm") LocalDateTime deadline, Specialization specialization, Long saveCount, diff --git a/src/main/java/com/brainpix/post/dto/PostRequestTaskResponse.java b/src/main/java/com/brainpix/post/dto/PostRequestTaskResponse.java index ac23b3d5..fcbbf0ef 100644 --- a/src/main/java/com/brainpix/post/dto/PostRequestTaskResponse.java +++ b/src/main/java/com/brainpix/post/dto/PostRequestTaskResponse.java @@ -2,9 +2,12 @@ import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + import com.brainpix.post.entity.PostAuth; import com.brainpix.post.entity.request_task.RequestTask; import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; public record PostRequestTaskResponse( Long ideaId, @@ -13,6 +16,8 @@ public record PostRequestTaskResponse( String writerName, String thumbnailImageUrl, String title, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") LocalDateTime deadline, Specialization specialization, Long saveCount, diff --git a/src/main/java/com/brainpix/post/dto/mypostdto/MyCollaborationHubDetailResponse.java b/src/main/java/com/brainpix/post/dto/mypostdto/MyCollaborationHubDetailResponse.java index c31229c5..08cfec2b 100644 --- a/src/main/java/com/brainpix/post/dto/mypostdto/MyCollaborationHubDetailResponse.java +++ b/src/main/java/com/brainpix/post/dto/mypostdto/MyCollaborationHubDetailResponse.java @@ -3,13 +3,18 @@ import java.time.LocalDateTime; import java.util.List; +import org.springframework.format.annotation.DateTimeFormat; + import com.brainpix.post.entity.collaboration_hub.CollaborationHub; import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; public record MyCollaborationHubDetailResponse( Long postId, Specialization specialization, String title, + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") LocalDateTime deadLine, String thumbnailImage, List applicationStatus, diff --git a/src/main/java/com/brainpix/post/dto/mypostdto/MyRequestTaskDetailResponse.java b/src/main/java/com/brainpix/post/dto/mypostdto/MyRequestTaskDetailResponse.java index 525d311f..31be866f 100644 --- a/src/main/java/com/brainpix/post/dto/mypostdto/MyRequestTaskDetailResponse.java +++ b/src/main/java/com/brainpix/post/dto/mypostdto/MyRequestTaskDetailResponse.java @@ -3,13 +3,18 @@ import java.time.LocalDateTime; import java.util.List; +import org.springframework.format.annotation.DateTimeFormat; + import com.brainpix.post.entity.request_task.RequestTask; import com.brainpix.profile.entity.Specialization; +import com.fasterxml.jackson.annotation.JsonFormat; public record MyRequestTaskDetailResponse( Long postId, Specialization specialization, String title, + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm") LocalDateTime deadLine, String thumbnailImage, List applicationStatus,