π [λ²κ·Έ μμ ] : μ€μΌμ€λ¬ λ° λ©μμ§ μλ© μ€λ₯ μμ #116
There are no files selected for viewing
This file contains hidden or 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,6 @@ | ||
| Merge branch 'dev' of https://github.com/News-Deliver/Server into feat/sub/more | ||
| # Please enter a commit message to explain why this merge is necessary, | ||
| # especially if it merges an updated upstream into a topic branch. | ||
| # | ||
| # Lines starting with '#' will be ignored, and an empty message aborts | ||
| # the commit. |
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -48,4 +48,21 @@ public interface SettingRepository extends JpaRepository<Setting, Long> { | |
| """) | ||
| Optional<Setting> findByIdWithDays(@Param("id") Long id); | ||
|
|
||
| /** | ||
| * Setting Serviceμ getAllSettings λ©μλμ μ°μΌ λ©μλ | ||
| * νμ¬ μκ° κΈ°μ€μΌλ‘ μ ν¨ν λͺ¨λ μΈν μ κ°μ Έμ΄ | ||
| * - μμμΌμ΄ νμ¬λ³΄λ€ μ΄μ μ΄κ±°λ κ°κ³ | ||
| * - μ’ λ£μΌμ΄ μκ±°λ, νμ¬λ³΄λ€ μ΄νμ΄λ©° | ||
| * - μμ λμ§ μμ μΈν λ§ μ‘°ν | ||
| * | ||
| * @param now νμ¬ μκ° | ||
| * @return μ ν¨ν λͺ¨λ μΈν 리μ€νΈ | ||
| */ | ||
| @Query("SELECT DISTINCT s FROM Setting s " + | ||
| "JOIN FETCH s.days d " + | ||
| "WHERE s.startDate <= :now " + | ||
| "AND (s.endDate IS NULL OR s.endDate >= :now) " + | ||
| "AND (s.isDeleted IS NULL OR s.isDeleted = false)") | ||
| List<Setting> findAllValidSettingsWithDays(@Param("now") LocalDateTime now); | ||
|
|
||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -252,7 +252,23 @@ private SettingDTO convertToDTO(Setting setting) { | |
| } | ||
|
|
||
| public List<Setting> getAllSettings() { | ||
|
|
||
| /** | ||
| * What : λ€μλ μ€λ₯ μ½λμ λν λμ | ||
| * How : μΈν κ°μ μ μ©λ κΈ°κ° + μμΌμ κ°μ Έμ΄ | ||
| * Who : λ₯μ±μ΄ | ||
| * When : 2025-07-21 | ||
| * | ||
| */ | ||
| return settingRepository.findAllValidSettingsWithDays(LocalDateTime.now()); | ||
|
|
||
| /** | ||
| * What :λ€μλ μ½λ μ€λ₯ | ||
| * Why : μμ λ μΈν κ°κΉμ§ κ°μ Έμμ, μ€λ₯λ₯Ό λ°μ | ||
| * -> μμ λ μΈν μ κΈ°λ‘μ μ‘΄μ¬νμ§λ§, μμΌ κ°μ μμ λμ΄ NP λ°μ | ||
| * | ||
| */ | ||
| //return settingRepository.findAll(); | ||
| } | ||
|
|
||
| public Setting getById(Long settingId) { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -62,8 +62,9 @@ public ResponseEntity<ApiResponseWrapper<List<NewsEsDocument>>> getMoreNews(@Pat | |
| @GetMapping("") | ||
| public ResponseEntity<ApiResponseWrapper<List<GroupedNewsHistoryResponse>>> getNewsHistoryList( | ||
| @RequestParam(defaultValue = "0") int page, | ||
| @RequestParam(defaultValue = "3") int size | ||
| ) { | ||
| // λ΄ νμ€ν 리 μ‘°ννκΈ° μλΉμ€ λ μ΄μ΄ νΈμΆ | ||
| List<GroupedNewsHistoryResponse> groupedList = moreNewsService.getGroupedNewsHistory(page, size); | ||
|
|
||
| return ResponseEntity.ok(new ApiResponseWrapper<>(groupedList, "νμ€ν λ¦¬κ° μ±κ³΅μ μΌλ‘ μ‘°νλμμ΅λλ€.")); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
|
|
||
| import Baemin.News_Deliver.Domain.Kakao.entity.History; | ||
| import Baemin.News_Deliver.Domain.Mypage.Entity.Setting; | ||
| import Baemin.News_Deliver.Domain.SubServices.FeedBack.Entity.Feedback; | ||
| import lombok.*; | ||
|
|
||
| import java.time.LocalDateTime; | ||
|
|
@@ -15,24 +16,20 @@ | |
| public class NewsHistoryResponse { | ||
|
|
||
| private Long id; | ||
| private String newsTitle; | ||
| private String summary; | ||
| private String content_url; | ||
| private Long keywordReflection; | ||
| private Long contentQuality; | ||
|
|
||
| public static NewsHistoryResponse from(History history, Feedback feedback) { | ||
| return NewsHistoryResponse.builder() | ||
| .id(history.getId()) | ||
| .newsTitle(history.getNews().getTitle()) // News μν°ν°μ title | ||
| .summary(history.getNews().getSummary()) // News μν°ν°μ summary | ||
| .content_url(history.getNews().getContentUrl()) // News μν°ν°μ URL | ||
| .keywordReflection(feedback != null ? feedback.getKeywordReflection() : null) | ||
| .contentQuality(feedback != null ? feedback.getContentQuality() : null) | ||
| .build(); | ||
| } | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,8 @@ | |
| import Baemin.News_Deliver.Domain.Kakao.entity.History; | ||
| import Baemin.News_Deliver.Domain.Kakao.repository.HistoryRepository; | ||
| import Baemin.News_Deliver.Domain.SubServices.Exception.SubServicesException; | ||
| import Baemin.News_Deliver.Domain.SubServices.FeedBack.Entity.Feedback; | ||
| import Baemin.News_Deliver.Domain.SubServices.FeedBack.Repository.FeedbackRepository; | ||
| import Baemin.News_Deliver.Domain.SubServices.MoreNews.DTO.GroupedNewsHistoryResponse; | ||
| import Baemin.News_Deliver.Domain.SubServices.MoreNews.DTO.NewsHistoryResponse; | ||
| import Baemin.News_Deliver.Global.Exception.ErrorCode; | ||
|
|
@@ -30,6 +32,7 @@ | |
| public class MoreNewsService { | ||
|
|
||
| private final HistoryRepository historyRepository; | ||
| private final FeedbackRepository feedbackRepository; | ||
| private final ElasticsearchClient client; | ||
|
|
||
| // ======================= λ΄μ€ μΆκ° κ²μ λ©μλ ========================= | ||
|
|
@@ -161,37 +164,51 @@ public List<NewsEsDocument> getMoreNews(Long historyId) throws IOException { | |
| public List<GroupedNewsHistoryResponse> getGroupedNewsHistory(int page, int size) { | ||
| Long userId = 1L; | ||
|
|
||
| // 1. λͺ¨λ νμ€ν 리 μ‘°ν | ||
| List<History> allHistories = historyRepository.findAllBySetting_User_Id(userId); | ||
|
|
||
| // 2. νμ€ν 리 ID μμ§ β Feedback μΌκ΄ μ‘°ν | ||
| List<Long> historyIds = allHistories.stream() | ||
| .map(History::getId) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| Map<Long, Feedback> feedbackMap = feedbackRepository.findAllById(historyIds) | ||
| .stream() | ||
| .collect(Collectors.toMap(fb -> fb.getHistory().getId(), fb -> fb)); | ||
|
|
||
| // 3. κ·Έλ£Ήν: settingId + publishedAt(HOUR) | ||
| Map<String, List<History>> grouped = allHistories.stream() | ||
| .collect(Collectors.groupingBy(h -> { | ||
| Long settingId = h.getSetting().getId(); | ||
| LocalDateTime truncatedPublishedAt = h.getPublishedAt().truncatedTo(ChronoUnit.HOURS); | ||
| return settingId + "_" + truncatedPublishedAt; | ||
| })); | ||
|
|
||
| // 4. DTO λ³ν | ||
| List<GroupedNewsHistoryResponse> groupedList = grouped.entrySet().stream() | ||
| .map(entry -> { | ||
| List<History> histories = entry.getValue(); | ||
| History any = histories.get(0); | ||
|
|
||
| List<NewsHistoryResponse> newsResponses = histories.stream() | ||
| .map(history -> { | ||
| Feedback feedback = feedbackMap.get(history.getId()); | ||
| return NewsHistoryResponse.from(history, feedback); | ||
| }) | ||
| .toList(); | ||
|
|
||
| return GroupedNewsHistoryResponse.builder() | ||
| .settingId(any.getSetting().getId()) | ||
| .publishedAt(any.getPublishedAt().truncatedTo(ChronoUnit.HOURS)) | ||
| .settingKeyword(any.getSettingKeyword()) | ||
| .blockKeyword(any.getBlockKeyword()) | ||
| .newsList(newsResponses) | ||
| .build(); | ||
| }) | ||
| .sorted(Comparator.comparing(GroupedNewsHistoryResponse::getPublishedAt).reversed()) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| // 5. νμ΄μ§λ€μ΄μ | ||
| int fromIndex = page * size; | ||
| int toIndex = Math.min(fromIndex + size, groupedList.size()); | ||
|
|
||
|
|
@@ -202,6 +219,4 @@ public List<GroupedNewsHistoryResponse> getGroupedNewsHistory(int page, int size | |
| return groupedList.subList(fromIndex, toIndex); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -48,6 +48,8 @@ public ElasticsearchClient elasticsearchClient() { | |
| // HTTP κΈ°λ° Low-level ν΄λΌμ΄μΈνΈ κ΅¬μ± | ||
| RestClient restClient = RestClient.builder( | ||
| new HttpHost("elasticsearch", 9200) | ||
| // μ±μ΄ λ‘μ»¬μ© μμ Host | ||
| //new HttpHost("localhost", 9200) | ||
| ).build(); | ||
|
Comment on lines
50
to
53
There was a problem hiding this comment. π‘ Verification agent β Verification inconclusiveνΈμ€νΈ/ν¬νΈ νλμ½λ© λμ νκ²½ μ€μ μΌλ‘ μΈλΆννμΈμ μμ diff: +@Value("${elasticsearch.host:elasticsearch}")
+private String esHost;
+
+@Value("${elasticsearch.port:9200}")
+private int esPort;
...
-RestClient restClient = RestClient.builder(
- new HttpHost("elasticsearch", 9200)
- // μ±μ΄ λ‘μ»¬μ© μμ Host
- //new HttpHost("localhost", 9200)
-).build();
+RestClient restClient = RestClient.builder(
+ new HttpHost(esHost, esPort)
+).build();μ΄λ κ² νλ©΄ νλ‘νμΌλ³ νΈμ€νΈ/ν¬νΈ νλμ½λ©μ μ κ±°νκ³ μ€μ νμΌλ‘ μΈλΆννμΈμ νμ¬ λ€μκ³Ό κ°μ΄ // ν΄λμ€ νλμ μΆκ°
+ @Value("${elasticsearch.host:elasticsearch}")
+ private String esHost;
+
+ @Value("${elasticsearch.port:9200}")
+ private int esPort;
@Bean
public RestClient elasticsearchClient() {
- RestClient restClient = RestClient.builder(
- new HttpHost("elasticsearch", 9200)
- // μ±μ΄ λ‘μ»¬μ© μμ Host
- //new HttpHost("localhost", 9200)
- ).build();
+ RestClient restClient = RestClient.builder(
+ new HttpHost(esHost, esPort)
+ ).build();
return restClient;
}β π€ Prompt for AI Agents |
||
|
|
||
| // LocalDateTime μ§λ ¬ν μ§μ λ° ISO ν¬λ§· μ§μ | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -64,7 +64,7 @@ public void scheduleAllUserSettings() { | |
| //DBμ settingsκ°μ΄ μμ λ μ€μΌμ₯΄λ¬ μ·¨μ μ½λ | ||
| if (settings == null || settings.isEmpty()) { | ||
| log.warn("[SchedulerInit] λ±λ‘ν Settingμ΄ μμ΄ μ€μΌμ€λ¬λ₯Ό μ€ννμ§ μμ΅λλ€."); | ||
| // throw new KakaoException(ErrorCode.SETTING_NOT_FOUND); | ||
| } | ||
|
|
||
| for (Setting setting : settings) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
π οΈ Refactor suggestion
μμ ν΄κ²°μ± λμ κ·Όλ³Έ μμΈ ν΄κ²° νμ
μμ μ£ΌμμΌλ‘ μΊμ± λ¬Έμ λ₯Ό ν΄κ²°νλ κ²λ³΄λ€λ κ·Όλ³Έ μμΈμ νμ νκ³ μ μ ν ν΄κ²°μ± μ μ μ©νλ κ²μ΄ μ’κ² μ΅λλ€. νμ¬ μ£Όμλ§μΌλ‘λ μ΄λ€ μΊμ± λ¬Έμ κ° λ°μνλμ§ λͺ ννμ§ μμ΅λλ€.
λ€μκ³Ό κ°μ μ‘°μΉλ₯Ό κΆμ₯ν©λλ€:
μ΄ μμ ν΄κ²°μ± μ μ μ ν μμ μΌλ‘ κ΅μ²΄νλ μ½λλ₯Ό μμ±ν΄λ릴κΉμ?
π€ Prompt for AI Agents