require unlockuuid for bulk requests

Author: stremovsky

src/main/java/org/databunker/DatabunkerproApi.java

@@ -253,6 +253,31 @@ public Map<String, Object> updatePolicy(String policyid, Map<String, Object> dat
     }
 
     // Bulk Operations - Additional methods
+    public Map<String, Object> bulkListUnlock(Map<String, Object> requestMetadata) throws IOException {
+        return makeRequest("BulkListUnlock", null, requestMetadata);
+    }
+
+    public Map<String, Object> bulkListUsers(String unlockuuid, int offset, int limit, Map<String, Object> requestMetadata) throws IOException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("unlockuuid", unlockuuid);
+        data.put("offset", offset);
+        data.put("limit", limit);
+        return makeRequest("BulkListUsers", data, requestMetadata);
+    }
+
+    public Map<String, Object> bulkListGroupUsers(String unlockuuid, String groupname, int offset, int limit, Map<String, Object> requestMetadata) throws IOException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("unlockuuid", unlockuuid);
+        data.put("offset", offset);
+        data.put("limit", limit);
+        if (groupname.matches("\\d+")) {
+            data.put("groupid", groupname);
+        } else {
+            data.put("groupname", groupname);
+        }
+        return makeRequest("BulkListGroupUsers", data, requestMetadata);
+    }
+
     public Map<String, Object> bulkListUserRequests(String unlockuuid, int offset, int limit, Map<String, Object> requestMetadata) throws IOException {
         Map<String, Object> data = new HashMap<>();
         data.put("unlockuuid", unlockuuid);
@@ -269,6 +294,26 @@ public Map<String, Object> bulkListAuditEvents(String unlockuuid, int offset, in
         return makeRequest("BulkListAuditEvents", data, requestMetadata);
     }
 
+    public Map<String, Object> bulkListTokens(String unlockuuid, String[] tokens, Map<String, Object> requestMetadata) throws IOException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("unlockuuid", unlockuuid);
+        data.put("tokens", tokens);
+        if (requestMetadata != null) {
+            data.put("request_metadata", requestMetadata);
+        }
+        return makeRequest("BulkListTokens", data, null);
+    }
+
+    public Map<String, Object> bulkDeleteTokens(String unlockuuid, String[] tokens, Map<String, Object> requestMetadata) throws IOException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("unlockuuid", unlockuuid);
+        data.put("tokens", tokens);
+        if (requestMetadata != null) {
+            data.put("request_metadata", requestMetadata);
+        }
+        return makeRequest("BulkDeleteTokens", data, null);
+    }
+
     // System Configuration - Additional methods
     public Map<String, Object> getUIConf() throws IOException {
         return makeRequest("TenantGetUIConf", null, null);
@@ -442,24 +487,6 @@ public Map<String, Object> deleteToken(String token, Map<String, Object> request
         return makeRequest("TokenDelete", data, null);
     }
 
-    public Map<String, Object> listTokensBulk(String[] tokens, Map<String, Object> requestMetadata) throws IOException {
-        Map<String, Object> data = new HashMap<>();
-        data.put("tokens", tokens);
-        if (requestMetadata != null) {
-            data.put("request_metadata", requestMetadata);
-        }
-        return makeRequest("TokenListBulk", data, null);
-    }
-
-    public Map<String, Object> deleteTokensBulk(String[] tokens, Map<String, Object> requestMetadata) throws IOException {
-        Map<String, Object> data = new HashMap<>();
-        data.put("tokens", tokens);
-        if (requestMetadata != null) {
-            data.put("request_metadata", requestMetadata);
-        }
-        return makeRequest("TokenDeleteBulk", data, null);
-    }
-
     // Access Token Management
     public Map<String, Object> createXToken(String mode, String identity, Map<String, Object> requestMetadata) throws IOException {
         Map<String, Object> data = new HashMap<>();

src/test/java/org/databunker/DatabunkerproApiPciTest.java

@@ -188,7 +188,14 @@ public void testBulkCreditCardTokenization() throws IOException {
             tokenList[i] = (String) createdTokens.get(i).get("tokenbase");
         }
 
-        Map<String, Object> bulkData = api.listTokensBulk(tokenList, null);
+        // Get unlockuuid for bulk operations
+        Map<String, Object> unlockResult = api.bulkListUnlock(null);
+        assertNotNull(unlockResult);
+        assertEquals("ok", unlockResult.get("status"));
+        String unlockuuid = (String) unlockResult.get("unlockuuid");
+        assertNotNull(unlockuuid);
+
+        Map<String, Object> bulkData = api.bulkListTokens(unlockuuid, tokenList, null);
         System.out.println("Bulk data: " + bulkData);
         assertNotNull(bulkData);
         assertEquals("ok", bulkData.get("status"));
@@ -210,12 +217,12 @@ public void testBulkCreditCardTokenization() throws IOException {
         System.out.println("Successfully retrieved all tokenized records in bulk");
 
         // Step 3: Delete multiple tokens in bulk
-        Map<String, Object> deleteBulkResult = api.deleteTokensBulk(tokenList, null);
+        Map<String, Object> deleteBulkResult = api.bulkDeleteTokens(unlockuuid, tokenList, null);
         assertNotNull(deleteBulkResult);
         assertEquals("ok", deleteBulkResult.get("status"));
 
         // Verify all tokens are deleted
-        Map<String, Object> remainingTokens = api.listTokensBulk(tokenList, null);
+        Map<String, Object> remainingTokens = api.bulkListTokens(unlockuuid, tokenList, null);
         assertNotNull(remainingTokens);
         assertEquals("ok", remainingTokens.get("status"));
         assertEquals(0, ((List<?>) remainingTokens.get("rows")).size());