Search in sources :

Example 16 with FRStandingOrder

use of com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder in project openbanking-aspsp by OpenBankingToolkit.

the class StandingOrdersApiController method getAccountStandingOrders.

@Override
public ResponseEntity<OBReadStandingOrder6> getAccountStandingOrders(String accountId, int page, String authorization, DateTime xFapiAuthDate, String xFapiCustomerIpAddress, String xFapiInteractionId, String xCustomerUserAgent, List<OBExternalPermissions1Code> permissions, String httpUrl) throws OBErrorResponseException {
    log.info("Read standing orders for account {} with minimumPermissions {}", accountId, permissions);
    Page<FRStandingOrder> standingOrders = frStandingOrderRepository.byAccountIdWithPermissions(accountId, toFRExternalPermissionsCodeList(permissions), PageRequest.of(page, pageLimitStandingOrders));
    int totalPages = standingOrders.getTotalPages();
    return ResponseEntity.ok(new OBReadStandingOrder6().data(new OBReadStandingOrder6Data().standingOrder(standingOrders.getContent().stream().map(FRStandingOrder::getStandingOrder).map(FRStandingOrderConverter::toOBStandingOrder6).map(so -> accountDataInternalIdFilter.apply(so)).collect(Collectors.toList()))).links(PaginationUtil.generateLinks(httpUrl, page, totalPages)).meta(PaginationUtil.generateMetaData(totalPages)));
}
Also used : OBReadStandingOrder6(uk.org.openbanking.datamodel.account.OBReadStandingOrder6) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) OBReadStandingOrder6Data(uk.org.openbanking.datamodel.account.OBReadStandingOrder6Data)

Example 17 with FRStandingOrder

use of com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder in project openbanking-aspsp by OpenBankingToolkit.

the class AcceptDomesticStandingOrderTaskTest method pendingStandingOrder_finalPaymentDue_shouldDebitAccount.

@Test
public void pendingStandingOrder_finalPaymentDue_shouldDebitAccount() throws CurrencyConverterException {
    // Given
    FRStandingOrder payment = defaultPayment(StandingOrderStatus.ACTIVE);
    payment.getStandingOrder().setNextPaymentDateTime(payment.getStandingOrder().getFinalPaymentDateTime());
    given(paymentsService.getActiveStandingOrders()).willReturn(Collections.singletonList(payment));
    FRAccount account = defaultAccount(DEBIT_ACCOUNT);
    given(account2StoreService.getAccount(DEBIT_ACCOUNT)).willReturn(account);
    // When
    acceptDueStandingOrderTask.payDueStandingOrders();
    // Then
    verify(moneyService).moveMoney(eq(account), any(), eq(FRCreditDebitIndicator.DEBIT), eq(payment), any());
    verify(paymentsService).updateStandingOrder(argThat(p -> p.getStatus().equals(StandingOrderStatus.COMPLETED)));
}
Also used : ArgumentMatchers.any(org.mockito.ArgumentMatchers.any) ArgumentMatchers.argThat(org.mockito.ArgumentMatchers.argThat) Mock(org.mockito.Mock) ArgumentMatchers.eq(org.mockito.ArgumentMatchers.eq) Assertions.assertThat(org.assertj.core.api.Assertions.assertThat) RunWith(org.junit.runner.RunWith) FrequencyService(com.forgerock.openbanking.common.services.openbanking.frequency.FrequencyService) StandingOrderStatus(com.forgerock.openbanking.common.model.openbanking.status.StandingOrderStatus) Mockito.verifyZeroInteractions(org.mockito.Mockito.verifyZeroInteractions) AccountStoreService(com.forgerock.openbanking.common.services.store.account.AccountStoreService) Mockito.doThrow(org.mockito.Mockito.doThrow) BDDMockito.given(org.mockito.BDDMockito.given) FRCreditDebitIndicator(com.forgerock.openbanking.common.model.openbanking.domain.account.common.FRCreditDebitIndicator) MoneyService(com.forgerock.openbanking.aspsp.rs.simulator.service.MoneyService) FRAccount(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRAccount) InjectMocks(org.mockito.InjectMocks) FRAccountIdentifier(com.forgerock.openbanking.common.model.openbanking.domain.common.FRAccountIdentifier) DateTime(org.joda.time.DateTime) Test(org.junit.Test) Mockito.times(org.mockito.Mockito.times) FRAmount(com.forgerock.openbanking.common.model.openbanking.domain.common.FRAmount) Mockito.verify(org.mockito.Mockito.verify) FRStandingOrderStatus(com.forgerock.openbanking.common.model.openbanking.domain.account.FRStandingOrderData.FRStandingOrderStatus) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) CurrencyConverterException(com.tunyk.currencyconverter.api.CurrencyConverterException) StandingOrderService(com.forgerock.openbanking.common.services.store.account.standingorder.StandingOrderService) Optional(java.util.Optional) FRStandingOrderData(com.forgerock.openbanking.common.model.openbanking.domain.account.FRStandingOrderData) PaymentNotificationFacade(com.forgerock.openbanking.aspsp.rs.simulator.service.PaymentNotificationFacade) MockitoJUnitRunner(org.mockito.junit.MockitoJUnitRunner) Collections(java.util.Collections) FRAccount(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRAccount) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) Test(org.junit.Test)

