diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin
index 6e47f42..e64de59 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.bin and b/.gradle/8.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock
index d40711f..5a12f30 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.lock and b/.gradle/8.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
index 9783e5c..3a3defa 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.bin and b/.gradle/8.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
index ba41909..479e6b6 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.lock and b/.gradle/8.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
index 7f0770e..460c017 100644
Binary files a/.gradle/8.4/fileHashes/resourceHashesCache.bin and b/.gradle/8.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 230fb75..481a6a3 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 09ab3f9..b3a2cce 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index e6e0867..360da4f 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -5,6 +5,7 @@
#@
`
+ true
master_key
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c7804a..ca1f30c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,25 +5,12 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
@@ -263,6 +250,9 @@
+
+
+
diff --git a/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java b/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java
index f360a60..2dc3982 100644
--- a/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java
+++ b/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java
@@ -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())
@@ -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())
diff --git a/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java b/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java
index 04c021c..3ff3246 100644
--- a/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java
+++ b/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java
@@ -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;
@@ -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