feat: 拆分记录上下文与内容归属并把报告改为结构化
This commit is contained in:
+15
-14
@@ -2,6 +2,7 @@ package com.guo.learningprogresstracker.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.guo.learningprogresstracker.common.StudyTimePolicy;
|
||||
import com.guo.learningprogresstracker.dto.ReportSections;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.guo.learningprogresstracker.entity.TaskEntity;
|
||||
@@ -97,7 +98,7 @@ class StudySessionsServiceImplTest {
|
||||
StudySessionsEntity session = createSession(StudySessionStateEnum.ONGOING.name(), 5);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertEquals("本次有效学习时间不足10分钟,不计入总学习时间", message);
|
||||
assertEquals(0, session.getEffectiveTime(), "effectiveTime 应被清零");
|
||||
@@ -113,7 +114,7 @@ class StudySessionsServiceImplTest {
|
||||
StudySessionsEntity session = createSession(StudySessionStateEnum.ONGOING.name(), 15);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertNull(message, "有效时间超过10分钟不应返回提示");
|
||||
assertTrue(session.getEffectiveTime() > 0, "effectiveTime 应保留");
|
||||
@@ -129,7 +130,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setEffectiveTime(5 * 60);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertNull(message, "PAUSED 状态结束不返回提示(用户已主动暂停)");
|
||||
assertEquals(0, session.getEffectiveTime(), "effectiveTime 仍应被实体层清零");
|
||||
@@ -144,7 +145,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setEffectiveTime(15 * 60);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertNull(message);
|
||||
assertTrue(session.getEffectiveTime() > 0, "effectiveTime 应保留");
|
||||
@@ -158,11 +159,11 @@ class StudySessionsServiceImplTest {
|
||||
StudySessionsEntity session = createSession(StudySessionStateEnum.ONGOING.name(), 3);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
studySessionsService.endedStudySession("SESSION_TEST", "测试报告内容");
|
||||
studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "测试报告内容"));
|
||||
|
||||
verify(studyReportsMapper).insert(argThat(report ->
|
||||
"SESSION_TEST".equals(((StudyReportsEntity) report).getSessionNum())
|
||||
&& "测试报告内容".equals(((StudyReportsEntity) report).getContent())
|
||||
&& "测试报告内容".equals(((StudyReportsEntity) report).getFreeSummary())
|
||||
));
|
||||
}
|
||||
|
||||
@@ -174,7 +175,7 @@ class StudySessionsServiceImplTest {
|
||||
StudySessionsEntity session = createSession(StudySessionStateEnum.ONGOING.name(), 10);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertNull(message, "有效时间等于10分钟应保留(阈值为 < 600)");
|
||||
assertTrue(session.getEffectiveTime() >= 10 * 60, "effectiveTime 应保留");
|
||||
@@ -188,7 +189,7 @@ class StudySessionsServiceImplTest {
|
||||
doReturn(Optional.empty()).when(studySessionsService).getOneOpt(any(Wrapper.class));
|
||||
|
||||
assertThrows(Exception.class, () ->
|
||||
studySessionsService.endedStudySession("NOT_EXIST", "内容"));
|
||||
studySessionsService.endedStudySession("NOT_EXIST", new ReportSections(null, null, "内容")));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -199,7 +200,7 @@ class StudySessionsServiceImplTest {
|
||||
StudySessionsEntity session = createSession(StudySessionStateEnum.ONGOING.name(), 1);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "学习内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "学习内容"));
|
||||
|
||||
assertEquals("本次有效学习时间不足10分钟,不计入总学习时间", message);
|
||||
assertEquals(0, session.getEffectiveTime());
|
||||
@@ -219,7 +220,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setActualTime(0);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_INSTANT", "内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_INSTANT", new ReportSections(null, null, "内容"));
|
||||
|
||||
assertEquals("本次有效学习时间不足10分钟,不计入总学习时间", message);
|
||||
assertEquals(0, session.getEffectiveTime());
|
||||
@@ -234,7 +235,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setId(10);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
studySessionsService.endedStudySession("SESSION_TEST", "内容");
|
||||
studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "内容"));
|
||||
|
||||
verify(studySessionsService).update(eq(session), any(Wrapper.class));
|
||||
}
|
||||
@@ -344,7 +345,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setId(20);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "内容"));
|
||||
|
||||
assertNull(message, "截断后 25 分钟 ≥ 10 分钟,不应提示时间不足");
|
||||
assertEquals(25 * 60, session.getEffectiveTime(), "3 小时无人操作只应计入 25 分钟");
|
||||
@@ -398,7 +399,7 @@ class StudySessionsServiceImplTest {
|
||||
session.setEffectiveTime(5 * 60);
|
||||
mockGetOneOpt(session);
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "内容"));
|
||||
|
||||
assertNull(message);
|
||||
verify(studyReportsMapper, never()).insert(any(StudyReportsEntity.class));
|
||||
@@ -415,7 +416,7 @@ class StudySessionsServiceImplTest {
|
||||
mockGetOneOpt(session);
|
||||
doReturn(false).when(studySessionsService).update(any(StudySessionsEntity.class), any(Wrapper.class));
|
||||
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", "内容");
|
||||
String message = studySessionsService.endedStudySession("SESSION_TEST", new ReportSections(null, null, "内容"));
|
||||
|
||||
assertNull(message);
|
||||
verify(studyReportsMapper, never()).insert(any(StudyReportsEntity.class));
|
||||
|
||||
Reference in New Issue
Block a user