TrueLayer / truelayer-java / #97

Committed 15 Apr 2024 02:02PM UTC coverage: 90.566% (-0.6%) from 91.176%

Build # #97

Build Type

push

github

Committed by

web-flow

Commit Message

feat(EWT-535): Support for merchant account transactions pagination (#279)

Run Details

4 of 8 new or added lines in 2 files covered. (50.0%)

13 existing lines in 2 files now uncovered.

432 of 477 relevant lines covered (90.57%)

0.91 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

78.95

/src/main/java/com/truelayer/java/merchantaccounts/MerchantAccountsHandler.java

package com.truelayer.java.merchantaccounts;

import static com.truelayer.java.Constants.Scopes.PAYMENTS;
import static com.truelayer.java.http.mappers.HeadersMapper.toMap;
import static java.util.Collections.emptyMap;

import com.truelayer.java.IAuthenticatedHandler;
import com.truelayer.java.entities.RequestScopes;
import com.truelayer.java.http.entities.ApiResponse;
import com.truelayer.java.http.entities.Headers;
import com.truelayer.java.merchantaccounts.entities.*;
import com.truelayer.java.merchantaccounts.entities.sweeping.SweepingSettings;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.CompletableFuture;
import lombok.Builder;

@Builder
public class MerchantAccountsHandler implements IAuthenticatedHandler, IMerchantAccountsHandler {
    private IMerchantAccountsApi merchantAccountsApi;

    @Builder.Default
    private RequestScopes scopes = RequestScopes.builder().scope(PAYMENTS).build();

    @Override
    public RequestScopes getRequestScopes() {
        return scopes;
    }

    @Override
    public CompletableFuture<ApiResponse<ListMerchantAccountsResponse>> listMerchantAccounts() {
        return merchantAccountsApi.listMerchantAccounts(getRequestScopes());
    }

    @Override
    public CompletableFuture<ApiResponse<MerchantAccount>> getMerchantAccountById(String merchantAccountId) {
        return merchantAccountsApi.getMerchantAccountById(getRequestScopes(), merchantAccountId);
    }

    @Override
    public CompletableFuture<ApiResponse<ListTransactionsResponse>> listTransactions(
            String merchantAccountId, ListTransactionsQuery query) {
        String from = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.from());
        String to = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.to());
        return merchantAccountsApi.listTransactions(
                getRequestScopes(), emptyMap(), merchantAccountId, from, to, query.type(), query.cursor());
    }

    @Override
    public CompletableFuture<ApiResponse<ListTransactionsResponse>> listTransactions(
            Headers headers, String merchantAccountId, ListTransactionsQuery query) {
        String from = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.from());
        String to = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.to());
        return merchantAccountsApi.listTransactions(
                getRequestScopes(), toMap(headers), merchantAccountId, from, to, query.type(), query.cursor());
    }

    @Override
    public CompletableFuture<ApiResponse<SweepingSettings>> updateSweeping(
            String merchantAccountId, UpdateSweepingRequest updateSweepingRequest) {
        return merchantAccountsApi.updateSweeping(
                getRequestScopes(), emptyMap(), merchantAccountId, updateSweepingRequest);
    }

    @Override
    public CompletableFuture<ApiResponse<SweepingSettings>> updateSweeping(
            Headers headers, String merchantAccountId, UpdateSweepingRequest updateSweepingRequest) {
        return merchantAccountsApi.updateSweeping(
                getRequestScopes(), toMap(headers), merchantAccountId, updateSweepingRequest);
    }

    @Override
    public CompletableFuture<ApiResponse<SweepingSettings>> getSweepingSettings(String merchantAccountId) {
        return merchantAccountsApi.getSweepingSettings(getRequestScopes(), merchantAccountId);
    }

    @Override
    public CompletableFuture<ApiResponse<Void>> disableSweeping(String merchantAccountId) {
        return merchantAccountsApi.disableSweeping(getRequestScopes(), emptyMap(), merchantAccountId);
    }

    @Override
    public CompletableFuture<ApiResponse<Void>> disableSweeping(Headers headers, String merchantAccountId) {
        return merchantAccountsApi.disableSweeping(getRequestScopes(), toMap(headers), merchantAccountId);
    }

    @Override
    public CompletableFuture<ApiResponse<ListPaymentSourcesResponse>> listPaymentSources(
            String merchantAccountId, ListPaymentSourcesQuery query) {
        return merchantAccountsApi.listPaymentSources(getRequestScopes(), merchantAccountId, query.userId());
    }
}

