valitydev/anapi-v2
14
0
Fork 0
mirror of https://github.com/valitydev/anapi-v2.git synced 2024-11-06 08:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Feedback edits

Browse Source
This commit is contained in:
echerniak 2021-11-25 11:07:10 +03:00
parent 7d4e188a3c
commit 17c0be59d7
No known key found for this signature in database
GPG Key ID: 7D79B3A9CB749B36
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/rbkmoney/anapi/v2/api/ReportsApiDelegateService.java
View File

@ -57,11 +57,8 @@ public class ReportsApiDelegateService implements ReportsApiDelegate {
String shopID, String paymentInstitutionRealm) {
log.info("-> Req: xRequestID={}", xRequestID);
checkDeadline(xRequestDeadline, xRequestID);
if (shopID != null) {
accessService.getAccessibleShops("CreateReport", partyID, List.of(shopID), paymentInstitutionRealm);
} else {
accessService.getAccessibleShops("CreateReport", partyID, paymentInstitutionRealm);
}
var shops = shopID != null ? List.of(shopID) : null;
accessService.getAccessibleShops("CreateReport", partyID, shops, paymentInstitutionRealm);
var request = getReportRequest(partyID, shopID, fromTime, toTime);
var reportId = reporterService.createReport(request, reportType);
var response = reporterService.getReport(reportId);
@ -69,16 +66,6 @@ public class ReportsApiDelegateService implements ReportsApiDelegate {
return ResponseEntity.status(HttpStatus.CREATED).body(response);
}
private ReportRequest getReportRequest(String partyId, String shopId, OffsetDateTime fromTime,
OffsetDateTime toTime) {
return new ReportRequest()
.setPartyId(partyId)
.setShopId(shopId)
.setTimeRange(new ReportTimeRange()
.setFromTime(fromTime.toString())
.setToTime(toTime.toString()));
}
@PreAuthorize("hasAuthority('party:read')")
@Override
public ResponseEntity<ReportLink> downloadFile(String xRequestID, String partyID, Long reportID, String fileID,
@ -130,6 +117,16 @@ public class ReportsApiDelegateService implements ReportsApiDelegate {
return ResponseEntity.ok(response);
}
private ReportRequest getReportRequest(String partyId, String shopId, OffsetDateTime fromTime,
OffsetDateTime toTime) {
return new ReportRequest()
.setPartyId(partyId)
.setShopId(shopId)
.setTimeRange(new ReportTimeRange()
.setFromTime(fromTime.toString())
.setToTime(toTime.toString()));
}
private StatReportRequest getStatReportRequest(String partyId, String shopId, OffsetDateTime fromTime,
OffsetDateTime toTime, Integer limit,
List<String> reportTypes, String continuationToken) {