Example 18 with FRStandingOrder

use of com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder in project openbanking-aspsp by OpenBankingToolkit.

the class AcceptDomesticStandingOrderTaskTest method scheduledPayment_ignoreIfInactive.

@Test
public void scheduledPayment_ignoreIfInactive() {
    // Given
    FRStandingOrder payment = defaultPayment(StandingOrderStatus.PENDING);
    payment.getStandingOrder().setStandingOrderStatusCode(FRStandingOrderStatus.INACTIVE);
    given(paymentsService.getActiveStandingOrders()).willReturn(Collections.singletonList(payment));
    // When
    acceptDueStandingOrderTask.payDueStandingOrders();
    // Then
    verifyZeroInteractions(moneyService);
}
Also used : FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) Test(org.junit.Test)

Example 19 with FRStandingOrder

use of com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder in project openbanking-aspsp by OpenBankingToolkit.

the class StandingOrdersApiController method getAccountStandingOrders.

@Override
public ResponseEntity<OBReadStandingOrder2> getAccountStandingOrders(@ApiParam(value = "A unique identifier used to identify the account resource.", required = true) @PathVariable("AccountId") String accountId, @ApiParam(value = "Page number.", required = false, defaultValue = "0") @RequestParam(value = "page", defaultValue = "0") int page, @ApiParam(value = "The unique id of the ASPSP to which the request is issued. The unique id will be issued by OB.", required = true) @RequestHeader(value = "x-fapi-financial-id", required = true) String xFapiFinancialId, @ApiParam(value = "An Authorisation Token as per https://tools.ietf.org/html/rfc6750", required = true) @RequestHeader(value = "Authorization", required = true) String authorization, @ApiParam(value = "The time when the PSU last logged in with the TPP.  All dates in the HTTP headers are represented as RFC 7231 Full Dates. An example is below:  Sun, 10 Sep 2017 19:43:31 UTC") @RequestHeader(value = "x-fapi-customer-last-logged-time", required = false) @DateTimeFormat(pattern = HTTP_DATE_FORMAT) DateTime xFapiCustomerLastLoggedTime, @ApiParam(value = "The PSU's IP address if the PSU is currently logged in with the TPP.") @RequestHeader(value = "x-fapi-customer-ip-address", required = false) String xFapiCustomerIpAddress, @ApiParam(value = "An RFC4122 UID used as a correlation id.") @RequestHeader(value = "x-fapi-interaction-id", required = false) String xFapiInteractionId, @ApiParam(value = "Indicates the user-agent that the PSU is using.") @RequestHeader(value = "x-customer-user-agent", required = false) String xCustomerUserAgent, @RequestHeader(value = "x-ob-permissions", required = true) List<OBExternalPermissions1Code> permissions, @RequestHeader(value = "x-ob-url", required = true) String httpUrl) throws OBErrorResponseException {
    LOGGER.info("Read standing orders for account {} with minimumPermissions {}", accountId, permissions);
    Page<FRStandingOrder> standingOrdersResponse = frStandingOrderRepository.byAccountIdWithPermissions(accountId, toFRExternalPermissionsCodeList(permissions), PageRequest.of(page, PAGE_LIMIT_STANDING_ORDERS));
    List<OBStandingOrder2> standingOrders = standingOrdersResponse.stream().map(so -> toOBStandingOrder2(so.getStandingOrder())).collect(Collectors.toList());
    int totalPages = standingOrdersResponse.getTotalPages();
    return ResponseEntity.ok(new OBReadStandingOrder2().data(new OBReadStandingOrder2Data().standingOrder(standingOrders)).links(PaginationUtil.generateLinks(httpUrl, page, totalPages)).meta(PaginationUtil.generateMetaData(totalPages)));
}
Also used : FRStandingOrderConverter.toOBStandingOrder2(com.forgerock.openbanking.common.services.openbanking.converter.account.FRStandingOrderConverter.toOBStandingOrder2) PathVariable(org.springframework.web.bind.annotation.PathVariable) RequestParam(org.springframework.web.bind.annotation.RequestParam) OBStandingOrder2(uk.org.openbanking.datamodel.account.OBStandingOrder2) LoggerFactory(org.slf4j.LoggerFactory) ApiParam(io.swagger.annotations.ApiParam) Autowired(org.springframework.beans.factory.annotation.Autowired) Controller(org.springframework.stereotype.Controller) DateTimeFormat(org.springframework.format.annotation.DateTimeFormat) FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList(com.forgerock.openbanking.common.services.openbanking.converter.account.FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList) Value(org.springframework.beans.factory.annotation.Value) OBExternalPermissions1Code(uk.org.openbanking.datamodel.account.OBExternalPermissions1Code) OBReadStandingOrder2Data(uk.org.openbanking.datamodel.account.OBReadStandingOrder2Data) HTTP_DATE_FORMAT(com.forgerock.openbanking.constants.OpenBankingConstants.HTTP_DATE_FORMAT) FRStandingOrderRepository(com.forgerock.openbanking.aspsp.rs.store.repository.accounts.standingorders.FRStandingOrderRepository) PaginationUtil(com.forgerock.openbanking.aspsp.rs.store.utils.PaginationUtil) Logger(org.slf4j.Logger) OBErrorResponseException(com.forgerock.openbanking.exceptions.OBErrorResponseException) DateTime(org.joda.time.DateTime) PageRequest(org.springframework.data.domain.PageRequest) Page(org.springframework.data.domain.Page) Collectors(java.util.stream.Collectors) List(java.util.List) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) OBReadStandingOrder2(uk.org.openbanking.datamodel.account.OBReadStandingOrder2) ResponseEntity(org.springframework.http.ResponseEntity) RequestHeader(org.springframework.web.bind.annotation.RequestHeader) OBReadStandingOrder2(uk.org.openbanking.datamodel.account.OBReadStandingOrder2) OBReadStandingOrder2Data(uk.org.openbanking.datamodel.account.OBReadStandingOrder2Data) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) FRStandingOrderConverter.toOBStandingOrder2(com.forgerock.openbanking.common.services.openbanking.converter.account.FRStandingOrderConverter.toOBStandingOrder2) OBStandingOrder2(uk.org.openbanking.datamodel.account.OBStandingOrder2)

