Skip to content

fix : 진행중인 나의 팟 리스트 dto inprogressStatus 추가 #119

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

Closed
pwyi-cupi wants to merge 2 commits into from
Closed

fix : 진행중인 나의 팟 리스트 dto inprogressStatus 추가 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c3dd4
진행중인 나의 팟 리스트 dto inprogressStatus 추가
pwyi-cupi May 30, 2025
7afb1e0
Merge remote-tracking branch 'origin/develop' into feat/#114-payment-…
pwyi-cupi May 30, 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
Binary file modified .gradle/8.4/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/8.4/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/resourceHashesCache.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/file-system.probe
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .idea/dataSources.local.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 7 additions & 17 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public static PodResponseDto.MinimumStatus buildMinimumStatusResponseDto(Pod pod
.podName(pod.getPodName())
.podType(pod.getPodType().name())
.podStatus(pod.getPodStatus().toString())
.inprogressStatus(pod.getInprogressStatus().toString())
.platform(pod.getPlatform().name())
.goalAmount(pod.getGoalAmount())
.currentAmount(pod.getCurrentAmount())
Expand All @@ -123,6 +124,7 @@ public static PodResponseDto.GroupBuyStaus buildGroupBuyStatusResponseDto(Pod po
.podName(pod.getPodName())
.podType(pod.getPodType().name())
.podStatus(pod.getPodStatus().toString())
.inprogressStatus(pod.getInprogressStatus().toString())
.itemUrl(pod.getItemUrl())
.goalAmount(pod.getGoalAmount())
.currentAmount(pod.getCurrentAmount())
Expand Down
4 changes: 3 additions & 1 deletion be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public static class MinimumStatus implements PodResponse{
private String podName;
private String podType;
private String podStatus;
private String inprogressStatus;
private String platform;
private int goalAmount;
private int currentAmount;
Expand Down Expand Up @@ -127,10 +128,11 @@ public static class GroupBuyStaus implements PodResponse{
private Long podId;
private String podName;
private String podType;
private String podStatus;
private String inprogressStatus;
private String itemUrl;
private int goalAmount; //목표 금액 or 목표 인원
private int currentAmount; //현재 금액 or 현재 인원
private String podStatus;
}

@Builder
Expand Down