From 19572cd8c213e172232c850f1c53eade6732a9ed Mon Sep 17 00:00:00 2001 From: ympark99 Date: Sat, 9 Sep 2023 11:56:48 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=A3=BC=EC=B5=9C=20api=20-=20?= =?UTF-8?q?=EB=AC=B4=EC=A0=9C=ED=95=9C/=EC=A0=9C=ED=95=9C=20enum=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80=20(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/spark/adapter/in/web/request/HostDto.java | 3 +++ .../domain/spark/adapter/in/web/response/HostListDto.java | 6 +++++- .../adapter/out/persistence/SparkPersistenceAdapter.java | 2 ++ .../onna/onnaback/domain/spark/domain/CapacityType.java | 5 +++++ .../java/com/onna/onnaback/domain/spark/domain/Spark.java | 8 +++++++- 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/onna/onnaback/domain/spark/domain/CapacityType.java diff --git a/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/request/HostDto.java b/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/request/HostDto.java index b213460..e3eb7bd 100644 --- a/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/request/HostDto.java +++ b/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/request/HostDto.java @@ -1,6 +1,7 @@ package com.onna.onnaback.domain.spark.adapter.in.web.request; import com.onna.onnaback.domain.spark.domain.Always; +import com.onna.onnaback.domain.spark.domain.CapacityType; import com.onna.onnaback.domain.spark.domain.DurationHour; import com.onna.onnaback.domain.spark.domain.SparkType; @@ -25,6 +26,8 @@ public class HostDto { Long price; + CapacityType capacityType; + Long capacity; DurationHour durationHour; diff --git a/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/HostListDto.java b/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/HostListDto.java index 3c08889..aad4394 100644 --- a/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/HostListDto.java +++ b/src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/HostListDto.java @@ -3,6 +3,7 @@ import java.time.LocalDateTime; import com.onna.onnaback.domain.spark.domain.Always; +import com.onna.onnaback.domain.spark.domain.CapacityType; import com.onna.onnaback.domain.spark.domain.DurationHour; import com.onna.onnaback.domain.spark.domain.RecruitType; @@ -23,6 +24,8 @@ public class HostListDto { Long memberCount; + CapacityType capacityType; + Long capacity; Long price; @@ -35,7 +38,7 @@ public class HostListDto { @Builder public HostListDto(Long sparkId, String placeName, Always always, LocalDateTime sparkDate, - DurationHour durationHour, Long memberCount, Long capacity, + DurationHour durationHour, Long memberCount, CapacityType capacityType, Long capacity, Long price, String title, RecruitType recruitType, Long waitingCount) { this.sparkId = sparkId; this.placeName = placeName; @@ -43,6 +46,7 @@ public HostListDto(Long sparkId, String placeName, Always always, LocalDateTime this.sparkDate = sparkDate; this.durationHour = durationHour; this.memberCount = memberCount; + this.capacityType = capacityType; this.capacity = capacity; this.price = price; this.title = title; diff --git a/src/main/java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java b/src/main/java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java index 5c517c8..0b5041b 100644 --- a/src/main/java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java +++ b/src/main/java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java @@ -166,6 +166,7 @@ public List getHostList(Member host) { spark.getSparkDate(), spark.getDurationHour(), spark.getMemberCount(), + spark.getCapacityType(), spark.getCapacity(), spark.getPrice(), spark.getTitle(), @@ -211,6 +212,7 @@ public String saveApply(Member host, Place place, HostDto hostDto) { .sparkDate(localDateTime) .price(hostDto.getPrice()) .memberCount(0L) + .capacityType(hostDto.getCapacityType()) .capacity(hostDto.getCapacity()) .durationHour(hostDto.getDurationHour()) .hostDetail(hostDto.getHostDetail()) diff --git a/src/main/java/com/onna/onnaback/domain/spark/domain/CapacityType.java b/src/main/java/com/onna/onnaback/domain/spark/domain/CapacityType.java new file mode 100644 index 0000000..89cce0b --- /dev/null +++ b/src/main/java/com/onna/onnaback/domain/spark/domain/CapacityType.java @@ -0,0 +1,5 @@ +package com.onna.onnaback.domain.spark.domain; + +public enum CapacityType { + UNLIMITED, LIMIT +} diff --git a/src/main/java/com/onna/onnaback/domain/spark/domain/Spark.java b/src/main/java/com/onna/onnaback/domain/spark/domain/Spark.java index 31c11dc..b4aa224 100644 --- a/src/main/java/com/onna/onnaback/domain/spark/domain/Spark.java +++ b/src/main/java/com/onna/onnaback/domain/spark/domain/Spark.java @@ -65,6 +65,10 @@ public class Spark extends BaseEntity { @Column(name = "price") private Long price; + @Column(name = "capacityType") + @Enumerated(value = EnumType.STRING) + private CapacityType capacityType; + @Column(name = "capacity") private Long capacity; @@ -95,7 +99,8 @@ public class Spark extends BaseEntity { @Builder public Spark(String title, String description, SparkType type, Always always, LocalDateTime sparkDate, - Long memberCount, Long price, Long capacity, DurationHour durationHour, String hostDetail, + Long memberCount, Long price, CapacityType capacityType, Long capacity, + DurationHour durationHour, String hostDetail, RecruitType recruitType, Member host, Place place, String img ) { this.title = title; @@ -105,6 +110,7 @@ public Spark(String title, String description, SparkType type, Always always, Lo this.sparkDate = sparkDate; this.memberCount = memberCount; this.price = price; + this.capacityType = capacityType; this.capacity = capacity; this.durationHour = durationHour; this.hostDetail = hostDetail;