Merge pull request #25 from SOPT-all/feat/#20

woals2840 · web-flow · commit e04a4370353f · 2025-05-18T07:12:21.000+09:00
[feat/#20] 구현완료
diff --git a/src/main/java/com/sopkathon/domain/apply/controller/ApplyController.java b/src/main/java/com/sopkathon/domain/apply/controller/ApplyController.java
@@ -0,0 +1,42 @@
+package com.sopkathon.domain.apply.controller;
+
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.sopkathon.domain.apply.dto.GetApplyListResponse;
+import com.sopkathon.domain.apply.dto.GetApplyResponse;
+import com.sopkathon.domain.apply.entity.ApplyEntity;
+import com.sopkathon.domain.apply.service.ApplyService;
+import com.sopkathon.domain.place.dto.GetPlaceListResponse;
+import com.sopkathon.domain.place.dto.GetPlaceResponse;
+import com.sopkathon.global.error.code.SuccessCode;
+import com.sopkathon.global.error.dto.SuccessResponse;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/apply")
+public class ApplyController {
+	private final ApplyService applyService;
+
+	@PostMapping("/{place-id}")
+	public ResponseEntity<SuccessResponse<?>> apply(@PathVariable("place-id") Long placeId) {
+		applyService.addApply(placeId);
+		return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_CREATE));
+	}
+
+	@GetMapping("/list")
+	public ResponseEntity<SuccessResponse<?>> getApplies(@RequestParam(defaultValue = "PENDING") String status) {
+		GetPlaceListResponse getPlaceListResponse = GetPlaceListResponse.of(applyService.getApplyList(status));
+
+		return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, getPlaceListResponse));
+	}
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/dto/GetApplyListResponse.java b/src/main/java/com/sopkathon/domain/apply/dto/GetApplyListResponse.java
@@ -0,0 +1,4 @@
+package com.sopkathon.domain.apply.dto;
+
+public record GetApplyListResponse() {
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/dto/GetApplyResponse.java b/src/main/java/com/sopkathon/domain/apply/dto/GetApplyResponse.java
@@ -0,0 +1,12 @@
+package com.sopkathon.domain.apply.dto;
+
+public record GetApplyResponse(
+	Long placeId,
+	String name,
+	String description,
+	int price,
+	String farmer,
+	String photoUrl
+) {
+
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/entity/ApplyEntity.java b/src/main/java/com/sopkathon/domain/apply/entity/ApplyEntity.java
@@ -0,0 +1,38 @@
+package com.sopkathon.domain.apply.entity;
+
+import com.sopkathon.domain.place.entity.PlaceEntity;
+import com.sopkathon.domain.user.UserEntity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class ApplyEntity {
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	@Enumerated(EnumType.STRING)
+	private ApplyStatus status;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "place_id", nullable = false)
+	private PlaceEntity place;
+
+	@Builder
+	public ApplyEntity(ApplyStatus status, PlaceEntity place) {
+		this.status = status;
+		this.place = place;
+	}
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/entity/ApplyStatus.java b/src/main/java/com/sopkathon/domain/apply/entity/ApplyStatus.java
@@ -0,0 +1,12 @@
+package com.sopkathon.domain.apply.entity;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public enum ApplyStatus {
+	PENDING,
+	APPROVED
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/repository/ApplyRepository.java b/src/main/java/com/sopkathon/domain/apply/repository/ApplyRepository.java
@@ -0,0 +1,15 @@
+package com.sopkathon.domain.apply.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.sopkathon.domain.apply.entity.ApplyEntity;
+import com.sopkathon.domain.apply.entity.ApplyStatus;
+
+@Repository
+public interface ApplyRepository extends JpaRepository<ApplyEntity, Long> {
+	List<ApplyEntity> findByStatus(ApplyStatus applyStatus);
+
+}
diff --git a/src/main/java/com/sopkathon/domain/apply/service/ApplyService.java b/src/main/java/com/sopkathon/domain/apply/service/ApplyService.java
@@ -0,0 +1,57 @@
+package com.sopkathon.domain.apply.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.sopkathon.domain.apply.dto.GetApplyListResponse;
+import com.sopkathon.domain.apply.dto.GetApplyResponse;
+import com.sopkathon.domain.apply.entity.ApplyEntity;
+import com.sopkathon.domain.apply.entity.ApplyStatus;
+import com.sopkathon.domain.apply.repository.ApplyRepository;
+import com.sopkathon.domain.place.dto.GetPlaceResponse;
+import com.sopkathon.domain.place.entity.PlaceEntity;
+import com.sopkathon.domain.place.repository.PlaceRepository;
+import com.sopkathon.domain.user.UserEntity;
+import com.sopkathon.domain.user.UserRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class ApplyService {
+
+	private final ApplyRepository applyRepository;
+	private final PlaceRepository placeRepository;
+	private final UserRepository userRepository;
+
+	// 신청 생성
+	public void addApply(Long placeId) {
+		// 임시: 로그인된 유저 ID 하드코딩 (나중에 인증 붙이면 수정)
+		Long userId = 1L;
+
+		PlaceEntity place = placeRepository.findById(placeId)
+			.orElseThrow(() -> new IllegalArgumentException("장소를 찾을 수 없습니다."));
+
+		ApplyEntity apply = ApplyEntity.builder()
+			.status(ApplyStatus.PENDING)
+			.place(place)
+			.build();
+
+		applyRepository.save(apply);
+	}
+
+	// 신청 목록 조회
+	public List<GetPlaceResponse> getApplyList(String status) {
+		ApplyStatus applyStatus = ApplyStatus.valueOf(status.toUpperCase());
+		List<ApplyEntity> applies = applyRepository.findByStatus(applyStatus);
+
+		return applies.stream()
+			.map(apply -> {
+				PlaceEntity place = apply.getPlace();
+				return  GetPlaceResponse.of(place);
+			})
+			.toList();
+
+	}
+}
diff --git a/src/main/java/com/sopkathon/domain/place/controller/PlaceController.java b/src/main/java/com/sopkathon/domain/place/controller/PlaceController.java
@@ -3,6 +3,13 @@
 import com.sopkathon.domain.place.dto.GetPlaceDetailRes;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.sopkathon.domain.place.dto.GetPlaceListResponse;
 import com.sopkathon.domain.place.service.PlaceService;
@@ -19,11 +26,18 @@ public class PlaceController {
 
 	@GetMapping
 	public ResponseEntity<SuccessResponse<?>> getPlaceList(@RequestParam(name = "category", defaultValue = "ALL") String category,
-														   @RequestParam(name = "subway") String subway) {
+		@RequestParam(name = "subway", defaultValue = "교대역") String subway){
 		GetPlaceListResponse getPlaceListResponse = placeService.getPlaceList(category, subway);
 		return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, getPlaceListResponse));
 	}
 
+	@PostMapping
+	public ResponseEntity<SuccessResponse<?>> addPlace(@PathVariable("place-id")Long placeId, @RequestHeader Long userId){
+		placeService.addPlace(placeId);
+		return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_CREATE));
+	}
+
+
 	@GetMapping("/{place-id}")
 	public ResponseEntity<SuccessResponse<?>> getPlaceDetailById(@PathVariable("place-id") Long placeId) {
 		GetPlaceDetailRes getPlaceDetailRes = placeService.getPlaceDetailById(placeId);
diff --git a/src/main/java/com/sopkathon/domain/place/dto/GetPlaceResponse.java b/src/main/java/com/sopkathon/domain/place/dto/GetPlaceResponse.java
@@ -10,7 +10,6 @@ public record GetPlaceResponse(
 	Long placeId,
 	String name,
 	String description,
-	String mapLink,
 	int price,
 	String farmer,
 	String photoUrl
@@ -21,7 +20,6 @@ public static GetPlaceResponse of(PlaceEntity placeEntity) {
 			.placeId(placeEntity.getId())
 			.name(placeEntity.getName())
 			.description(placeEntity.getDescription())
-			.mapLink(placeEntity.getMapLink())
 			.photoUrl(placeEntity.getPhotoUrl())
 			.price(placeEntity.getPrice())
 			.farmer(placeEntity.getFarmer())
diff --git a/src/main/java/com/sopkathon/domain/place/entity/PlaceEntity.java b/src/main/java/com/sopkathon/domain/place/entity/PlaceEntity.java
@@ -1,5 +1,7 @@
 package com.sopkathon.domain.place.entity;
 
+import com.sopkathon.domain.apply.entity.ApplyEntity;
+import com.sopkathon.domain.apply.entity.ApplyStatus;
 import com.sopkathon.domain.review.entity.ReviewEntity;
 import com.sopkathon.domain.subway.entity.SubwayEntity;
 
diff --git a/src/main/java/com/sopkathon/domain/place/service/PlaceService.java b/src/main/java/com/sopkathon/domain/place/service/PlaceService.java
@@ -9,11 +9,15 @@
 import com.sopkathon.global.error.exception.BusinessException;
 import org.springframework.stereotype.Service;
 
+import com.sopkathon.domain.place.dto.GetPlaceListResponse;
+import com.sopkathon.domain.place.dto.GetPlaceResponse;
 import com.sopkathon.domain.place.entity.Category;
 import com.sopkathon.domain.place.entity.PlaceEntity;
 import com.sopkathon.domain.place.repository.PlaceRepository;
 import com.sopkathon.domain.subway.entity.SubwayEntity;
 import com.sopkathon.domain.subway.service.SubwayService;
+import com.sopkathon.global.error.code.ErrorCode;
+import com.sopkathon.global.error.exception.BusinessException;
 
 import lombok.RequiredArgsConstructor;
 
@@ -67,4 +71,13 @@ public GetPlaceDetailRes getPlaceDetailById(Long placeId) {
 				reviewDtos
 		);
 	}
+
+	public void addPlace(Long placeId) {
+		PlaceEntity placeEntity = placeRepository.findById(placeId)
+			.orElseThrow(() -> new BusinessException(ErrorCode.DATA_NOT_FOUND));
+
+
+	}
+
+
 }
diff --git a/src/main/java/com/sopkathon/domain/user/UserEntity.java b/src/main/java/com/sopkathon/domain/user/UserEntity.java
@@ -0,0 +1,19 @@
+package com.sopkathon.domain.user;
+
+import com.sopkathon.domain.place.entity.PlaceEntity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+@Entity
+public class UserEntity {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+}
diff --git a/src/main/java/com/sopkathon/domain/user/UserRepository.java b/src/main/java/com/sopkathon/domain/user/UserRepository.java
@@ -0,0 +1,8 @@
+package com.sopkathon.domain.user;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends JpaRepository<UserEntity, Long> {
+}
diff --git a/src/main/java/com/sopkathon/domain/user/UserService.java b/src/main/java/com/sopkathon/domain/user/UserService.java
@@ -0,0 +1,12 @@
+package com.sopkathon.domain.user;
+
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class UserService {
+	private final UserRepository userRepository;
+
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.sopkathon.domain.apply.dto;
++
 +public record GetApplyListResponse() {
 +}