-
Notifications
You must be signed in to change notification settings - Fork 2.5k
FINERACT-176: During allocation and settle cash for a cashier if valid inputs are not given then error message displayed as Unknown data integrity issue #5473
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.
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
Merged
+115
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
113 changes: 113 additions & 0 deletions
113
.../fineract/organisation/teller/serialization/TellerCommandFromApiJsonDeserializerTest.java
This file contains hidden or 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,113 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.fineract.organisation.teller.serialization; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.math.BigDecimal; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.apache.fineract.infrastructure.core.exception.InvalidJsonException; | ||
| import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; | ||
| import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.function.Executable; | ||
| import org.springframework.lang.NonNull; | ||
| import org.springframework.lang.Nullable; | ||
|
|
||
| class TellerCommandFromApiJsonDeserializerTest { | ||
|
|
||
| private final FromJsonHelper fromJsonHelper = new FromJsonHelper(); | ||
| private final TellerCommandFromApiJsonDeserializer underTest = new TellerCommandFromApiJsonDeserializer(fromJsonHelper); | ||
|
|
||
| @Test | ||
| public void testCashTxnValidJsonPassesValidation() throws JsonProcessingException { | ||
| String json = cashTxnJson(BigDecimal.valueOf(1000), "10 September 2022", "Test note", "USD"); | ||
| assertDoesNotThrow(() -> underTest.validateForCashTxnForCashier(json)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCashTxnBlankOrNullJsonThrowsInvalidJsonException() { | ||
| String whitespaceOnly = " "; | ||
| assertThrows(InvalidJsonException.class, () -> underTest.validateForCashTxnForCashier(null)); | ||
| assertThrows(InvalidJsonException.class, () -> underTest.validateForCashTxnForCashier("")); | ||
| assertThrows(InvalidJsonException.class, () -> underTest.validateForCashTxnForCashier(whitespaceOnly)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCashTxnMissingTxnAmountThrowsValidationException() { | ||
| assertPlatformValidationException("The parameter `txnAmount` is mandatory.", "validation.msg.teller.txnAmount.cannot.be.blank", | ||
| () -> underTest.validateForCashTxnForCashier(cashTxnJson(null, "10 September 2022", "Test note", "USD"))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCashTxnMissingTxnDateThrowsValidationException() { | ||
| assertPlatformValidationException("The parameter `txnDate` is mandatory.", "validation.msg.teller.txnDate.cannot.be.blank", | ||
| () -> underTest.validateForCashTxnForCashier(cashTxnJson(BigDecimal.valueOf(1000), null, "Test note", "USD"))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCashTxnTxnNoteExceedingMaxLengthThrowsValidationException() { | ||
| assertPlatformValidationException("The parameter `txnNote` exceeds max length of 200.", | ||
| "validation.msg.teller.txnNote.exceeds.max.length", () -> underTest | ||
| .validateForCashTxnForCashier(cashTxnJson(BigDecimal.valueOf(1000), "10 September 2022", "A".repeat(201), "USD"))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCashTxnCurrencyCodeExceedingMaxLengthThrowsValidationException() { | ||
| assertPlatformValidationException("The parameter `currencyCode` exceeds max length of 3.", | ||
| "validation.msg.teller.currencyCode.exceeds.max.length", () -> underTest | ||
| .validateForCashTxnForCashier(cashTxnJson(BigDecimal.valueOf(1000), "10 September 2022", "Test note", "ABCD"))); | ||
| } | ||
|
|
||
| @NonNull | ||
| private String cashTxnJson(@Nullable BigDecimal txnAmount, @Nullable String txnDate, @Nullable String txnNote, | ||
| @Nullable String currencyCode) throws JsonProcessingException { | ||
| Map<String, Object> map = new HashMap<>(); | ||
| map.put("dateFormat", "dd MMMM yyyy"); | ||
| map.put("locale", "en"); | ||
| Optional.ofNullable(txnAmount).ifPresent(a -> map.put("txnAmount", a)); | ||
| Optional.ofNullable(txnDate).ifPresent(d -> map.put("txnDate", d)); | ||
| Optional.ofNullable(txnNote).ifPresent(n -> map.put("txnNote", n)); | ||
| Optional.ofNullable(currencyCode).ifPresent(c -> map.put("currencyCode", c)); | ||
| return createJsonCommand(map); | ||
| } | ||
|
|
||
| @NonNull | ||
| private String createJsonCommand(Map<String, Object> jsonMap) throws JsonProcessingException { | ||
| ObjectMapper objectMapper = new ObjectMapper(); | ||
| return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonMap); | ||
| } | ||
|
|
||
| private void assertPlatformValidationException(String message, String code, Executable executable) { | ||
| PlatformApiDataValidationException validationException = assertThrows(PlatformApiDataValidationException.class, executable); | ||
| assertPlatformException(message, code, validationException); | ||
| } | ||
|
|
||
| private void assertPlatformException(String expectedMessage, String expectedCode, | ||
| PlatformApiDataValidationException platformApiDataValidationException) { | ||
| Assertions.assertEquals(expectedMessage, platformApiDataValidationException.getErrors().get(0).getDefaultUserMessage()); | ||
| Assertions.assertEquals(expectedCode, platformApiDataValidationException.getErrors().get(0).getUserMessageGlobalisationCode()); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please cover with a unit or integration tests!
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes sir! I'll get on it now.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All done! I tried to follow other existing tests for my code, but please let me know if I missed anything.