Skip to content
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.

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

feat: remove errorMsg #219

Merged
merged 3 commits into from
Nov 16, 2023
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
4 changes: 2 additions & 2 deletions arex-schedule-web-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<parent>
<artifactId>arex-schedule-parent</artifactId>
<groupId>com.arextest</groupId>
<version>1.0.42</version>
<version>1.0.43</version>
</parent>

<profiles>
Expand Down Expand Up @@ -313,5 +313,5 @@
</properties>
</profile>
</profiles>
<version>1.0.42</version>
<version>1.0.43</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.arextest.schedule.progress.ProgressEvent;
import com.arextest.schedule.service.noise.ReplayNoiseIdentify;
import com.arextest.schedule.utils.ReplayParentBinder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -251,6 +252,10 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan,
CompletableFuture removeRecordsAndScenesTask = CompletableFuture.runAsync(
() -> replayReportService.removeRecordsAndScenes(actionIdAndRecordIdsMap),
rerunPrepareExecutorService);
CompletableFuture removeErrorMsgTask = CompletableFuture.runAsync(
() -> replayReportService.removeErrorMsg(replayPlan.getId(),
new ArrayList<>(actionIdAndRecordIdsMap.keySet())),
rerunPrepareExecutorService);
// XXX: Whether batch update actionCaseItem status is redundant, rerun in doFixedCaseSave has already
// implemented this processing
CompletableFuture batchUpdateStatusTask = CompletableFuture.runAsync(
Expand All @@ -260,8 +265,8 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan,
() -> replayNoiseIdentify.rerunNoiseAnalysisRecovery(replayPlan.getReplayActionItemList()),
rerunPrepareExecutorService);

CompletableFuture.allOf(removeRecordsAndScenesTask, batchUpdateStatusTask, noiseAnalysisRecover)
.join();
CompletableFuture.allOf(removeRecordsAndScenesTask, batchUpdateStatusTask, noiseAnalysisRecover,
removeErrorMsgTask).join();
}

public void doResumeOperationDescriptor(ReplayPlan replayPlan) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.arextest.schedule.model.ReplayStatusType;
import com.arextest.schedule.model.converter.ReplayCompareResultConverter;
import com.arextest.web.model.contract.contracts.ChangeReplayStatusRequestType;
import com.arextest.web.model.contract.contracts.RemoveErrorMsgRequest;
import com.arextest.web.model.contract.contracts.RemoveRecordsAndScenesRequest;
import com.arextest.web.model.contract.contracts.ReportInitialRequestType;
import com.arextest.web.model.contract.contracts.replay.AnalyzeCompareResultsRequestType;
Expand Down Expand Up @@ -54,6 +55,8 @@ public final class ReplayReportService implements ComparisonWriter {
private String updateReportInfoUrl;
@Value("${arex.api.remove.records.url}")
private String removeRecordsUrl;
@Value("${arex.api.remove.errorMsg.url}")
private String removeErrorMsgUrl;

public boolean initReportInfo(ReplayPlan replayPlan) {
ReportInitialRequestType requestType = new ReportInitialRequestType();
Expand Down Expand Up @@ -252,4 +255,13 @@ public void removeRecordsAndScenes(Map<String, List<String>> actionIdAndRecordId
GenericResponseType.class);
LOGGER.info("removeRecordsAndScenes request:{}, response:{}", requestType, response);
}

public void removeErrorMsg(String planId, List<String> planItemIdList) {
RemoveErrorMsgRequest request = new RemoveErrorMsgRequest();
request.setPlanId(planId);
request.setPlanItemIdList(planItemIdList);
Response response = httpWepServiceApiClient.jsonPost(removeErrorMsgUrl, request,
GenericResponseType.class);
LOGGER.info("removeErrorMsg request:{}, response:{}", request, response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ arex.api.push.compareResult.url=${arex.api.service.api}/api/report/analyzeCompar
arex.api.push.replayStatus.url=${arex.api.service.api}/api/report/pushReplayStatus
arex.api.update.report.info.url=${arex.api.service.api}/api/report/updateReportInfo
arex.api.remove.records.url=${arex.api.service.api}/api/report/removeRecordsAndScenes
arex.api.remove.errorMsg.url=${arex.api.service.api}/api/report/removeErrorMsg
arex.api.config.addExclusion.url=${arex.api.service.api}/api/config/comparison/exclusions/batchModify/INSERT
#for schedule
arex.api.config.system.url=${arex.api.service.api}/api/system/config/list
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<sonar.jacoco.reportPath>${jacoco.report.path}</sonar.jacoco.reportPath>
<!-- Users could specify this property as true to skip the deploy process -->
<spring.boot.version>2.6.3</spring.boot.version>
<web-contract.version>0.6.0.7</web-contract.version>
<web-contract.version>0.6.0.9</web-contract.version>
</properties>

<scm>
Expand All @@ -299,5 +299,5 @@
<url>https://github.com/arextest/arex-replay-schedule</url>
</scm>
<url>https://github.com/arextest/arex-replay-schedule</url>
<version>1.0.42</version>
<version>1.0.43</version>
</project>