Skip to content

FINERACT-2553: Modernize Integration Test Helpers to use Fineract-Client #5666

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

FINERACT-2553: Modernize Integration Test Helpers to use Fineract-Client #5666

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
98 changes: 35 additions & 63 deletions integration-tests/src/test/java/org/apache/fineract/integrationtests/MakercheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.fineract.integrationtests;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -27,7 +28,6 @@
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
import io.restassured.specification.ResponseSpecification;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.fineract.client.models.PutGlobalConfigurationsRequest;
Expand All @@ -51,13 +51,11 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

@SuppressWarnings({ "unused" })
public class MakercheckerTest {

private ResponseSpecification responseSpec;
private RequestSpecification requestSpec;
private MakercheckersHelper makercheckersHelper;
private RolesHelper rolesHelper;
private AuditHelper auditHelper;
private SavingsProductHelper savingsProductHelper;
private SavingsAccountHelper savingsAccountHelper;
Expand All @@ -72,7 +70,6 @@ public void setup() {
this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
this.makercheckersHelper = new MakercheckersHelper(this.requestSpec, this.responseSpec);
this.rolesHelper = new RolesHelper();
this.auditHelper = new AuditHelper(requestSpec, responseSpec);
this.savingsProductHelper = new SavingsProductHelper();
this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
Expand All @@ -81,40 +78,37 @@ public void setup() {

@Test
public void testMakercheckerInboxList() {
// given
// when
List<Map<String, Object>> makerCheckerList = this.makercheckersHelper.getMakerCheckerList(null);
assertNotNull(makerCheckerList);
}

@Test
public void testMakerCheckerOn() {

globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(true));
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_SAME_MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(false));

try {
// client permission - maker-checker disabled
// Direct static calls to bypass bridge and instance misuse
PutPermissionsRequest putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("CREATE_CLIENT", false);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("ACTIVATE_CLIENT", false);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

Integer roleId = RolesHelper.createRole(requestSpec, responseSpec);
Map<String, Boolean> permissionMap = Map.of("CREATE_CLIENT", true, "CREATE_CLIENT_CHECKER", true, "ACTIVATE_CLIENT", true,
"ACTIVATE_CLIENT_CHECKER", true, "WITHDRAWAL_SAVINGSACCOUNT", true, "WITHDRAWAL_SAVINGSACCOUNT_CHECKER", true);
RolesHelper.addPermissionsToRole(requestSpec, responseSpec, roleId, permissionMap);

final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
// create maker user
String maker = Utils.uniqueRandomStringGenerator("user", 8);
final Integer makerUserId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, maker,
"A1b2c3d4e5f$", "resourceId");
"QwE!SrTy#9uP0", "resourceId");

// create client - maker-checker disabled
RequestSpecification makerRequestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build()
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(maker, "A1b2c3d4e5f$"));
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(maker, "QwE!SrTy#9uP0"));
Integer clientId = ClientHelper.createClient(makerRequestSpec, this.responseSpec);
assertNotNull(clientId);
ClientHelper.verifyClientCreatedOnServer(requestSpec, this.responseSpec, clientId);
Expand All @@ -125,57 +119,51 @@ public void testMakerCheckerOn() {
CommonConstants.RESPONSE_RESOURCE_ID);
assertNotNull(transactionId);

// client and saving permission - maker-checker enabled
putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("ACTIVATE_CLIENT", true);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("WITHDRAWAL_SAVINGSACCOUNT", true);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

// create client - maker-checker enabled
clientId = ClientHelper.createClient(makerRequestSpec, this.responseSpec);
assertNull(clientId, "Client is created on the server");

List<Map<String, Object>> auditDetails = makercheckersHelper
.getMakerCheckerList(Map.of("actionName", "CREATE", "entityName", "CLIENT", "makerId", makerUserId.toString()));
assertEquals(1, auditDetails.size(), "More than one command exists");
assertEquals(1, auditDetails.size());
Long clientCommandId = ((Double) auditDetails.get(0).get("id")).longValue();

