-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from SWM-M3PRO/feature/M3-117-getIndividualMode…
…Pixels M3-117 Feat : 개인전 픽셀 가져오는 API 구현 완료
- Loading branch information
Showing
6 changed files
with
94 additions
and
4 deletions.
There are no files selected for viewing
File renamed without changes.
32 changes: 31 additions & 1 deletion
32
src/main/java/com/m3pro/groundflip/controller/PixelController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,31 @@ | ||
package com.m3pro.groundflip.controller;import org.springframework.web.bind.annotation.RestController;import com.m3pro.groundflip.service.PixelService;import lombok.RequiredArgsConstructor;@RestController@RequiredArgsConstructorpublic class PixelController { private final PixelService pixelService;} | ||
package com.m3pro.groundflip.controller; | ||
|
||
import java.util.List; | ||
|
||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RequestParam; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
import com.m3pro.groundflip.domain.dto.Response; | ||
import com.m3pro.groundflip.domain.dto.pixel.IndividualPixelResponse; | ||
import com.m3pro.groundflip.service.PixelService; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
@RequestMapping("/api/pixels") | ||
public class PixelController { | ||
private final PixelService pixelService; | ||
|
||
@GetMapping("/individual") | ||
public Response<List<IndividualPixelResponse>> getNearIndividualPixels( | ||
@RequestParam(name = "current-x") int currentX, | ||
@RequestParam(name = "current-y") int currentY, | ||
@RequestParam(name = "x-range", required = false, defaultValue = "20") int xRange, | ||
@RequestParam(name = "y-range", required = false, defaultValue = "10") int yRange) { | ||
return Response.createSuccess(pixelService.getNearIndividualPixels(currentX, currentY, xRange, yRange)); | ||
} | ||
|
||
} |
21 changes: 21 additions & 0 deletions
21
src/main/java/com/m3pro/groundflip/domain/dto/pixel/IndividualPixelResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package com.m3pro.groundflip.domain.dto.pixel; | ||
|
||
import com.m3pro.groundflip.domain.entity.Pixel; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.NoArgsConstructor; | ||
|
||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
@Data | ||
public class IndividualPixelResponse { | ||
private double latitude; | ||
private double longitude; | ||
private double x; | ||
private double y; | ||
|
||
public static IndividualPixelResponse from(Pixel pixel) { | ||
return new IndividualPixelResponse(pixel.getLatitude(), pixel.getLongitude(), pixel.getX(), pixel.getY()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 17 additions & 1 deletion
18
src/main/java/com/m3pro/groundflip/repository/PixelRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,17 @@ | ||
package com.m3pro.groundflip.repository;import org.springframework.data.jpa.repository.JpaRepository;import com.m3pro.groundflip.domain.entity.Pixel;public interface PixelRepository extends JpaRepository<Pixel, Long> {} | ||
package com.m3pro.groundflip.repository; | ||
|
||
import java.util.List; | ||
|
||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.query.Param; | ||
|
||
import com.m3pro.groundflip.domain.entity.Pixel; | ||
|
||
public interface PixelRepository extends JpaRepository<Pixel, Long> { | ||
@Query(value = "select pixel from Pixel pixel " | ||
+ "where pixel.x between :currentX - :xRange / 2 and :currentX + :xRange / 2 " | ||
+ "and pixel.y between :currentY - :yRange / 2 and :currentY + :yRange / 2 ") | ||
List<Pixel> findAllNearPixels(@Param("currentX") int currentX, @Param("currentY") int currentY, | ||
@Param("xRange") int xRange, @Param("yRange") int yRange); | ||
} |
24 changes: 23 additions & 1 deletion
24
src/main/java/com/m3pro/groundflip/service/PixelService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,23 @@ | ||
package com.m3pro.groundflip.service;import org.springframework.stereotype.Service;import lombok.RequiredArgsConstructor;@Service@RequiredArgsConstructorpublic class PixelService {} | ||
package com.m3pro.groundflip.service; | ||
|
||
import java.util.List; | ||
|
||
import org.springframework.stereotype.Service; | ||
|
||
import com.m3pro.groundflip.domain.dto.pixel.IndividualPixelResponse; | ||
import com.m3pro.groundflip.repository.PixelRepository; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class PixelService { | ||
private final PixelRepository pixelRepository; | ||
|
||
public List<IndividualPixelResponse> getNearIndividualPixels(int currentX, int currentY, int xRange, int yRange) { | ||
return pixelRepository.findAllNearPixels(currentX, currentY, xRange, yRange) | ||
.stream() | ||
.map(IndividualPixelResponse::from) | ||
.toList(); | ||
} | ||
} |