Merge branch 'main' into feat/spark

KakaoONna · Oct 13, 2023 · 3e32598 · 3e32598
2 parents 543cb9c + d15fde6
commit 3e32598
Showing 1 changed file with 29 additions and 28 deletions.
diff --git a/.../java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java b/.../java/com/onna/onnaback/domain/spark/adapter/out/persistence/SparkPersistenceAdapter.java
@@ -53,35 +53,35 @@ public Spark getById(Long sparkId) {
     @Override
     public List<SparkResponse> getSparkListByPlaceId(Long placeId) {
         return sparkRepository.findSparksByPlace(placeId)
-                              .stream().map(spark -> SparkResponse.builder()
-                                                                  .sparkId(spark.getSparkId())
-                                                                  .img(spark.getImg())
-                                                                  .title(spark.getTitle())
-                                                                  .durationHour(spark.getDurationHour())
-                                                                  .sparkType(spark.getType())
-                                                                  .sparkDate(spark.getSparkDate())
-                                                                  .capacity(spark.getCapacity())
-                                                                  .memberCount(
-                                                                          (long) spark.getMemberSparkMappingList()
-                                                                                      .size())
-                                                                  .price(spark.getPrice())
-                                                                  .hostName(spark.getHost().getName())
-                                                                  .hostDetail(spark.getHostDetail())
-                                                                  .hostImg(spark.getHost().getProfileImg())
-                                                                  .description(spark.getDescription())
-                                                                  .participateMember(
-                                                                          spark.getMemberSparkMappingList()
-                                                                               .stream().map(
-                                                                                       memberSparkMapping -> ParticipateMemberDto.builder()
-                                                                                                                                 .memberId(
-                                                                                                                                         memberSparkMapping.getApplicant()
-                                                                                                                                                           .getMemberId())
-                                                                                                                                 .profileImg(
-                                                                                                                                         memberSparkMapping.getApplicant()
+                              .stream().map(spark -> SparkResponse.builder().sparkId(spark.getSparkId())
+
+                        .img(spark.getImg())
+                        .title(spark.getTitle())
+                        .durationHour(spark.getDurationHour())
+                        .sparkType(spark.getType())
+                        .sparkDate(spark.getSparkDate())
+                        .capacity(spark.getCapacity())
+                        .memberCount(spark.getMemberCount())
+                        .price(spark.getPrice())
+                        .hostName(spark.getHost().getName())
+                        .hostDetail(spark.getHostDetail())
+                        .hostImg(spark.getHost().getProfileImg())
+                        .description(spark.getDescription())
+                        .participateMember(spark.getMemberSparkMappingList().stream().map(
+                                memberSparkMapping -> ParticipateMemberDto.builder()
+                                        .memberId(
+                                                memberSparkMapping.getApplicant().getMemberId())
+                                        .profileImg(
+                                                memberSparkMapping.getApplicant()
                                                                                                                                                            .getProfileImg())
-                                                                                                                                 .build()
-                                                                               ).collect(Collectors.toList()))
-                                                                  .build()).collect(Collectors.toList());
+                                        .build()).collect(Collectors.toList()))
+                        .recruitType(spark.getRecruitType())
+                        .lng(spark.getPlace().getLongitude())
+                        .lat(spark.getPlace().getLatitude())
+                        .placeId(spark.getPlace().getPlaceId())
+                        .placeName(spark.getPlace().getName())
+                        .capacityType(spark.getCapacityType())
+                        .build()).collect(Collectors.toList());
     }
 
     @Override
@@ -189,6 +189,7 @@ public SparkResponse getSparkInfo(Long id) {
                             .img(spark.getImg())
                             .sparkType(spark.getType())
                             .sparkDate(spark.getSparkDate())
+                            .description(spark.getDescription())
                             .price(spark.getPrice())
                             .durationHour(spark.getDurationHour())
                             .capacity(spark.getCapacity())