Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
package com.zipline.repository.region;

import com.zipline.entity.publicitem.Region;
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 org.springframework.stereotype.Repository;

import com.zipline.entity.publicitem.Region;

@Repository
public interface RegionRepository extends JpaRepository<Region, Long> {
List<Region> findByParentCortarNo(Long parentCortarNo);

@Query("SELECT concat(gp.cortarName, ' ', p.cortarName, ' ', r.cortarName) FROM Region r LEFT JOIN Region p ON r.parent.cortarNo = p.cortarNo LEFT JOIN Region gp ON p.parent.cortarNo = gp.cortarNo WHERE r.cortarNo = :cortarNo")
String findWithParentsByDistrictCode(Long cortarNo);
}

@Query("SELECT r.cortarName FROM Region r WHERE r.cortarNo = :cortarNo")
String findCortarNameByCortarNo(@Param("cortarNo") String cortarNoText);
Copy link

Copilot AI May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Since the region's identifier is numeric in other parts of the repository, consider converting the key to a numeric type (e.g., Long) before querying, or ensure that this type mismatch is intentional.

Copilot uses AI. Check for mistakes.
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
import com.zipline.global.exception.user.UserException;
import com.zipline.global.exception.user.errorcode.UserErrorCode;
import com.zipline.repository.message.MessageHistoryRepository;
import com.zipline.repository.region.RegionRepository;
import com.zipline.repository.user.UserRepository;
import com.zipline.service.message.dto.request.MessageHistoryRequestDTO;
import com.zipline.service.message.dto.request.SendMessageRequestDTO;
import com.zipline.service.message.dto.response.MessageHistoryResponseDTO;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -30,6 +33,7 @@ public class MessageServiceImpl implements MessageService {
private final MessageHistoryParamFormatter messageHistoryParamFormatter;
private final MessageHistoryRepository messageHistoryRepository;
private final UserRepository userRepository;
private final RegionRepository regionRepository;


public void saveMessageHistory(String messageGroupId, Long userUID) {
Expand All @@ -45,11 +49,44 @@ public void saveMessageHistory(String messageGroupId, Long userUID) {
messageHistoryRepository.save(messageHistory);
}

private String replaceTemplateValues(String text) {
if (text == null) return null;

Pattern pattern = Pattern.compile("\\$\\$###\\{([^}]+)}");
Matcher matcher = pattern.matcher(text);

StringBuilder result = new StringBuilder();
while (matcher.find()) {
String key = matcher.group(1);
String replacement = getReplacementValue(key);
matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
}
matcher.appendTail(result);

return result.toString();
}

private String getReplacementValue(String key) {
if (key == null || !key.matches("\\d{10}")) {
return key;
}
String cortarName = regionRepository.findCortarNameByCortarNo(key);

return cortarName != null ? cortarName : key;
}

@Transactional
public String sendMessage(List<SendMessageRequestDTO> request, Long userUID) {

try {
Map<String, Object> wrappedRequest = Map.of("messages", request);
List<SendMessageRequestDTO> processedRequest = request.stream()
.map(msg -> {
String processedText = replaceTemplateValues(msg.getText());
return msg.withText(processedText);
})
.toList();

Map<String, Object> wrappedRequest = Map.of("messages", processedRequest);

String response = webClient.post()
.uri("/send-many/detail")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
package com.zipline.service.message.dto.request;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class SendMessageRequestDTO {
private String from;
private String to;
private String text;

public SendMessageRequestDTO withText(String text) {
return new SendMessageRequestDTO(this.from, this.to, text);
}
}