Skip to content

Commit a5c39e2

Browse files
dongjune8931dongjune8931
authored
[FIX] @Schema 추가 (#165)
[FIX] @Schema 추가 (#165)
1 parent 4355679 commit a5c39e2

12 files changed

+41
-12
lines changed

‎src/main/java/com/brainpix/joining/controller/SupportCollaborationController.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.brainpix.joining.controller;
22

3-
import org.springframework.data.domain.Page;
43
import org.springframework.data.domain.Pageable;
54
import org.springframework.http.ResponseEntity;
65
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -10,6 +9,7 @@
109
import org.springframework.web.bind.annotation.RestController;
1110

1211
import com.brainpix.api.ApiResponse;
12+
import com.brainpix.api.CommonPageResponse;
1313
import com.brainpix.api.swagger.SwaggerPageable;
1414
import com.brainpix.joining.dto.AcceptedCollaborationDto;
1515
import com.brainpix.joining.dto.RejectedCollaborationDto;
@@ -33,23 +33,24 @@ public class SupportCollaborationController {
3333
@AllUser
3434
@GetMapping("/rejected")
3535
@SwaggerPageable
36-
public ResponseEntity<ApiResponse<Page<RejectedCollaborationDto>>> getRejectedList(
36+
public ResponseEntity<ApiResponse<CommonPageResponse<RejectedCollaborationDto>>> getRejectedList(
3737
@UserId Long userId,
3838
Pageable pageable) {
3939

40-
Page<RejectedCollaborationDto> dtos = supportCollaborationService.getRejectedList(userId, pageable);
40+
CommonPageResponse<RejectedCollaborationDto> dtos = supportCollaborationService.getRejectedList(userId,
41+
pageable);
4142
return ResponseEntity.ok(ApiResponse.success(dtos));
4243
}
4344

4445
@Operation(summary = "지원 승낙된 협업광장 게시글", description = "본인이 지원한 협업광장 게시글 중 승낙된 목록들을 조회합니다.")
4546
@AllUser
4647
@GetMapping("/accepted")
4748
@SwaggerPageable
48-
public ResponseEntity<ApiResponse<Page<AcceptedCollaborationDto>>> getAcceptedList(
49+
public ResponseEntity<ApiResponse<CommonPageResponse<AcceptedCollaborationDto>>> getAcceptedList(
4950
@UserId Long userId,
5051
Pageable pageable) {
51-
52-
Page<AcceptedCollaborationDto> dtos = supportCollaborationService.getAcceptedList(userId, pageable);
52+
CommonPageResponse<AcceptedCollaborationDto> dtos = supportCollaborationService.getAcceptedList(userId,
53+
pageable);
5354
return ResponseEntity.ok(ApiResponse.success(dtos));
5455
}
5556

‎src/main/java/com/brainpix/joining/dto/AcceptedCollaborationDto.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.brainpix.profile.entity.Specialization;
99
import com.fasterxml.jackson.annotation.JsonFormat;
1010

11+
import io.swagger.v3.oas.annotations.media.Schema;
1112
import lombok.AllArgsConstructor;
1213
import lombok.Builder;
1314
import lombok.Getter;
@@ -21,6 +22,7 @@ public class AcceptedCollaborationDto {
2122

2223
private Long collectionGatheringId; // CollectionGathering PK
2324
private String firstImage; // 게시글 대표 이미지
25+
@Schema(type = "string", example = "yyyy-MM-dd")
2426
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
2527
@DateTimeFormat(pattern = "yyyy-MM-dd")
2628
private LocalDateTime postCreatedAt; // 게시글 작성일

‎src/main/java/com/brainpix/joining/dto/AcceptedRequestTaskPurchasingDto.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.brainpix.profile.entity.Specialization;
88
import com.fasterxml.jackson.annotation.JsonFormat;
99

10+
import io.swagger.v3.oas.annotations.media.Schema;
1011
import lombok.AllArgsConstructor;
1112
import lombok.Builder;
1213
import lombok.Getter;
@@ -19,8 +20,9 @@
1920
public class AcceptedRequestTaskPurchasingDto {
2021
private Long purchasingId; // RequestTaskPurchasing PK
2122
private String firstImage; // 게시글 대표 이미지
22-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
23-
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
23+
@Schema(type = "string", example = "yyyy-MM-dd ")
24+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ")
25+
@DateTimeFormat(pattern = "yyyy-MM-dd")
2426
private LocalDateTime postCreatedAt; // 게시글 작성일
2527
private String postTitle; // 게시글 제목
2628
private Specialization specialization;

‎src/main/java/com/brainpix/joining/dto/IdeaMarketPurchaseDto.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.brainpix.profile.entity.Specialization;
88
import com.fasterxml.jackson.annotation.JsonFormat;
99

10+
import io.swagger.v3.oas.annotations.media.Schema;
1011
import lombok.AllArgsConstructor;
1112
import lombok.Builder;
1213
import lombok.Getter;
@@ -18,6 +19,7 @@
1819
@Builder
1920
public class IdeaMarketPurchaseDto {
2021
private Long purchasingId;
22+
@Schema(type = "string", example = "yyyy-MM-dd")
2123
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
2224
@DateTimeFormat(pattern = "yyyy-MM-dd")
2325
private LocalDateTime purchasedAt;

‎src/main/java/com/brainpix/joining/dto/RejectedCollaborationDto.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.brainpix.profile.entity.Specialization;
88
import com.fasterxml.jackson.annotation.JsonFormat;
99

10+
import io.swagger.v3.oas.annotations.media.Schema;
1011
import lombok.AllArgsConstructor;
1112
import lombok.Builder;
1213
import lombok.Getter;
@@ -19,6 +20,7 @@
1920
public class RejectedCollaborationDto {
2021
private Long collectionGatheringId; // CollectionGathering PK
2122
private String firstImage; // 게시글 대표 이미지
23+
@Schema(type = "string", example = "yyyy-MM-dd")
2224
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
2325
@DateTimeFormat(pattern = "yyyy-MM-dd")
2426
private LocalDateTime postCreatedAt; // 게시글 작성일

‎src/main/java/com/brainpix/joining/dto/RejectedRequestTaskPurchasingDto.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.brainpix.profile.entity.Specialization;
88
import com.fasterxml.jackson.annotation.JsonFormat;
99

10+
import io.swagger.v3.oas.annotations.media.Schema;
1011
import lombok.AllArgsConstructor;
1112
import lombok.Builder;
1213
import lombok.Getter;
@@ -19,6 +20,7 @@
1920
public class RejectedRequestTaskPurchasingDto {
2021
private Long purchasingId; // RequestTaskPurchasing PK
2122
private String firstImage; // 게시글 대표 이미지
23+
@Schema(type = "string", example = "yyyy-MM-dd")
2224
@DateTimeFormat(pattern = "yyyy-MM-dd")
2325
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
2426
private LocalDateTime postCreatedAt; // 게시글 작성일 (BaseTimeEntity)

‎src/main/java/com/brainpix/joining/service/SupportCollaborationService.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.stereotype.Service;
99
import org.springframework.transaction.annotation.Transactional;
1010

11+
import com.brainpix.api.CommonPageResponse;
1112
import com.brainpix.api.code.error.CollectionErrorCode;
1213
import com.brainpix.api.code.error.CommonErrorCode;
1314
import com.brainpix.api.exception.BrainPixException;
@@ -39,16 +40,17 @@ public class SupportCollaborationService {
3940
*/
4041

4142
@Transactional(readOnly = true)
42-
public Page<RejectedCollaborationDto> getRejectedList(Long userId, Pageable pageable) {
43+
public CommonPageResponse<RejectedCollaborationDto> getRejectedList(Long userId, Pageable pageable) {
4344
User currentUser = userRepository.findById(userId)
4445
.orElseThrow(() -> new BrainPixException(CommonErrorCode.RESOURCE_NOT_FOUND));
4546

4647
Pageable sortedPageable = PageableUtils.withSort(pageable, "createdAt", Sort.Direction.DESC);
4748

4849
Page<CollectionGathering> rejectedPage =
4950
gatheringRepository.findByJoinerAndAcceptedIsFalse(currentUser, sortedPageable);
51+
Page<RejectedCollaborationDto> dtoPage = rejectedPage.map(converter::toRejectedDto);
5052

51-
return rejectedPage.map(converter::toRejectedDto);
53+
return CommonPageResponse.of(dtoPage);
5254
}
5355

5456
/**
@@ -58,7 +60,7 @@ public Page<RejectedCollaborationDto> getRejectedList(Long userId, Pageable page
5860
* - 팀원 정보까지 추가
5961
*/
6062
@Transactional(readOnly = true)
61-
public Page<AcceptedCollaborationDto> getAcceptedList(Long userId, Pageable pageable) {
63+
public CommonPageResponse<AcceptedCollaborationDto> getAcceptedList(Long userId, Pageable pageable) {
6264
User currentUser = userRepository.findById(userId)
6365
.orElseThrow(() -> new BrainPixException(CommonErrorCode.RESOURCE_NOT_FOUND));
6466

@@ -67,11 +69,13 @@ public Page<AcceptedCollaborationDto> getAcceptedList(Long userId, Pageable page
6769
Page<CollectionGathering> acceptedPage =
6870
gatheringRepository.findByJoinerAndAcceptedIsTrue(currentUser, sortedPageable);
6971

70-
return acceptedPage.map(cg -> {
72+
Page<AcceptedCollaborationDto> dtoPage = acceptedPage.map(cg -> {
7173
CollaborationHub hub = cg.getCollaborationRecruitment().getParentCollaborationHub();
7274
List<TeamMemberInfoDto> teamInfo = converter.createTeamInfoList(hub);
7375
return converter.toAcceptedDto(cg, teamInfo);
7476
});
77+
78+
return CommonPageResponse.of(dtoPage);
7579
}
7680

7781
/**

‎src/main/java/com/brainpix/post/dto/PostCollaborationResponse.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
import com.brainpix.profile.entity.Specialization;
1010
import com.fasterxml.jackson.annotation.JsonFormat;
1111

12+
import io.swagger.v3.oas.annotations.media.Schema;
13+
1214
public record PostCollaborationResponse(
1315
Long ideaId,
1416
PostAuth auth,
1517
String writerImageUrl,
1618
String writerName,
1719
String thumbnailImageUrl,
1820
String title,
21+
@Schema(type = "string", example = "yyyy-MM-dd HH:mm")
1922
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
2023
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
2124
LocalDateTime deadline,

‎src/main/java/com/brainpix/post/dto/PostRequestTaskResponse.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
import com.brainpix.profile.entity.Specialization;
1010
import com.fasterxml.jackson.annotation.JsonFormat;
1111

12+
import io.swagger.v3.oas.annotations.media.Schema;
13+
1214
public record PostRequestTaskResponse(
1315
Long ideaId,
1416
PostAuth auth,
1517
String writerImageUrl,
1618
String writerName,
1719
String thumbnailImageUrl,
1820
String title,
21+
@Schema(type = "string", example = "yyyy-MM-dd HH:mm")
1922
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
2023
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
2124
LocalDateTime deadline,

‎src/main/java/com/brainpix/post/dto/mypostdto/MyCollaborationHubDetailResponse.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import com.brainpix.profile.entity.Specialization;
1010
import com.fasterxml.jackson.annotation.JsonFormat;
1111

12+
import io.swagger.v3.oas.annotations.media.Schema;
13+
1214
public record MyCollaborationHubDetailResponse(
1315
Long postId,
1416
Specialization specialization,
1517
String title,
18+
@Schema(type = "string", example = "yyyy-MM-dd HH:mm")
1619
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
1720
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
1821
LocalDateTime deadLine,

0 commit comments

Comments
 (0)