Skip to content

241122 V2 #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dduqqo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

241122 V2 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cdb2a6
bug: TT-510
dduqqo Nov 21, 2024
206c3a7
Merge pull request #414 from twenty-three-23/feature/TT-510
dduqqo Nov 21, 2024
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
9 changes: 5 additions & 4 deletions src/main/java/com/twentythree/peech/paragraph/application/ParagraphService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cglib.core.Local;
import org.springframework.stereotype.Service;

import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;

import static com.twentythree.peech.common.utils.ScriptUtils.*;

@RequiredArgsConstructor
@Service
public class ParagraphService {
Expand All @@ -46,14 +47,14 @@ public List<KeyWordsByParagraph> getKeyWordsByScriptId(Long scriptId) {
public HistoryDetailResponseDTO getScriptDetail(Long scriptId) {
ParagraphsInformationDomain paragraphsInformationDomain = paragraphFetcher.fetchParagraphsInformation(scriptId);
List<ParagraphInformation> paragraphInformations = paragraphsInformationDomain.getParagraphInformations();
LocalTime totalRealTime = LocalTime.of(0, 0, 0);
LocalTime totalRealTime = LocalTime.of(0, 0, 0, 0);

List<HistoryParagraphDTO> historyParagraphs = new ArrayList<>();

for(ParagraphInformation paragraphInformation : paragraphInformations) {
String measurement = ScriptUtils.measurementSpeedResult(paragraphInformation.getParagraphRealTime(),
String measurement = measurementSpeedResult(paragraphInformation.getParagraphRealTime(),
paragraphInformation.getParagraphExpectedTime());
totalRealTime = ScriptUtils.sumLocalTime(totalRealTime, paragraphInformation.getParagraphRealTime());
totalRealTime = sumLocalTime(totalRealTime, paragraphInformation.getParagraphRealTime());

historyParagraphs.add(new HistoryParagraphDTO(paragraphInformation.getParagraphOrder(), measurement,
paragraphInformation.getParagraphRealTime(), paragraphInformation.getParagraphContent()));
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/twentythree/peech/paragraph/infrastructure/ParagraphFetcherImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@ public ParagraphsInformationDomain fetchParagraphsInformation(Long scriptId) {
else if (paragraphOrder > latestParagraphOrder) {

paragraphInformations.add(new ParagraphInformation(latestParagraphOrder, paragraphContent, expectedTimePerParagraph, realTimePerParagraph));
expectedTimePerParagraph = LocalTime.of(0,0,0,0);
realTimePerParagraph = LocalTime.of(0,0,0,0);

latestParagraphOrder = paragraphOrder;
paragraphContent = sentence.getSentenceContent();
expectedTimePerParagraph = sumLocalTime(expectedTimePerParagraph, sentence.getSentenceExpectTime());
realTimePerParagraph = sumLocalTime(realTimePerParagraph, sentence.getSentenceRealTime());
} else if (paragraphOrder.equals(latestParagraphOrder)) {
paragraphContent += sentence.getSentenceContent();
expectedTimePerParagraph = sumLocalTime(expectedTimePerParagraph, sentence.getSentenceExpectTime());
Expand Down