// savings withdrawal - maker-checker enabled
SavingsAccountHelper makerSavingsHelper = new SavingsAccountHelper(makerRequestSpec, this.responseSpec);
Integer withdrawalId = (Integer) makerSavingsHelper.withdrawalFromSavingsAccount(savingsId, "100", TRANSACTION_DATE_STRING,
CommonConstants.RESPONSE_RESOURCE_ID);
assertNull(withdrawalId, "Withdrawal performed on the server");
assertNull(withdrawalId);

auditDetails = makercheckersHelper.getMakerCheckerList(
Map.of("actionName", "WITHDRAWAL", "entityName", "SAVINGSACCOUNT", "makerId", makerUserId.toString()));
assertEquals(1, auditDetails.size(), "More than one command exists");
assertEquals(1, auditDetails.size());
Long savingCommandId = ((Double) auditDetails.get(0).get("id")).longValue();

// check by the same user should fail
ResponseSpecification failedResponseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
MakercheckersHelper.approveMakerCheckerEntry(makerRequestSpec, failedResponseSpec, clientCommandId);
MakercheckersHelper.approveMakerCheckerEntry(makerRequestSpec, failedResponseSpec, savingCommandId);

// create checker user
String checker = Utils.uniqueRandomStringGenerator("user", 8);
final Integer checkerUserId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, checker,
"A1b2c3d4e5f$", "resourceId");
UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, checker, "QwE!SrTy#9uP0", "resourceId");

RequestSpecification checkerRequestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build()
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(checker, "A1b2c3d4e5f$"));
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(checker, "QwE!SrTy#9uP0"));

// check by another checker user should succeed
HashMap<?, ?> response = MakercheckersHelper.approveMakerCheckerEntry(checkerRequestSpec, responseSpec, clientCommandId);
assertNotNull(response);
clientId = (Integer) response.get("clientId");
Map<?, ?> approveResponse = MakercheckersHelper.approveMakerCheckerEntry(checkerRequestSpec, responseSpec, clientCommandId);
assertNotNull(approveResponse);
clientId = (Integer) approveResponse.get("clientId");
assertNotNull(clientId);
ClientHelper.verifyClientCreatedOnServer(requestSpec, responseSpec, clientId);

response = MakercheckersHelper.approveMakerCheckerEntry(checkerRequestSpec, responseSpec, savingCommandId);
assertNotNull(response);
withdrawalId = (Integer) response.get("resourceId");
approveResponse = MakercheckersHelper.approveMakerCheckerEntry(checkerRequestSpec, responseSpec, savingCommandId);
assertNotNull(approveResponse);
withdrawalId = (Integer) approveResponse.get("resourceId");
assertNotNull(withdrawalId);

// add checker superuser permission - actions are performed in one step
permissionMap = Map.of("CHECKER_SUPER_USER", true);
RolesHelper.addPermissionsToRole(requestSpec, responseSpec, roleId, permissionMap);
clientId = ClientHelper.createClient(makerRequestSpec, this.responseSpec);
Expand All @@ -186,88 +174,72 @@ public void testMakerCheckerOn() {
CommonConstants.RESPONSE_RESOURCE_ID);
assertNotNull(withdrawalId);
} finally {

globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(false));

globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_SAME_MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(true));

PutPermissionsRequest putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("WITHDRAWAL_SAVINGSACCOUNT",
false);
rolesHelper.updatePermissions(putPermissionsRequest);
PutPermissionsRequest finalCleanupRequest = new PutPermissionsRequest().putPermissionsItem("WITHDRAWAL_SAVINGSACCOUNT", false);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, finalCleanupRequest.getPermissions());
}
}

@ParameterizedTest
@ValueSource(strings = { "m_client", "m_group", "m_center", "m_loan", "m_office", "m_savings_account" })
public void testRejectDatatableCreationCleansUpOrphanedTable(String apptableName) {

// enable maker-checker globally
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(true));
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_SAME_MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(false));

