FINERACT-2553: Modernize UserHelper and RolesHelper with Fineract-Client

Author: Avtansh88

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

@@ -18,11 +18,14 @@
  */
 package org.apache.fineract.integrationtests.useradministration.roles;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import io.restassured.specification.RequestSpecification;
-import io.restassured.specification.ResponseSpecification;
-import java.lang.reflect.Type;
+
+
+
+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 java.util.List;
 import java.util.Map;
@@ -32,7 +35,11 @@
 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.data.PermissionData;
+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;
+
 
 public final class RolesHelper {
 
@@ -42,91 +49,71 @@ public RolesHelper() {
 
     }
 
-    private static final String CREATE_ROLE_URL = "/fineract-provider/api/v1/roles?" + Utils.TENANT_IDENTIFIER;
-    private static final String ROLE_URL = "/fineract-provider/api/v1/roles";
-    private static final String PERMISSIONS_URL = "/fineract-provider/api/v1/permissions";
-    private static final String DISABLE_ROLE_COMMAND = "disable";
-    private static final String ENABLE_ROLE_COMMAND = "enable";
-
-    private static final Gson GSON = new JSON().getGson();
-
     // 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)
-    @Deprecated(forRemoval = true)
-    public static Integer createRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
-        return Utils.performServerPost(requestSpec, responseSpec, CREATE_ROLE_URL, getTestCreateRoleAsJSON(), "resourceId");
+   
+
+     //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();
     }
 
     // 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)
-    @Deprecated(forRemoval = true)
-    public static String getTestCreateRoleAsJSON() {
-        final HashMap<String, String> map = new HashMap<>();
-        map.put("name", Utils.uniqueRandomStringGenerator("Role_Name_", 5));
-        map.put("description", Utils.randomStringGenerator("Role_Description_", 10));
-        return new Gson().toJson(map);
-    }
+   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)
-    @Deprecated(forRemoval = true)
-    public static HashMap<String, Object> getRoleDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final Integer roleId) {
-        final String GET_ROLE_URL = "/fineract-provider/api/v1/roles/" + roleId + "?" + Utils.TENANT_IDENTIFIER;
-        return Utils.performServerGet(requestSpec, responseSpec, GET_ROLE_URL, "");
-    }
+   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)
-    @Deprecated(forRemoval = true)
-    public static Integer disableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final Integer roleId) {
-        return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(DISABLE_ROLE_COMMAND, roleId), "", "resourceId");
-    }
+   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)
-    @Deprecated(forRemoval = true)
-    public static Integer enableRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final Integer roleId) {
-        return Utils.performServerPost(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "", "resourceId");
+    public static Integer enableRole(final Long roleId){
+        return Calls.ok(FineractClientHelper.getFineractClient().roles.enableRole(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)
-    @Deprecated(forRemoval = true)
-    public static Integer deleteRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final Integer roleId) {
-        return Utils.performServerDelete(requestSpec, responseSpec, createRoleOperationURL(ENABLE_ROLE_COMMAND, roleId), "resourceId");
-    }
+   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)
-    @Deprecated(forRemoval = true)
-    public static String addPermissionsToRole(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final Integer roleId, final Map<String, Boolean> permissionMap) {
-        return Utils.performServerPut(requestSpec, responseSpec, ROLE_URL + "/" + roleId + "/permissions?" + Utils.TENANT_IDENTIFIER,
-                getAddPermissionsToRoleJSON(permissionMap));
-    }
+  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)
-    @Deprecated(forRemoval = true)
-    public static List<PermissionData> getPermissions(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            boolean makerCheckerable) {
-        String response = Utils.performServerGet(requestSpec, responseSpec,
-                PERMISSIONS_URL + "?" + makerCheckerable + "=" + makerCheckerable);
-        final Type listType = new TypeToken<List<PermissionData>>() {}.getType();
-        return GSON.fromJson(response, listType);
-    }
+   public static List<GetPermissionsResponse> getPermissions(final Boolean makerCheckerable){
+    return Calls.ok(FineractClientHelper.getFineractClient().permissions.retrieveAllPermissions(makerCheckerable));
+   }
 
     public CommandProcessingResult updatePermissions(PutPermissionsRequest request) {
         return Calls.ok(FineractClientHelper.getFineractClient().permissions.updatePermissionsDetails(request));
@@ -135,18 +122,15 @@ public CommandProcessingResult updatePermissions(PutPermissionsRequest 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)
-    @Deprecated(forRemoval = true)
-    private static String getAddPermissionsToRoleJSON(Map<String, Boolean> permissionMap) {
-        final HashMap<String, Map<String, Boolean>> map = new HashMap<>();
-        map.put("permissions", permissionMap);
-        return new Gson().toJson(map);
-    }
+   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));
+}
 
     // 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)
-    @Deprecated(forRemoval = true)
-    private static String createRoleOperationURL(final String command, final Integer roleId) {
-        return ROLE_URL + "/" + roleId + "?command=" + command + "&" + Utils.TENANT_IDENTIFIER;
-    }
+
 }