1	package com.truelayer.java.merchantaccounts;
2
3	import static com.truelayer.java.Constants.Scopes.PAYMENTS;
4	import static com.truelayer.java.http.mappers.HeadersMapper.toMap;
5	import static java.util.Collections.emptyMap;
6
7	import com.truelayer.java.IAuthenticatedHandler;
8	import com.truelayer.java.entities.RequestScopes;
9	import com.truelayer.java.http.entities.ApiResponse;
10	import com.truelayer.java.http.entities.Headers;
11	import com.truelayer.java.merchantaccounts.entities.*;
12	import com.truelayer.java.merchantaccounts.entities.sweeping.SweepingSettings;
13	import java.time.format.DateTimeFormatter;
14	import java.util.concurrent.CompletableFuture;
15	import lombok.Builder;
16
17	@Builder
18	public class MerchantAccountsHandler implements IAuthenticatedHandler, IMerchantAccountsHandler {
19	private IMerchantAccountsApi merchantAccountsApi;
20
21	@Builder.Default
22	private RequestScopes scopes = RequestScopes.builder().scope(PAYMENTS).build();
23
24	@Override
25	public RequestScopes getRequestScopes() {
26	return scopes;	1✔
27	}
28
29	@Override
30	public CompletableFuture<ApiResponse<ListMerchantAccountsResponse>> listMerchantAccounts() {
31	return merchantAccountsApi.listMerchantAccounts(getRequestScopes());	1✔
32	}
33
34	@Override
35	public CompletableFuture<ApiResponse<MerchantAccount>> getMerchantAccountById(String merchantAccountId) {
36	return merchantAccountsApi.getMerchantAccountById(getRequestScopes(), merchantAccountId);	1✔
37	}
38
39	@Override
40	public CompletableFuture<ApiResponse<ListTransactionsResponse>> listTransactions(
41	String merchantAccountId, ListTransactionsQuery query) {
42	String from = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.from());	1✔
43	String to = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.to());	1✔
44	return merchantAccountsApi.listTransactions(	1✔
45	getRequestScopes(), emptyMap(), merchantAccountId, from, to, query.type(), query.cursor());	1✔
46	}
47
48	@Override
49	public CompletableFuture<ApiResponse<ListTransactionsResponse>> listTransactions(
50	Headers headers, String merchantAccountId, ListTransactionsQuery query) {
NEW 51	String from = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.from());	×
NEW 52	String to = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(query.to());	×
NEW 53	return merchantAccountsApi.listTransactions(	×
NEW 54	getRequestScopes(), toMap(headers), merchantAccountId, from, to, query.type(), query.cursor());	×
55	}
56
57	@Override
58	public CompletableFuture<ApiResponse<SweepingSettings>> updateSweeping(
59	String merchantAccountId, UpdateSweepingRequest updateSweepingRequest) {
60	return merchantAccountsApi.updateSweeping(	1✔
61	getRequestScopes(), emptyMap(), merchantAccountId, updateSweepingRequest);	1✔
62	}
63
64	@Override
65	public CompletableFuture<ApiResponse<SweepingSettings>> updateSweeping(
66	Headers headers, String merchantAccountId, UpdateSweepingRequest updateSweepingRequest) {
67	return merchantAccountsApi.updateSweeping(	1✔
68	getRequestScopes(), toMap(headers), merchantAccountId, updateSweepingRequest);	1✔
69	}
70
71	@Override
72	public CompletableFuture<ApiResponse<SweepingSettings>> getSweepingSettings(String merchantAccountId) {
73	return merchantAccountsApi.getSweepingSettings(getRequestScopes(), merchantAccountId);	1✔
74	}
75
76	@Override
77	public CompletableFuture<ApiResponse<Void>> disableSweeping(String merchantAccountId) {
78	return merchantAccountsApi.disableSweeping(getRequestScopes(), emptyMap(), merchantAccountId);	1✔
79	}
80
81	@Override
82	public CompletableFuture<ApiResponse<Void>> disableSweeping(Headers headers, String merchantAccountId) {
83	return merchantAccountsApi.disableSweeping(getRequestScopes(), toMap(headers), merchantAccountId);	1✔
84	}
85
86	@Override
87	public CompletableFuture<ApiResponse<ListPaymentSourcesResponse>> listPaymentSources(
88	String merchantAccountId, ListPaymentSourcesQuery query) {
89	return merchantAccountsApi.listPaymentSources(getRequestScopes(), merchantAccountId, query.userId());	1✔
90	}
91	}

TrueLayer / truelayer-java / #97

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous