From 83ac9d17278e9fa53191aca831e83f48d76f2bec Mon Sep 17 00:00:00 2001 From: ch8930 Date: Thu, 21 Nov 2024 04:14:39 +0900 Subject: [PATCH 1/2] bug: TT-486 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 프롬프트 디코딩 안된 상태로 환경변수 세팅됨 --- .github/workflows/cicd_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd_dev.yml b/.github/workflows/cicd_dev.yml index db10f67..7b53b6b 100644 --- a/.github/workflows/cicd_dev.yml +++ b/.github/workflows/cicd_dev.yml @@ -130,6 +130,6 @@ jobs: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/github-actions-demo sudo docker stop $(sudo docker ps -q) 2>/dev/null || true sudo docker run --name github-actions-demo --rm -v logs:/logs -d -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/github-actions-demo - sudo chmode logs 777 + sudo chmod logs 777 sudo docker system prune -f EOF From 1cad9c1462fcbb1fd56010275bcac131ed457864 Mon Sep 17 00:00:00 2001 From: ch8930 Date: Thu, 21 Nov 2024 12:16:31 +0900 Subject: [PATCH 2/2] bug: TT-486 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 프롬프트 디코딩 안된 상태로 환경변수 세팅됨 --- .../paragraph/infrastructure/ParagraphFetcherImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/twentythree/peech/paragraph/infrastructure/ParagraphFetcherImpl.java b/src/main/java/com/twentythree/peech/paragraph/infrastructure/ParagraphFetcherImpl.java index fee8a53..946d829 100644 --- a/src/main/java/com/twentythree/peech/paragraph/infrastructure/ParagraphFetcherImpl.java +++ b/src/main/java/com/twentythree/peech/paragraph/infrastructure/ParagraphFetcherImpl.java @@ -1,6 +1,5 @@ package com.twentythree.peech.paragraph.infrastructure; -import com.twentythree.peech.common.utils.ScriptUtils; import com.twentythree.peech.paragraph.domain.ParagraphFetcher; import com.twentythree.peech.paragraph.domain.ParagraphsDomain; import com.twentythree.peech.paragraph.domain.ParagraphsInformationDomain; @@ -17,6 +16,8 @@ import java.util.Comparator; import java.util.List; +import static com.twentythree.peech.common.utils.ScriptUtils.sumLocalTime; + @RequiredArgsConstructor @Transactional(readOnly = true) @Component @@ -79,6 +80,8 @@ public ParagraphsInformationDomain fetchParagraphsInformation(Long scriptId) { if (latestParagraphOrder == null) { latestParagraphOrder = paragraphOrder; paragraphContent = sentence.getSentenceContent(); + expectedTimePerParagraph = sumLocalTime(expectedTimePerParagraph, sentence.getSentenceExpectTime()); + realTimePerParagraph = sumLocalTime(realTimePerParagraph, sentence.getSentenceRealTime()); } else if (paragraphOrder > latestParagraphOrder) { @@ -88,8 +91,8 @@ else if (paragraphOrder > latestParagraphOrder) { paragraphContent = sentence.getSentenceContent(); } else if (paragraphOrder.equals(latestParagraphOrder)) { paragraphContent += sentence.getSentenceContent(); - expectedTimePerParagraph = ScriptUtils.sumLocalTime(expectedTimePerParagraph, sentence.getSentenceExpectTime()); - realTimePerParagraph = ScriptUtils.sumLocalTime(realTimePerParagraph, sentence.getSentenceRealTime()); + expectedTimePerParagraph = sumLocalTime(expectedTimePerParagraph, sentence.getSentenceExpectTime()); + realTimePerParagraph = sumLocalTime(realTimePerParagraph, sentence.getSentenceRealTime()); } else { throw new RuntimeException("문단 도메인 생성중 알 수 없는 오류 발생"); }