Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 주차장 API 수정 #21

Merged
merged 1 commit into from
Nov 23, 2024
Merged

fix: 주차장 API 수정 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions src/main/java/univ/goormthon/kongju/domain/parking/controller/ParkingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import univ.goormthon.kongju.domain.parking.dto.request.ParkingRegisterRequest;
import univ.goormthon.kongju.domain.parking.dto.response.ParkingRegisterResponse;
import univ.goormthon.kongju.domain.parking.entity.Parking;
import univ.goormthon.kongju.domain.parking.dto.response.ParkingResponse;
import univ.goormthon.kongju.domain.parking.service.ParkingService;
import univ.goormthon.kongju.global.exception.dto.ErrorResponse;

Expand All @@ -34,9 +33,9 @@ public class ParkingController {
@Parameter(name = "longitude", description = "경도"),
@Parameter(name = "radius", description = "반경 (기본값: 0.5km)")
})
@ApiResponse(responseCode = "200", description = "주차장 조회 성공", content = @Content(schema = @Schema(implementation = Parking.class)))
@ApiResponse(responseCode = "200", description = "주차장 조회 성공", content = @Content(schema = @Schema(implementation = ParkingResponse.class)))
@GetMapping("/nearby")
public ResponseEntity<List<Parking>> getNearbyParkings(@RequestParam Double latitude,
public ResponseEntity<List<ParkingResponse>> getNearbyParkings(@RequestParam Double latitude,
@RequestParam Double longitude,
@RequestParam(defaultValue = "0.5") Double radius) {
return ResponseEntity.ok(parkingService.getNearbyParkings(latitude, longitude, radius));
Expand All @@ -47,11 +46,11 @@ public ResponseEntity<List<Parking>> getNearbyParkings(@RequestParam Double lati
@Parameter(name = "memberId", description = "회원 ID")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "주차장 조회 성공", content = @Content(schema = @Schema(implementation = Parking.class))),
@ApiResponse(responseCode = "200", description = "주차장 조회 성공", content = @Content(schema = @Schema(implementation = ParkingResponse.class))),
@ApiResponse(responseCode = "404", description = "주차장을 찾을 수 없음", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
})
@GetMapping("/my")
public ResponseEntity<List<Parking>> getMyParkings(@RequestParam String memberId) {
public ResponseEntity<List<ParkingResponse>> getMyParkings(@RequestParam String memberId) {
return ResponseEntity.ok(parkingService.getMyParkings(memberId));
}

Expand All @@ -62,18 +61,18 @@ public ResponseEntity<List<Parking>> getMyParkings(@RequestParam String memberId
@Parameter(name = "images", description = "주차장 이미지 파일")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "주차장 등록 성공", content = @Content(schema = @Schema(implementation = ParkingRegisterResponse.class))),
@ApiResponse(responseCode = "200", description = "주차장 등록 성공", content = @Content(schema = @Schema(implementation = ParkingResponse.class))),
@ApiResponse(responseCode = "404", description = "회원 세션이 존재하지 않음", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
@ApiResponse(responseCode = "400", description = "이미지 업로드 실패", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
})
@PostMapping("/register")
public ResponseEntity<ParkingRegisterResponse> registerParking(
public ResponseEntity<ParkingResponse> registerParking(
@RequestParam String memberId,
@RequestPart("request") ParkingRegisterRequest request,
@RequestPart("images") List<MultipartFile> images) {
request.setImages(images);
Parking parking = parkingService.registerParking(memberId, request);
return ResponseEntity.ok(parkingService.EntitytoDto(parking));
ParkingResponse response = parkingService.registerParking(memberId, request);
return ResponseEntity.ok(response);
}

@Operation(summary = "주차장 수정", description = "주차장 정보를 수정합니다.")
Expand All @@ -84,19 +83,18 @@ public ResponseEntity<ParkingRegisterResponse> registerParking(
@Parameter(name = "images", description = "주차장 이미지 파일")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "주차장 수정 성공", content = @Content(schema = @Schema(implementation = ParkingRegisterResponse.class))),
@ApiResponse(responseCode = "200", description = "주차장 수정 성공", content = @Content(schema = @Schema(implementation = ParkingResponse.class))),
@ApiResponse(responseCode = "400", description = "이미지 업로드 실패", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
@ApiResponse(responseCode = "404", description = "회원 세션이 존재하지 않음", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
@ApiResponse(responseCode = "404", description = "주차장을 찾을 수 없음", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
})
@PutMapping("/update")
public ResponseEntity<ParkingRegisterResponse> updateParking(@RequestParam String memberId,
@RequestParam Long parkingId,
@RequestPart("request") ParkingRegisterRequest request,
@RequestPart("images") List<MultipartFile> images) {
public ResponseEntity<ParkingResponse> updateParking(@RequestParam String memberId,
@RequestParam Long parkingId,
@RequestPart("request") ParkingRegisterRequest request,
@RequestPart("images") List<MultipartFile> images) {
request.setImages(images);
Parking updatedParking = parkingService.updateParking(memberId, parkingId, request);
return ResponseEntity.ok(parkingService.EntitytoDto(updatedParking));
return ResponseEntity.ok(parkingService.updateParking(memberId, parkingId, request));
}

@Operation(summary = "주차장 삭제", description = "주차장을 삭제합니다.")
Expand Down
2 changes: 1 addition & 1 deletion ...dto/response/ParkingRegisterResponse.java → ...parking/dto/response/ParkingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.List;

public record ParkingRegisterResponse(
public record ParkingResponse(
Parking parking,
List<ParkingAvailability> availabilities,
List<ParkingImage> images
Expand Down
29 changes: 17 additions & 12 deletions src/main/java/univ/goormthon/kongju/domain/parking/service/ParkingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package univ.goormthon.kongju.domain.parking.service;

import jakarta.servlet.http.HttpSession;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -10,7 +9,7 @@
import univ.goormthon.kongju.domain.member.repository.MemberRepository;
import univ.goormthon.kongju.domain.parking.dto.request.ParkingAvailabilityRequest;
import univ.goormthon.kongju.domain.parking.dto.request.ParkingRegisterRequest;
import univ.goormthon.kongju.domain.parking.dto.response.ParkingRegisterResponse;
import univ.goormthon.kongju.domain.parking.dto.response.ParkingResponse;
import univ.goormthon.kongju.domain.parking.entity.AvailableDay;
import univ.goormthon.kongju.domain.parking.entity.Parking;
import univ.goormthon.kongju.domain.parking.entity.ParkingAvailability;
Expand Down Expand Up @@ -39,17 +38,23 @@ public class ParkingService {
private final S3UploadService s3UploadService;

@Transactional(readOnly = true)
public List<Parking> getNearbyParkings(Double latitude, Double longitude, Double radius) {
return parkingRepository.findAllWithinRadius(latitude, longitude, radius);
public List<ParkingResponse> getNearbyParkings(Double latitude, Double longitude, Double radius) {
List<Parking> parkings = parkingRepository.findAllWithinRadius(latitude, longitude, radius);
return parkings.stream()
.map(this::EntitytoDto)
.toList();
}

@Transactional(readOnly = true)
public List<Parking> getMyParkings(String memberId) {
return parkingRepository.findAllByMemberId(Long.parseLong(memberId));
public List<ParkingResponse> getMyParkings(String memberId) {
List<Parking> parkings = parkingRepository.findAllByMemberId(Long.parseLong(memberId));
return parkings.stream()
.map(this::EntitytoDto)
.toList();
}

@Transactional
public Parking registerParking(String memberId, ParkingRegisterRequest request) {
public ParkingResponse registerParking(String memberId, ParkingRegisterRequest request) {
Member member = validateMember(memberId);

Parking parking = Parking.builder()
Expand All @@ -69,11 +74,11 @@ public Parking registerParking(String memberId, ParkingRegisterRequest request)
uploadParkingImages(parking.getId(), request.getImages());
saveParkingAvailabilities(parking.getId(), request.getAvailabilities());

return parking;
return EntitytoDto(parking);
}

@Transactional
public Parking updateParking(String memberId, Long parkingId, ParkingRegisterRequest request) {
public ParkingResponse updateParking(String memberId, Long parkingId, ParkingRegisterRequest request) {
Member member = validateMember(memberId);
Parking parking = validateParkingOwnership(parkingId, member);

Expand All @@ -85,7 +90,7 @@ public Parking updateParking(String memberId, Long parkingId, ParkingRegisterReq
parkingAvailabilityRepository.deleteByParkingId(parkingId);
saveParkingAvailabilities(parkingId, request.getAvailabilities());

return parking;
return EntitytoDto(parking);
}

@Transactional
Expand Down Expand Up @@ -141,8 +146,8 @@ private void saveParkingAvailabilities(Long parkingId, List<ParkingAvailabilityR
}
}

public ParkingRegisterResponse EntitytoDto(Parking parking) {
return new ParkingRegisterResponse(parking,
public ParkingResponse EntitytoDto(Parking parking) {
return new ParkingResponse(parking,
parkingAvailabilityRepository.findByParkingId(parking.getId()),
parkingImageRepository.findByParkingId(parking.getId()));
}
Expand Down
Loading