-
Notifications
You must be signed in to change notification settings - Fork 6
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 #627 from woowacourse-teams/develop-BE
[BE] 2.1.0 배포
- Loading branch information
Showing
27 changed files
with
772 additions
and
113 deletions.
There are no files selected for viewing
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
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
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
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
11 changes: 11 additions & 0 deletions
11
...nd/src/main/java/com/mapbefine/mapbefine/pin/infrastructure/PinBatchRepositoryCustom.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,11 @@ | ||
| package com.mapbefine.mapbefine.pin.infrastructure; | ||
|
|
||
| import com.mapbefine.mapbefine.pin.domain.Pin; | ||
| import com.mapbefine.mapbefine.topic.domain.Topic; | ||
| import java.util.List; | ||
|
|
||
| public interface PinBatchRepositoryCustom { | ||
|
|
||
| int[] saveAllToTopic(Topic topicForCopy, List<Pin> originalPins); | ||
|
|
||
| } |
142 changes: 142 additions & 0 deletions
142
...rc/main/java/com/mapbefine/mapbefine/pin/infrastructure/PinBatchRepositoryCustomImpl.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,142 @@ | ||
| package com.mapbefine.mapbefine.pin.infrastructure; | ||
|
|
||
| import static java.sql.Statement.EXECUTE_FAILED; | ||
|
|
||
| import com.mapbefine.mapbefine.pin.domain.Pin; | ||
| import com.mapbefine.mapbefine.pin.domain.PinImage; | ||
| import com.mapbefine.mapbefine.topic.domain.Topic; | ||
| import java.sql.PreparedStatement; | ||
| import java.sql.SQLException; | ||
| import java.sql.Timestamp; | ||
| import java.time.LocalDateTime; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.stream.IntStream; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.jdbc.core.BatchPreparedStatementSetter; | ||
| import org.springframework.jdbc.core.JdbcTemplate; | ||
| import org.springframework.stereotype.Repository; | ||
|
|
||
| @Slf4j | ||
| @Repository | ||
| public class PinBatchRepositoryCustomImpl implements PinBatchRepositoryCustom { | ||
|
|
||
| private final JdbcTemplate jdbcTemplate; | ||
|
|
||
| public PinBatchRepositoryCustomImpl(JdbcTemplate jdbcTemplate) { | ||
| this.jdbcTemplate = jdbcTemplate; | ||
| } | ||
|
|
||
| public int[] saveAllToTopic(Topic topicForCopy, List<Pin> originalPins) { | ||
| int[] rowCount = bulkInsertPins(topicForCopy, originalPins); | ||
| List<PinImageInsertDto> pinImageInsertDtos = createPinImageInsertDtos(originalPins, rowCount); | ||
|
|
||
| if (pinImageInsertDtos.isEmpty()) { | ||
| return rowCount; | ||
| } | ||
| return bulkInsertPinImages(pinImageInsertDtos); | ||
| } | ||
|
|
||
| private int[] bulkInsertPins(Topic topicForCopy, List<Pin> originalPins) { | ||
| String bulkInsertSql = "INSERT INTO pin " | ||
| + "(name, description, member_id, topic_id, location_id, " | ||
| + "created_at, updated_at) " | ||
| + "VALUES " | ||
| + "(?, ?, ?, ?, ?, " | ||
| + "?, ?)"; | ||
| LocalDateTime createdAt = topicForCopy.getLastPinUpdatedAt(); | ||
| Long topicId = topicForCopy.getId(); | ||
| Long creatorId = topicForCopy.getCreator().getId(); | ||
| log.debug("[Query] bulk insert size {} : {}", originalPins.size(), bulkInsertSql); | ||
|
|
||
| return jdbcTemplate.batchUpdate(bulkInsertSql, new BatchPreparedStatementSetter() { | ||
| @Override | ||
| public void setValues(PreparedStatement ps, int i) throws SQLException { | ||
| Pin pin = originalPins.get(i); | ||
| ps.setString(1, pin.getName()); | ||
| ps.setString(2, pin.getDescription()); | ||
| ps.setLong(3, creatorId); | ||
| ps.setLong(4, topicId); | ||
| ps.setLong(5, pin.getLocation().getId()); | ||
| ps.setTimestamp(6, Timestamp.valueOf(createdAt)); | ||
| ps.setTimestamp(7, Timestamp.valueOf(createdAt)); | ||
| log.trace("[Parameter Binding] {} : " | ||
| + "name={}, description={}, member_id={}, topic_id={}, location_id={}, " | ||
| + "created_at={}, updated_at={}", | ||
| i, pin.getName(), pin.getDescription(), creatorId, topicId, pin.getLocation().getId(), | ||
| createdAt, createdAt); | ||
| } | ||
|
|
||
| @Override | ||
| public int getBatchSize() { | ||
| return originalPins.size(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private List<PinImageInsertDto> createPinImageInsertDtos(List<Pin> originalPins, int[] rowCount) { | ||
| Long firstIdFromBatch = jdbcTemplate.queryForObject("SELECT last_insert_id()", Long.class); | ||
| validateId(firstIdFromBatch); | ||
|
|
||
| return IntStream.range(0, originalPins.size()) | ||
| .filter(index -> rowCount[index] != EXECUTE_FAILED) | ||
| .mapToObj(index -> { | ||
| Pin pin = originalPins.get(index); | ||
| return PinImageInsertDto.of(pin.getPinImages(), firstIdFromBatch + index); | ||
| }).flatMap(Collection::stream) | ||
| .toList(); | ||
| } | ||
|
|
||
| private void validateId(Long firstIdFromBatch) { | ||
| if (Objects.isNull(firstIdFromBatch)) { | ||
| throw new IllegalStateException("fail to batch update pins"); | ||
| } | ||
| } | ||
|
|
||
| private int[] bulkInsertPinImages(List<PinImageInsertDto> pinImages) { | ||
| String bulkInsertSql = "INSERT INTO pin_image " | ||
| + "(image_url, pin_id) " | ||
| + "VALUES " | ||
| + "(?, ?)"; | ||
| log.debug("[Query] bulk insert size {} : {}", pinImages.size(), bulkInsertSql); | ||
|
|
||
| return jdbcTemplate.batchUpdate(bulkInsertSql, new BatchPreparedStatementSetter() { | ||
| @Override | ||
| public void setValues(PreparedStatement ps, int i) throws SQLException { | ||
| PinImageInsertDto pinImage = pinImages.get(i); | ||
| ps.setString(1, pinImage.imageUrl); | ||
| ps.setLong(2, pinImage.pinId); | ||
| log.trace("[Parameter Binding] {} : imageUrl={}, pinImage={} ", | ||
| i, pinImage.imageUrl, pinImage.pinId); | ||
| } | ||
|
|
||
| @Override | ||
| public int getBatchSize() { | ||
| return pinImages.size(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private record PinImageInsertDto( | ||
| String imageUrl, | ||
| Long pinId, | ||
| boolean isDeleted | ||
| ) { | ||
|
|
||
| public static PinImageInsertDto of(PinImage pinImage, Long pinId) { | ||
| return new PinImageInsertDto( | ||
| pinImage.getImageUrl(), | ||
| pinId, | ||
| pinImage.isDeleted() | ||
| ); | ||
| } | ||
|
|
||
| private static List<PinImageInsertDto> of(List<PinImage> pinImages, Long pinId) { | ||
| return pinImages.stream() | ||
| .map(pinImage -> PinImageInsertDto.of(pinImage, pinId)) | ||
| .toList(); | ||
| } | ||
| } | ||
|
|
||
| } |
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
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
36 changes: 36 additions & 0 deletions
36
backend/src/main/java/com/mapbefine/mapbefine/topic/domain/Cluster.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,36 @@ | ||
| package com.mapbefine.mapbefine.topic.domain; | ||
|
|
||
| import com.mapbefine.mapbefine.pin.domain.Pin; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import lombok.Getter; | ||
|
|
||
| @Getter | ||
| public class Cluster { | ||
|
|
||
| private final double latitude; | ||
| private final double longitude; | ||
| private final List<Pin> pins; | ||
|
|
||
| private Cluster(double latitude, double longitude, List<Pin> pins) { | ||
| this.latitude = latitude; | ||
| this.longitude = longitude; | ||
| this.pins = pins; | ||
| } | ||
|
|
||
| public static Cluster from(Pin representPin, List<Pin> pins) { | ||
| return new Cluster(representPin.getLatitude(), representPin.getLongitude(), rearrangePins(representPin, pins)); | ||
| } | ||
|
|
||
| private static List<Pin> rearrangePins(Pin representPin, List<Pin> pins) { | ||
| List<Pin> arrangePins = new ArrayList<>(List.of(representPin)); | ||
|
|
||
| pins.stream() | ||
| .filter(pin -> !Objects.equals(representPin, pin)) | ||
| .forEach(arrangePins::add); | ||
|
|
||
| return arrangePins; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.