Example 20 with FRStandingOrder

use of com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder in project openbanking-aspsp by OpenBankingToolkit.

the class StandingOrdersApiController method getStandingOrders.

@Override
public ResponseEntity<OBReadStandingOrder2> getStandingOrders(@ApiParam(value = "The unique id of the ASPSP to which the request is issued. " + "The unique id will be issued by OB.", required = true) @RequestHeader(value = "x-fapi-financial-id", required = true) String xFapiFinancialId, @ApiParam(value = "Page number.", required = false, defaultValue = "0") @RequestParam(value = "page", defaultValue = "0") int page, @ApiParam(value = "An Authorisation Token as per https://tools.ietf.org/html/rfc6750", required = true) @RequestHeader(value = "Authorization", required = true) String authorization, @ApiParam(value = "The time when the PSU last logged in with the TPP.  All dates in the HTTP headers are " + "represented as RFC 7231 Full Dates. An example is below:  Sun, 10 Sep 2017 19:43:31 UTC") @RequestHeader(value = "x-fapi-customer-last-logged-time", required = false) @DateTimeFormat(pattern = HTTP_DATE_FORMAT) DateTime xFapiCustomerLastLoggedTime, @ApiParam(value = "The PSU's IP address if the PSU is currently logged in with the TPP.") @RequestHeader(value = "x-fapi-customer-ip-address", required = false) String xFapiCustomerIpAddress, @ApiParam(value = "An RFC4122 UID used as a correlation id.") @RequestHeader(value = "x-fapi-interaction-id", required = false) String xFapiInteractionId, @ApiParam(value = "Indicates the user-agent that the PSU is using.") @RequestHeader(value = "x-customer-user-agent", required = false) String xCustomerUserAgent, @RequestHeader(value = "x-ob-account-ids", required = true) List<String> accountIds, @RequestHeader(value = "x-ob-permissions", required = true) List<OBExternalPermissions1Code> permissions, @RequestHeader(value = "x-ob-url", required = true) String httpUrl) throws OBErrorResponseException {
    LOGGER.info("Reading standing orders from account ids {}", accountIds);
    Page<FRStandingOrder> standingOrdersResponse = frStandingOrderRepository.byAccountIdInWithPermissions(accountIds, toFRExternalPermissionsCodeList(permissions), PageRequest.of(page, PAGE_LIMIT_STANDING_ORDERS));
    List<OBStandingOrder2> standingOrders = standingOrdersResponse.stream().map(so -> toOBStandingOrder2(so.getStandingOrder())).collect(Collectors.toList());
    int totalPages = standingOrdersResponse.getTotalPages();
    return ResponseEntity.ok(new OBReadStandingOrder2().data(new OBReadStandingOrder2Data().standingOrder(standingOrders)).links(PaginationUtil.generateLinks(httpUrl, page, totalPages)).meta(PaginationUtil.generateMetaData(totalPages)));
}
Also used : FRStandingOrderConverter.toOBStandingOrder2(com.forgerock.openbanking.common.services.openbanking.converter.account.FRStandingOrderConverter.toOBStandingOrder2) PathVariable(org.springframework.web.bind.annotation.PathVariable) RequestParam(org.springframework.web.bind.annotation.RequestParam) OBStandingOrder2(uk.org.openbanking.datamodel.account.OBStandingOrder2) LoggerFactory(org.slf4j.LoggerFactory) ApiParam(io.swagger.annotations.ApiParam) Autowired(org.springframework.beans.factory.annotation.Autowired) Controller(org.springframework.stereotype.Controller) DateTimeFormat(org.springframework.format.annotation.DateTimeFormat) FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList(com.forgerock.openbanking.common.services.openbanking.converter.account.FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList) Value(org.springframework.beans.factory.annotation.Value) OBExternalPermissions1Code(uk.org.openbanking.datamodel.account.OBExternalPermissions1Code) OBReadStandingOrder2Data(uk.org.openbanking.datamodel.account.OBReadStandingOrder2Data) HTTP_DATE_FORMAT(com.forgerock.openbanking.constants.OpenBankingConstants.HTTP_DATE_FORMAT) FRStandingOrderRepository(com.forgerock.openbanking.aspsp.rs.store.repository.accounts.standingorders.FRStandingOrderRepository) PaginationUtil(com.forgerock.openbanking.aspsp.rs.store.utils.PaginationUtil) Logger(org.slf4j.Logger) OBErrorResponseException(com.forgerock.openbanking.exceptions.OBErrorResponseException) DateTime(org.joda.time.DateTime) PageRequest(org.springframework.data.domain.PageRequest) Page(org.springframework.data.domain.Page) Collectors(java.util.stream.Collectors) List(java.util.List) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) OBReadStandingOrder2(uk.org.openbanking.datamodel.account.OBReadStandingOrder2) ResponseEntity(org.springframework.http.ResponseEntity) RequestHeader(org.springframework.web.bind.annotation.RequestHeader) OBReadStandingOrder2(uk.org.openbanking.datamodel.account.OBReadStandingOrder2) OBReadStandingOrder2Data(uk.org.openbanking.datamodel.account.OBReadStandingOrder2Data) FRStandingOrder(com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder) FRStandingOrderConverter.toOBStandingOrder2(com.forgerock.openbanking.common.services.openbanking.converter.account.FRStandingOrderConverter.toOBStandingOrder2) OBStandingOrder2(uk.org.openbanking.datamodel.account.OBStandingOrder2)

