-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f568e56
commit 6f81f16
Showing
11 changed files
with
370 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...tion/lob/app/accounting_reporting_core/resource/AccountingCoreResourceReconciliation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource; | ||
|
||
import io.swagger.v3.oas.annotations.Operation; | ||
import io.swagger.v3.oas.annotations.media.ArraySchema; | ||
import io.swagger.v3.oas.annotations.media.Content; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import io.swagger.v3.oas.annotations.responses.ApiResponse; | ||
import io.swagger.v3.oas.annotations.tags.Tag; | ||
import jakarta.validation.Valid; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import lombok.val; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.resource.presentation_layer_service.AccountingCorePresentationViewService; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests.ReconciliationFilterRequest; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests.ReconciliationRequest; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests.SearchRequest; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.resource.views.*; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.AccountingCoreService; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
import java.time.LocalDate; | ||
import java.util.List; | ||
|
||
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; | ||
import static org.springframework.web.bind.annotation.RequestMethod.POST; | ||
|
||
@RestController | ||
@CrossOrigin(origins = "http://localhost:3000") | ||
@RequestMapping("/api") | ||
@RequiredArgsConstructor | ||
@Slf4j | ||
public class AccountingCoreResourceReconciliation { | ||
private final AccountingCorePresentationViewService accountingCorePresentationService; | ||
private final AccountingCoreService accountingCoreService; | ||
|
||
@Tag(name = "Reconciliation", description = "Reconciliation API") | ||
@Operation(description = "Transaction list", responses = { | ||
@ApiResponse(content = | ||
{@Content(mediaType = APPLICATION_JSON_VALUE, schema = @Schema(implementation = ReconcileResponseView.class))} | ||
) | ||
}) | ||
@PostMapping(value = "/reconcile/trigger", produces = APPLICATION_JSON_VALUE) | ||
public ResponseEntity<?> reconcileTriggerAction(@Valid @RequestBody ReconciliationRequest body) { | ||
|
||
return accountingCoreService.scheduleReconcilation(body.getOrganisationId(), body.getDateFrom(), body.getDateTo()).fold(problem -> { | ||
|
||
return ResponseEntity.status(problem.getStatus().getStatusCode()).body(ReconcileResponseView.createFail(problem.getTitle(), problem)); | ||
}, success -> { | ||
return ResponseEntity.ok(ReconcileResponseView.createSuccess("We have received your reconcile request now.")); | ||
|
||
}); | ||
|
||
} | ||
|
||
@Operation(description = "Transaction list", responses = { | ||
@ApiResponse(content = | ||
{@Content(mediaType = APPLICATION_JSON_VALUE, schema = @Schema(implementation = TransactionReconciliationStatisticView.class))} | ||
) | ||
}) | ||
@Tag(name = "Reconciliation", description = "Reconciliation API") | ||
@PostMapping(value = "/transactions-reconcile", produces = "application/json") | ||
public ResponseEntity<?> reconcileStart(@Valid @RequestBody ReconciliationFilterRequest body) { | ||
TransactionReconciliationStatisticView transactions = accountingCorePresentationService.allReconciliationTransaction(body); | ||
|
||
|
||
return ResponseEntity.ok().body(transactions); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...tion/lob/app/accounting_reporting_core/resource/requests/ReconciliationFilterRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import lombok.Setter; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.ReconcilationCode; | ||
|
||
import java.time.LocalDate; | ||
import java.util.Set; | ||
|
||
@Getter | ||
@Setter | ||
@AllArgsConstructor | ||
//@Builder todo: For testing | ||
@NoArgsConstructor | ||
@Slf4j | ||
public class ReconciliationFilterRequest { | ||
@Schema(example = "75f95560c1d883ee7628993da5adf725a5d97a13929fd4f477be0faf5020ca94") | ||
private String organisationId; | ||
|
||
private ReconciliationFilterStatusRequest filter; | ||
|
||
|
||
} |
17 changes: 17 additions & 0 deletions
17
...ob/app/accounting_reporting_core/resource/requests/ReconciliationFilterStatusRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import lombok.Setter; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
public enum ReconciliationFilterStatusRequest { | ||
RENCONCILED, | ||
|
||
UNRENCONCILED, | ||
|
||
UNPROCESSED | ||
|
||
} |
28 changes: 28 additions & 0 deletions
28
...foundation/lob/app/accounting_reporting_core/resource/requests/ReconciliationRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource.requests; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import lombok.Setter; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
import javax.annotation.Nullable; | ||
import java.time.LocalDate; | ||
|
||
@Getter | ||
@Setter | ||
@AllArgsConstructor | ||
//@Builder todo: For testing | ||
@NoArgsConstructor | ||
@Slf4j | ||
public class ReconciliationRequest { | ||
@Schema(example = "75f95560c1d883ee7628993da5adf725a5d97a13929fd4f477be0faf5020ca94") | ||
private String organisationId; | ||
|
||
@Schema(example = "2014-01-01") | ||
private LocalDate dateFrom; | ||
|
||
@Schema(example = "2024-07-31") | ||
private LocalDate dateTo; | ||
} |
34 changes: 34 additions & 0 deletions
34
...anofoundation/lob/app/accounting_reporting_core/resource/views/ReconcileResponseView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource.views; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.Setter; | ||
import org.zalando.problem.Problem; | ||
|
||
import java.util.Optional; | ||
|
||
@Getter | ||
@Setter | ||
@AllArgsConstructor | ||
public class ReconcileResponseView { | ||
|
||
private String message; | ||
private String event = "RECONCILIATION"; | ||
private Boolean success; | ||
private Optional<Problem> error; | ||
|
||
public static ReconcileResponseView createSuccess(String message) { | ||
return new ReconcileResponseView( | ||
message, | ||
"RECONCILIATION", | ||
true, | ||
Optional.empty() | ||
); | ||
} | ||
|
||
public static ReconcileResponseView createFail(String message, | ||
Problem error) { | ||
return new ReconcileResponseView(message, "RECONCILIATION", false, Optional.of(error)); | ||
} | ||
|
||
} |
25 changes: 25 additions & 0 deletions
25
.../app/accounting_reporting_core/resource/views/TransactionReconciliationStatisticView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package org.cardanofoundation.lob.app.accounting_reporting_core.resource.views; | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
import java.util.HashSet; | ||
import java.util.Set; | ||
|
||
@Getter | ||
@Setter | ||
@AllArgsConstructor | ||
public class TransactionReconciliationStatisticView { | ||
|
||
private Long ok = 0L; | ||
|
||
private Long nok = 0L; | ||
|
||
private Long none = 0L; | ||
|
||
private Long total = 0L; | ||
@JsonProperty("transactions") | ||
private Set<TransactionReconciliationView> transactionReconciliationViewList = new HashSet<>(); | ||
} |
Oops, something went wrong.