Skip to content

remove payout + bump java 17 #85

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
ggmaleva wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove payout + bump java 17 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
build:
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1
uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
16 changes: 5 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>1.0.19</version>
<version>2.2.0</version>
</parent>

<artifactId>anapi-v2</artifactId>
<version>1.0.4</version>
<version>1.1.0</version>
<packaging>jar</packaging>

<name>anapi-v2</name>
Expand All @@ -19,7 +19,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>15</java.version>
<java.version>17</java.version>
<server.port>8022</server.port>
<management.port>8023</management.port>
<exposed.ports>${server.port} ${management.port}</exposed.ports>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>swag-anapi-v2</artifactId>
<version>1.81-8f1ba21-server</version>
<version>1.86-0f6d0dc-server</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand All @@ -51,11 +51,6 @@
<artifactId>org-management-proto</artifactId>
<version>1.12-1a0110a</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>payout-manager-proto</artifactId>
<version>1.38-635dc24</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>magista-proto</artifactId>
Expand Down Expand Up @@ -83,7 +78,7 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>1.614-3df747f</version>
<version>1.639-4856124</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand Down Expand Up @@ -148,7 +143,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/dev/vality/anapi/v2/api/ReportsApiDelegateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package dev.vality.anapi.v2.api;

import dev.vality.anapi.v2.converter.reporter.request.ParamsToStatReportRequestConverter;
import dev.vality.anapi.v2.model.InlineResponse20014;
import dev.vality.anapi.v2.model.InlineResponse20013;
import dev.vality.anapi.v2.model.Report;
import dev.vality.anapi.v2.model.ReportLink;
import dev.vality.anapi.v2.security.AccessData;
import dev.vality.anapi.v2.security.AccessService;
import dev.vality.anapi.v2.service.ReporterService;
import dev.vality.geck.common.util.TypeUtil;
import dev.vality.anapi.v2.util.DeadlineUtil;
import dev.vality.geck.common.util.TypeUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
Expand All @@ -27,6 +27,7 @@
@SuppressWarnings({"ParameterName"})
public class ReportsApiDelegateService implements ReportsApiDelegate {

public static final String RES_LOG_200 = "<- Res [200]: xRequestID={}";
private final AccessService accessService;
private final ReporterService reporterService;

Expand Down Expand Up @@ -83,7 +84,7 @@ public ResponseEntity<ReportLink> downloadFile(String xRequestID, String partyID
.build());
var response = reporterService.getDownloadUrl(fileID,
TypeUtil.temporalToString(LocalDateTime.now().plus(reportLifetimeSec, ChronoUnit.SECONDS)));
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

Expand All @@ -97,12 +98,12 @@ public ResponseEntity<Report> getReport(String xRequestID, String partyID, Long
.reportId(String.valueOf(reportID))
.build());
var response = reporterService.getReport(reportID);
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

@Override
public ResponseEntity<InlineResponse20014> searchReports(String xRequestID, String partyID, OffsetDateTime fromTime,
public ResponseEntity<InlineResponse20013> searchReports(String xRequestID, String partyID, OffsetDateTime fromTime,
OffsetDateTime toTime, Integer limit,
List<String> reportTypes, String xRequestDeadline,
String shopID, String paymentInstitutionRealm,
Expand All @@ -115,16 +116,16 @@ public ResponseEntity<InlineResponse20014> searchReports(String xRequestID, Stri
.shopIds(shopID == null ? null : List.of(shopID))
.realm(paymentInstitutionRealm)
.build());
InlineResponse20014 response;
InlineResponse20013 response;
if (shopID == null || shopIDs.contains(shopID)) {
var request =
statReportRequestConverter.convert(partyID, shopID, fromTime, toTime, limit, reportTypes,
continuationToken);
response = reporterService.getReports(request);
} else {
response = new InlineResponse20014();
response = new InlineResponse20013();
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/dev/vality/anapi/v2/api/SearchApiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public interface SearchApiDelegate
PaymentsApiDelegate,
ChargebacksApiDelegate,
InvoicesApiDelegate,
PayoutsApiDelegate,
RefundsApiDelegate,
InvoiceTemplatesApiDelegate {

Expand Down
48 changes: 10 additions & 38 deletions src/main/java/dev/vality/anapi/v2/api/SearchApiDelegateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
@SuppressWarnings({"ParameterName", "LineLength"})
public class SearchApiDelegateService implements SearchApiDelegate {

public static final String RES_LOG_200 = "<- Res [200]: xRequestID={}";

private final MagistaService magistaService;
private final AccessService accessService;
private final ParamsToInvoiceSearchQueryConverter invoiceSearchConverter;
private final ParamsToPaymentSearchQueryConverter paymentSearchConverter;
private final ParamsToRefundSearchQueryConverter refundSearchConverter;
private final ParamsToChargebackSearchQueryConverter chargebackSearchConverter;
private final ParamsToPayoutSearchQueryConverter payoutSearchConverter;
private final ParamsToInvoiceTemplateSearchQueryConverter invoiceTemplateSearchConverter;

@Override
Expand Down Expand Up @@ -59,7 +60,7 @@ public ResponseEntity<InlineResponse2008> searchInvoices(String xRequestID, Stri
continuationToken);
response = magistaService.searchInvoices(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

Expand Down Expand Up @@ -106,7 +107,7 @@ public ResponseEntity<InlineResponse2009> searchPayments(String xRequestID, Stri
continuationToken);
response = magistaService.searchPayments(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

Expand Down Expand Up @@ -139,7 +140,7 @@ public ResponseEntity<InlineResponse20010> searchRefunds(String xRequestID, Stri
continuationToken);
response = magistaService.searchRefunds(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

Expand Down Expand Up @@ -172,41 +173,12 @@ public ResponseEntity<InlineResponse20011> searchChargebacks(String xRequestID,
continuationToken);
response = magistaService.searchChargebacks(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}

@Override
public ResponseEntity<InlineResponse20012> searchPayouts(String xRequestID, String partyID, OffsetDateTime fromTime, OffsetDateTime toTime, Integer limit, String xRequestDeadline, String shopID, List<String> shopIDs, String paymentInstitutionRealm, String payoutID, String payoutToolType, String continuationToken) {
DeadlineUtil.checkDeadline(xRequestDeadline, xRequestID);
shopIDs = accessService.getRestrictedShops(
AccessData.builder()
.operationId("SearchPayouts")
.partyId(partyID)
.shopIds(ConverterUtil.merge(shopID, shopIDs))
.realm(paymentInstitutionRealm)
.build());
InlineResponse20012 response;
if (shopIDs.isEmpty()) {
response = new InlineResponse20012();
} else {
var query = payoutSearchConverter.convert(
partyID,
fromTime,
toTime,
limit,
shopIDs,
payoutID,
payoutToolType,
continuationToken);
response = magistaService.searchPayouts(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
return ResponseEntity.ok(response);
}

@Override
public ResponseEntity<InlineResponse20013> searchInvoiceTemplates(String xRequestID, String partyID, OffsetDateTime fromTime, OffsetDateTime toTime, Integer limit, String xRequestDeadline, List<String> shopIDs, String paymentInstitutionRealm, String invoiceTemplateID, String invoiceTemplateStatus, String name, String product, OffsetDateTime invoiceValidUntil, String continuationToken) {
public ResponseEntity<InlineResponse20012> searchInvoiceTemplates(String xRequestID, String partyID, OffsetDateTime fromTime, OffsetDateTime toTime, Integer limit, String xRequestDeadline, List<String> shopIDs, String paymentInstitutionRealm, String invoiceTemplateID, String invoiceTemplateStatus, String name, String product, OffsetDateTime invoiceValidUntil, String continuationToken) {
shopIDs = accessService.getRestrictedShops(
AccessData.builder()
.operationId("SearchInvoiceTemplates")
Expand All @@ -215,9 +187,9 @@ public ResponseEntity<InlineResponse20013> searchInvoiceTemplates(String xReques
.realm(paymentInstitutionRealm)
.build());
DeadlineUtil.checkDeadline(xRequestDeadline, xRequestID);
InlineResponse20013 response;
InlineResponse20012 response;
if (shopIDs.isEmpty()) {
response = new InlineResponse20013();
response = new InlineResponse20012();
} else {
var query = invoiceTemplateSearchConverter.convert(
partyID,
Expand All @@ -233,7 +205,7 @@ public ResponseEntity<InlineResponse20013> searchInvoiceTemplates(String xReques
invoiceValidUntil);
response = magistaService.searchInvoiceTemplates(query);
}
log.info("<- Res [200]: xRequestID={}", xRequestID);
log.info(RES_LOG_200, xRequestID);
return ResponseEntity.ok(response);
}
}
39 changes: 0 additions & 39 deletions ...ava/dev/vality/anapi/v2/converter/magista/request/ParamsToPayoutSearchQueryConverter.java
View file
Open in desktop

This file was deleted.

Loading