Aggregations

FRStandingOrder (com.forgerock.openbanking.common.model.openbanking.persistence.account.FRStandingOrder)22 DateTime (org.joda.time.DateTime)13 FRStandingOrderData (com.forgerock.openbanking.common.model.openbanking.domain.account.FRStandingOrderData)7 List (java.util.List)7 Test (org.junit.Test)7 MoneyService (com.forgerock.openbanking.aspsp.rs.simulator.service.MoneyService)6 PaymentNotificationFacade (com.forgerock.openbanking.aspsp.rs.simulator.service.PaymentNotificationFacade)6 FRStandingOrderRepository (com.forgerock.openbanking.aspsp.rs.store.repository.accounts.standingorders.FRStandingOrderRepository)6 PaginationUtil (com.forgerock.openbanking.aspsp.rs.store.utils.PaginationUtil)6 FRStandingOrderStatus (com.forgerock.openbanking.common.model.openbanking.domain.account.FRStandingOrderData.FRStandingOrderStatus)6 FRCreditDebitIndicator (com.forgerock.openbanking.common.model.openbanking.domain.account.common.FRCreditDebitIndicator)6 FRAccountIdentifier (com.forgerock.openbanking.common.model.openbanking.domain.common.FRAccountIdentifier)6 FRAmount (com.forgerock.openbanking.common.model.openbanking.domain.common.FRAmount)6 FRAccount (com.forgerock.openbanking.common.model.openbanking.persistence.account.FRAccount)6 StandingOrderStatus (com.forgerock.openbanking.common.model.openbanking.status.StandingOrderStatus)6 FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList (com.forgerock.openbanking.common.services.openbanking.converter.account.FRExternalPermissionsCodeConverter.toFRExternalPermissionsCodeList)6 FrequencyService (com.forgerock.openbanking.common.services.openbanking.frequency.FrequencyService)6 AccountStoreService (com.forgerock.openbanking.common.services.store.account.AccountStoreService)6 HTTP_DATE_FORMAT (com.forgerock.openbanking.constants.OpenBankingConstants.HTTP_DATE_FORMAT)6 OBErrorResponseException (com.forgerock.openbanking.exceptions.OBErrorResponseException)6