try {
// enable maker-checker for datatable creation
PutPermissionsRequest putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("CREATE_DATATABLE", true);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

// create role with permissions for maker and checker
Integer roleId = RolesHelper.createRole(requestSpec, responseSpec);
Map<String, Boolean> permissionMap = Map.of("CREATE_DATATABLE", true, "CREATE_DATATABLE_CHECKER", true);
RolesHelper.addPermissionsToRole(requestSpec, responseSpec, roleId, permissionMap);

// create maker user
Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
String maker = Utils.uniqueRandomStringGenerator("user", 8);
Integer makerUserId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, maker,
"A1b2c3d4e5f$", "resourceId");
"QwE!SrTy#9uP0", "resourceId");

// create checker user
String checker = Utils.uniqueRandomStringGenerator("user", 8);
UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, checker, "A1b2c3d4e5f$", "resourceId");
UserHelper.createUser(this.requestSpec, this.responseSpec, roleId, staffId, checker, "QwE!SrTy#9uP0", "resourceId");

RequestSpecification makerRequestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build()
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(maker, "A1b2c3d4e5f$"));
.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey(maker, "QwE!SrTy#9uP0"));

// maker creates datatable with maker-checker enabled, this creates the physical table but queues for
// approval
DatatableHelper makerDatatableHelper = new DatatableHelper(makerRequestSpec, this.responseSpec);
String datatableJson = DatatableHelper.getTestDatatableAsJSON(apptableName, false);
String datatableName = com.google.gson.JsonParser.parseString(datatableJson).getAsJsonObject().get("datatableName")
.getAsString();
makerDatatableHelper.createDatatable(datatableJson, "");

// find the pending command
List<Map<String, Object>> auditDetails = makercheckersHelper
.getMakerCheckerList(Map.of("actionName", "CREATE", "entityName", "DATATABLE", "makerId", makerUserId.toString()));
assertEquals(1, auditDetails.size(), "Error: Expected only one pending CREATE DATATABLE command");
assertEquals(1, auditDetails.size());
Long commandId = ((Double) auditDetails.get(0).get("id")).longValue();

// checker rejects the command which should drop the orphaned table
MakercheckersHelper.rejectMakerCheckerEntry(FineractClientHelper.createNewFineractClient(checker, "A1b2c3d4e5f$"), commandId);
MakercheckersHelper.rejectMakerCheckerEntry(FineractClientHelper.createNewFineractClient(checker, "QwE!SrTy#9uP0"), commandId);

// verify the datatable no longer exists by trying to create it again
// verify without maker checker, so transaction rollback in postgres doesn't break the test
putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("CREATE_DATATABLE", false);
rolesHelper.updatePermissions(putPermissionsRequest);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, putPermissionsRequest.getPermissions());

DatatableHelper adminDatatableHelper = new DatatableHelper(this.requestSpec, this.responseSpec);
String recreatedName = adminDatatableHelper.createDatatable(datatableJson, "resourceIdentifier");
assertEquals(datatableName, recreatedName, "Error: Was not able to recreate datatable after rejection cleanup");
assertEquals(datatableName, recreatedName);

// cleanup after test
adminDatatableHelper.deleteDatatable(datatableName);
} finally {
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(false));
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.ENABLE_SAME_MAKER_CHECKER,
new PutGlobalConfigurationsRequest().enabled(true));

PutPermissionsRequest putPermissionsRequest = new PutPermissionsRequest().putPermissionsItem("CREATE_DATATABLE", false);
rolesHelper.updatePermissions(putPermissionsRequest);
PutPermissionsRequest finalCleanupRequest = new PutPermissionsRequest().putPermissionsItem("CREATE_DATATABLE", false);
RolesHelper.updatePermissions(RolesHelper.SUPER_USER_ROLE_ID, finalCleanupRequest.getPermissions());
}
}

Expand Down
Loading
Loading