feat:장소별 동행컨텐츠 조회 API설계 (#22)

* fix:소셜로그인 에러 확인

* fix:oAuth error

* fix:dockefile error

* fix:docker file error

* fix:dockerfile error

* fix:conflict

* feat:장소별 동행컨텐츠 조회

* fix:pr 리뷰 받고 수정

src/main/java/com/onna/onnaback/domain/apply/adapter/out/persistence/ApplyPersistenceAdapter.java

@@ -7,7 +7,7 @@
 import com.onna.onnaback.domain.apply.application.port.out.SaveApplyPort;
 import com.onna.onnaback.domain.apply.domain.MemberSparkMapping;
 import com.onna.onnaback.domain.member.domain.Member;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.Spark;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/onna/onnaback/domain/apply/application/port/out/SaveApplyPort.java

@@ -1,7 +1,7 @@
 package com.onna.onnaback.domain.apply.application.port.out;
 
 import com.onna.onnaback.domain.member.domain.Member;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.Spark;
 
 public interface SaveApplyPort {
     String saveApply(Member member, Spark spark);

src/main/java/com/onna/onnaback/domain/apply/application/service/ApplyService.java

@@ -7,8 +7,8 @@
 import com.onna.onnaback.domain.apply.application.port.out.SaveApplyPort;
 import com.onna.onnaback.domain.member.application.port.in.MemberUseCase;
 import com.onna.onnaback.domain.member.domain.Member;
-import com.onna.onnaback.domain.apply.spark.application.port.in.SparkUseCase;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.application.port.in.SparkUseCase;
+import com.onna.onnaback.domain.spark.domain.Spark;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/onna/onnaback/domain/apply/domain/MemberSparkMapping.java

@@ -13,15 +13,17 @@
 import javax.persistence.Table;
 
 import com.onna.onnaback.domain.member.domain.Member;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.Spark;
 import com.onna.onnaback.global.utils.BaseEntity;
 
 import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @NoArgsConstructor
 @Table(name = "MemberSparkMapping")
+@Getter
 public class MemberSparkMapping extends BaseEntity {
 
     @Id

src/main/java/com/onna/onnaback/domain/member/domain/Member.java

@@ -18,7 +18,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 
 import com.onna.onnaback.domain.apply.domain.MemberSparkMapping;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.Spark;
 import com.onna.onnaback.global.utils.BaseEntity;
 
 import lombok.Builder;
@@ -86,8 +86,9 @@ public void updateRefreshToken(String updateRefreshToken) {
     }
 
     @Builder
-    public Member(String name, Age ageRange, String email, Role role, SocialType socialType, String socialId,
+    public Member(Long memberId,String name, Age ageRange, String email, Role role, SocialType socialType, String socialId,
                   String phoneNum, String profileImg, String birthDay, Gender gender) {
+        this.memberId=memberId;
         this.name = name;
         this.email = email;
         this.role = role;

src/main/java/com/onna/onnaback/domain/place/adapter/in/web/PlaceController.java

@@ -12,7 +12,7 @@
 import com.onna.onnaback.domain.place.adapter.in.web.response.PlaceResponse;
 import com.onna.onnaback.domain.place.application.port.in.PlaceUseCase;
 import com.onna.onnaback.domain.place.domain.PlaceType;
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;

src/main/java/com/onna/onnaback/domain/place/adapter/in/web/response/PlaceResponse.java

@@ -6,9 +6,9 @@
 
 import com.onna.onnaback.domain.place.domain.Place;
 import com.onna.onnaback.domain.place.domain.PlaceType;
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
-import com.onna.onnaback.domain.apply.spark.domain.SparkType;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.SparkType;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/onna/onnaback/domain/place/adapter/out/persistence/PlacePersistenceAdapter.java

@@ -11,8 +11,8 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Repository;
 
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.Spark;
 import com.onna.onnaback.domain.place.application.port.out.LoadPlacePort;
 import com.onna.onnaback.domain.place.domain.Place;
 import com.onna.onnaback.domain.place.domain.PlaceType;

src/main/java/com/onna/onnaback/domain/place/adapter/out/persistence/PlaceRepository.java

@@ -6,7 +6,12 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import com.onna.onnaback.domain.place.domain.Place;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface PlaceRepository extends JpaRepository<Place, Long>, JpaSpecificationExecutor<Place> {
     Optional<Place> findById(Long memberId);
+
+    @Query("select p from Place p where placeId = :placeId")
+    Place findByPlaceId(@Param("placeId") Long placeId);
 }

src/main/java/com/onna/onnaback/domain/place/application/port/in/PlaceUseCase.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
 import com.onna.onnaback.domain.place.domain.Place;
 import com.onna.onnaback.domain.place.domain.PlaceType;
 

src/main/java/com/onna/onnaback/domain/place/application/port/out/LoadPlacePort.java

@@ -5,7 +5,7 @@
 
 import org.springframework.data.domain.Pageable;
 
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
 import com.onna.onnaback.domain.place.domain.Place;
 import com.onna.onnaback.domain.place.domain.PlaceType;
 

src/main/java/com/onna/onnaback/domain/place/application/service/PlaceService.java

@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.DurationHour;
 import com.onna.onnaback.domain.place.application.port.in.PlaceUseCase;
 import com.onna.onnaback.domain.place.application.port.out.LoadPlacePort;
 import com.onna.onnaback.domain.place.domain.Place;

src/main/java/com/onna/onnaback/domain/place/domain/Place.java

@@ -13,7 +13,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import com.onna.onnaback.domain.apply.spark.domain.Spark;
+import com.onna.onnaback.domain.spark.domain.Spark;
 import com.onna.onnaback.global.utils.BaseEntity;
 
 import lombok.Getter;

src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/SparkController.java

@@ -0,0 +1,32 @@
+package com.onna.onnaback.domain.spark.adapter.in.web;
+
+import com.onna.onnaback.domain.spark.adapter.in.web.response.SparkResponse;
+import com.onna.onnaback.domain.spark.application.port.in.SparkUseCase;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/spark")
+@RequiredArgsConstructor
+public class SparkController {
+
+    private final SparkUseCase sparkUseCase;
+
+    @Operation(description = "장소별 동행컨텐츠 조회")
+    @GetMapping("/{placeId}")
+    public ResponseEntity<List<SparkResponse>> getSparkList(@PathVariable("placeId") Long placeId,
+                                                            @RequestParam(value="page",required = false,defaultValue = "1")int page,
+                                                            @RequestParam(value="size",required = false,defaultValue = "5")int size){
+
+        return ResponseEntity.ok().body(
+                this.sparkUseCase.getSparkListByPlaceId(page,size,placeId)
+        );
+    }
+}

src/main/java/com/onna/onnaback/domain/apply/spark/adater/in/web/request/HostDto.java → src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/request/HostDto.java

@@ -1,8 +1,7 @@
-package com.onna.onnaback.domain.apply.spark.adater.in.web.request;
-
-import com.onna.onnaback.domain.apply.spark.domain.DurationHour;
-import com.onna.onnaback.domain.apply.spark.domain.SparkType;
+package com.onna.onnaback.domain.spark.adapter.in.web.request;
 
+import com.onna.onnaback.domain.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.SparkType;
 import lombok.Getter;
 
 @Getter
@@ -27,4 +26,4 @@ public class HostDto {
     private DurationHour durationHour;
 
     private String hostDetail;
-}
+}

src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/ParticipateMemberDto.java

@@ -0,0 +1,14 @@
+package com.onna.onnaback.domain.spark.adapter.in.web.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+// todo : Record로 바꿔보기
+public class ParticipateMemberDto {
+
+    private Long memberId;
+
+    private String profileImg;
+}

src/main/java/com/onna/onnaback/domain/spark/adapter/in/web/response/SparkResponse.java

@@ -0,0 +1,51 @@
+package com.onna.onnaback.domain.spark.adapter.in.web.response;
+
+import com.onna.onnaback.domain.spark.domain.DurationHour;
+import com.onna.onnaback.domain.spark.domain.RecruitType;
+import com.onna.onnaback.domain.spark.domain.SparkType;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+public class SparkResponse {
+
+    private long sparkId;
+
+    private String title;
+
+    private SparkType sparkType;
+
+    private LocalDateTime sparkDate;
+
+    private DurationHour durationHour;
+
+    private Long capacity;
+
+    private Long memberCount;
+
+    private RecruitType recruitType;
+
+    private Long price;
+
+    private String hostName;
+
+    private String hostImg;
+
+    private String hostDetail;
+
+    private String description;
+
+    private List<ParticipateMemberDto> participateMember;
+
+    private String detailAddress;
+
+    private Double lng;
+
+    private Double lat;
+
+}