FINERACT-2553: Modernize User and Role helpers with backward compatibility

Author: Avtansh88

integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java

@@ -1,136 +1,68 @@
-/**
- * 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.integrationtests.useradministration.roles;
 
-
-
-
-import static org.mockito.Mockito.description;
-import org.apache.fineract.client.models.PostRolesRoleIdPermissionsRequest;
-
-import org.apache.fineract.client.models.PostRolesRoleIdPermissionsResponse;
-
-import java.util.HashMap;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
 import java.util.List;
 import java.util.Map;
-import org.apache.fineract.client.models.CommandProcessingResult;
-import org.apache.fineract.client.models.PutPermissionsRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.client.models.PostRolesRequest;
+import org.apache.fineract.client.models.PostRolesResponse;
+import org.apache.fineract.client.models.GetRolesRoleIdResponse;
+import org.apache.fineract.client.models.PostRolesRoleIdPermissionsRequest;
+import org.apache.fineract.client.models.PostRolesRoleIdPermissionsResponse;
 import org.apache.fineract.client.util.Calls;
-import org.apache.fineract.client.util.JSON;
 import org.apache.fineract.integrationtests.common.FineractClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.useradministration.api.PermissionsApiResourceSwagger.GetPermissionsResponse;
-import org.apache.fineract.useradministration.api.RolesApiResourceSwagger.GetRolesRoleIdResponse;
-import org.apache.fineract.useradministration.api.RolesApiResourceSwagger.PostRolesRequest;
-import org.apache.fineract.useradministration.api.RolesApiResourceSwagger.PostRolesResponse;
-
 
+@Slf4j
 public final class RolesHelper {
 
-    public static final long SUPER_USER_ROLE_ID = 1L; // This is hardcoded into the initial Liquibase migration
-
-    public RolesHelper() {
+    public static final long SUPER_USER_ROLE_ID = 1L;
 
-    }
+    private RolesHelper() {}
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
 
-
-     //new method createRole by fiegn
-    public static Long createRole(){
-        PostRolesRequest request=new PostRolesRequest()
-        .name(Utils.uniqueRandomStringGenerator("Role_",4 ))
-        .description("New Role");
-
-        PostRolesResponse response=Calls.ok(FineractClientHelper.getFineractClient().roles.createRole(request));
-        return response.getResourceId();
+    public static Integer createRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
+        log.info("---------------------------------CREATING A ROLE (COMPATIBILITY)---------------------------------------------");
+        PostRolesRequest request = new PostRolesRequest()
+                .name(Utils.uniqueRandomStringGenerator("Role_", 4))
+                .description("New Role");
+        
+        
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.createRole(request)).getResourceId().intValue();
     }
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static PostRolesRequest buildDefaultRoleRequest(){
-    return new PostRolesRequest()
-    .name(Utils.uniqueRandomStringGenerator("Role_Name_",5))
-    .description(Utils.randomStringGenerator("Role_Description_", 10));
-   }
-
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static GetRolesRoleIdResponse getRoleDetails(final Long roleId){
-    return Calls.ok(FineractClientHelper.getFineractClient().roles.retrieveRole(roleId));
-   }
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static Integer disableRole(final Long roleId){
-    return Calls.ok(FineractClientHelper.getFineractClient().roles.disableRole(roleId)).getResourceId();
-   }
-
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-    public static Integer enableRole(final Long roleId){
-        return Calls.ok(FineractClientHelper.getFineractClient().roles.enableRole(roleId)).getResourceId();
+    public static Long createRole() {
+        PostRolesRequest request = new PostRolesRequest()
+                .name(Utils.uniqueRandomStringGenerator("Role_", 4))
+                .description("New Role");
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.createRole(request)).getResourceId();
     }
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static Integer deleteRole(final Long roleId){
-    return Calls.ok(FineractClientHelper.getFineractClient().roles.deleteRole(roleId)).getResourceId();
-   }
-
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-  public static PostRolesRoleIdPermissionsResponse addPermissionsToRole(final Long roleId,final PostRolesRoleIdPermissionsRequest request){
-    return Calls.ok(FineractClientHelper.getFineractClient().roles.updateRolePermissions(roleId,request));
-  }
-
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static List<GetPermissionsResponse> getPermissions(final Boolean makerCheckerable){
-    return Calls.ok(FineractClientHelper.getFineractClient().permissions.retrieveAllPermissions(makerCheckerable));
-   }
+   
+    public static GetRolesRoleIdResponse getRoleDetails(final Long roleId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.retrieveRole(roleId));
+    }
 
-    public CommandProcessingResult updatePermissions(PutPermissionsRequest request) {
-        return Calls.ok(FineractClientHelper.getFineractClient().permissions.updatePermissionsDetails(request));
+    
+    public static String addPermissionsToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
+            final Integer roleId, final Map<String, Boolean> permissionMap) {
+        PostRolesRoleIdPermissionsRequest request = new PostRolesRoleIdPermissionsRequest().permissions(permissionMap);
+        Calls.ok(FineractClientHelper.getFineractClient().roles.updateRolePermissions(roleId.longValue(), request));
+        return ""; 
     }
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
-   public static PostRolesRoleIdPermissionsResponse addPermissionsToRole(final Long roleId, final Map<String, Boolean> permissionMap) {
-    PostRolesRoleIdPermissionsRequest request = new PostRolesRoleIdPermissionsRequest()
-        .permissions(permissionMap);
 
-    return Calls.ok(FineractClientHelper.getFineractClient().roles.updateRolePermissions(roleId, request));
-}
+    public static Integer disableRole(final Long roleId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.disableRole(roleId)).getResourceId().intValue();
+    }
 
-    // TODO: Rewrite to use fineract-client instead!
-    // Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
-    // org.apache.fineract.client.models.PostLoansLoanIdRequest)
+    public static Integer enableRole(final Long roleId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.enableRole(roleId)).getResourceId().intValue();
+    }
 
-}
+    public static Integer deleteRole(final Long roleId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.deleteRole(roleId)).getResourceId().intValue();
+    }
+}