refactor: enhance IdempotencyKeyResolver to support hybrid idempotency strategy

Author: elnafateh

fineract-core/src/main/java/org/apache/fineract/commands/service/IdempotencyKeyResolver.java

@@ -30,12 +30,28 @@ public class IdempotencyKeyResolver {
 
     private final FineractRequestContextHolder fineractRequestContextHolder;
 
+    private  final DeterministicIdempotencyKeyGenerator deterministicGenerator;
+
     private final IdempotencyKeyGenerator idempotencyKeyGenerator;
 
     public String resolve(CommandWrapper wrapper) {
-        return Optional.ofNullable(wrapper.getIdempotencyKey()).orElseGet(() -> getAttribute().orElseGet(idempotencyKeyGenerator::create));
+
+        // If wrapper already has key → use it
+        if (wrapper.getIdempotencyKey() != null) {
+            return wrapper.getIdempotencyKey();
+        }
+
+        // If request attribute exists (internal retry)
+        Optional<String> attributeKey = getAttribute();
+        if (attributeKey.isPresent()) {
+            return attributeKey.get();
+        }
+
+        // hybrid logic (external retry)
+        return deterministicGenerator.generate(wrapper);
     }
 
+
     private Optional<String> getAttribute() {
         return Optional.ofNullable(fineractRequestContextHolder.getAttribute(SynchronousCommandProcessingService.IDEMPOTENCY_KEY_ATTRIBUTE))
                 .map(String::valueOf);