FINERACT-2455: Rework WorkingCapitalLoanAddChargeBusinessEvent

fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/charge/WorkingCapitalLoanAddChargeBusinessEvent.java

@@ -18,18 +18,32 @@
  */
 package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge;
 
+import org.apache.fineract.infrastructure.event.business.domain.AbstractBusinessEvent;
 import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge;
 
-public class WorkingCapitalLoanAddChargeBusinessEvent extends WorkingCapitalLoanChargeBusinessEvent {
+public class WorkingCapitalLoanAddChargeBusinessEvent extends AbstractBusinessEvent<WorkingCapitalLoanCharge> {
 
+    private static final String CATEGORY = "WorkingCapitalLoan";
     private static final String TYPE = "WorkingCapitalLoanAddChargeBusinessEvent";
+    private final Long aggregateRootId;
 
     public WorkingCapitalLoanAddChargeBusinessEvent(final WorkingCapitalLoanCharge value) {
         super(value);
+        this.aggregateRootId = value != null && value.getLoan() != null ? value.getLoan().getId() : null;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
     }
 
     @Override
     public String getType() {
         return TYPE;
     }
+
+    @Override
+    public Long getAggregateRootId() {
+        return aggregateRootId;
+    }
 }

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeBusinessEventSerializer.java

@@ -24,7 +24,7 @@
 import org.apache.fineract.avro.generator.ByteBufferSerializable;
 import org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanChargeDataV1;
 import org.apache.fineract.infrastructure.event.business.domain.BusinessEvent;
-import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanChargeBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanAddChargeBusinessEvent;
 import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.BusinessEventSerializer;
 import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge;
 import org.apache.fineract.portfolio.workingcapitalloan.serialization.mapper.WorkingCapitalLoanAccountDataMapper;
@@ -39,12 +39,12 @@ public class WorkingCapitalLoanChargeBusinessEventSerializer implements Business
 
     @Override
     public <T> boolean canSerialize(final BusinessEvent<T> event) {
-        return event instanceof WorkingCapitalLoanChargeBusinessEvent;
+        return event instanceof WorkingCapitalLoanAddChargeBusinessEvent;
     }
 
     @Override
     public <T> ByteBufferSerializable toAvroDTO(final BusinessEvent<T> rawEvent) {
-        final WorkingCapitalLoanChargeBusinessEvent event = (WorkingCapitalLoanChargeBusinessEvent) rawEvent;
+        final WorkingCapitalLoanAddChargeBusinessEvent event = (WorkingCapitalLoanAddChargeBusinessEvent) rawEvent;
         final WorkingCapitalLoanCharge charge = event.get();
         final WorkingCapitalLoanChargeDataV1 result = mapper.map(charge.toData());
         chargeEnricher.populateAccruals(charge.getLoan(), List.of(result));

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeEnricher.java

@@ -28,7 +28,7 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanChargeDataV1;
 import org.apache.fineract.infrastructure.core.service.MathUtil;
-import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanChargeBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanAddChargeBusinessEvent;
 import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan.WorkingCapitalLoanBusinessEvent;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType;
 import org.apache.fineract.portfolio.workingcapitalloan.data.ChargeIdAndAmountHolder;
@@ -62,7 +62,7 @@ public Map<String, ByteBuffer> collectCustomData(final WorkingCapitalLoanBusines
         return collect(serializer -> serializer.serialize(event, chargeId));
     }
 
-    public Map<String, ByteBuffer> collectCustomData(final WorkingCapitalLoanChargeBusinessEvent event, final Long chargeId) {
+    public Map<String, ByteBuffer> collectCustomData(final WorkingCapitalLoanAddChargeBusinessEvent event, final Long chargeId) {
         return collect(serializer -> serializer.serialize(event, chargeId));
     }
 

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java

@@ -19,14 +19,14 @@
 package org.apache.fineract.portfolio.workingcapitalloan.serialization.serializer;
 
 import java.nio.ByteBuffer;
-import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanChargeBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.charge.WorkingCapitalLoanAddChargeBusinessEvent;
 import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan.WorkingCapitalLoanBusinessEvent;
 
 public interface WorkingCapitalLoanChargeExternalEventCustomDataSerializer {
 
     ByteBuffer serialize(WorkingCapitalLoanBusinessEvent event, Long chargeId);
 
-    default ByteBuffer serialize(WorkingCapitalLoanChargeBusinessEvent event, Long chargeId) {
+    default ByteBuffer serialize(WorkingCapitalLoanAddChargeBusinessEvent event, Long chargeId) {
         return null;
     }
 

integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanAddChargeBusinessEventTest.java

@@ -0,0 +1,115 @@
+/**
+ * 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.client.feign.tests;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.fineract.infrastructure.event.external.data.ExternalEventResponse;
+import org.apache.fineract.integrationtests.client.FeignIntegrationTest;
+import org.apache.fineract.integrationtests.client.feign.helpers.FeignBusinessDateHelper;
+import org.apache.fineract.integrationtests.client.feign.helpers.FeignClientHelper;
+import org.apache.fineract.integrationtests.client.feign.helpers.FeignExternalEventHelper;
+import org.apache.fineract.integrationtests.client.feign.helpers.FeignWorkingCapitalLoanHelper;
+import org.apache.fineract.integrationtests.client.feign.modules.WorkingCapitalLoanRequestBuilders;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper;
+import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Verifies that adding a charge to a Working Capital Loan publishes a WorkingCapitalLoanAddChargeBusinessEvent for the
+ * loan.
+ */
+public class FeignWorkingCapitalLoanAddChargeBusinessEventTest extends FeignIntegrationTest {
+
+    private static final String WC_ADD_CHARGE_EVENT = "WorkingCapitalLoanAddChargeBusinessEvent";
+
+    private FeignWorkingCapitalLoanHelper wcLoanHelper;
+    private FeignClientHelper clientHelper;
+    private FeignBusinessDateHelper businessDateHelper;
+    private FeignExternalEventHelper externalEventHelper;
+    private WorkingCapitalLoanProductHelper productHelper;
+
+    private final List<Long> createdLoanIds = new ArrayList<>();
+    private final List<Long> createdProductIds = new ArrayList<>();
+
+    @BeforeAll
+    void setupHelpers() {
+        wcLoanHelper = new FeignWorkingCapitalLoanHelper(fineractClient());
+        clientHelper = new FeignClientHelper(fineractClient());
+        businessDateHelper = new FeignBusinessDateHelper(fineractClient());
+        externalEventHelper = new FeignExternalEventHelper(fineractClient());
+        productHelper = new WorkingCapitalLoanProductHelper();
+    }
+
+    @AfterAll
+    void cleanupEntities() {
+        createdLoanIds.forEach(wcLoanHelper::cleanupLoan);
+        createdLoanIds.clear();
+        createdProductIds.clear();
+    }
+
+    @Test
+    void addingChargePublishesExternalBusinessEvent() {
+        externalEventHelper.enableBusinessEvent(WC_ADD_CHARGE_EVENT);
+        try {
+            businessDateHelper.runAt("2026-01-01", () -> {
+                final Long clientId = clientHelper.createClient("01 January 2026");
+                final Long loanId = createAndDisburseLoanOnDate(clientId, BigDecimal.valueOf(9000), "01 January 2026");
+                final Long chargeId = wcLoanHelper.createGlobalCharge(WorkingCapitalLoanRequestBuilders.specifiedDueDateCharge(false, 100));
+
+                externalEventHelper.deleteAllExternalEvents();
+                wcLoanHelper.addCharge(loanId, WorkingCapitalLoanRequestBuilders.addCharge(chargeId, 100, "01 January 2026"));
+
+                final List<ExternalEventResponse> events = externalEventHelper.getExternalEventsByType(WC_ADD_CHARGE_EVENT);
+                final ExternalEventResponse event = events.stream().filter(e -> loanId.equals(e.getAggregateRootId())).findFirst()
+                        .orElse(null);
+                assertThat(event).isNotNull();
+                assertThat(event.getType()).isEqualTo(WC_ADD_CHARGE_EVENT);
+                assertThat(event.getAggregateRootId()).isEqualTo(loanId);
+            });
+        } finally {
+            externalEventHelper.disableBusinessEvent(WC_ADD_CHARGE_EVENT);
+        }
+    }
+
+    private Long createAndDisburseLoanOnDate(final Long clientId, final BigDecimal principal, final String date) {
+        final Long productId = createProduct();
+        final Long loanId = wcLoanHelper.submitApplication(
+                WorkingCapitalLoanRequestBuilders.submitApplication(clientId, productId, principal, BigDecimal.valueOf(18), date, date));
+        createdLoanIds.add(loanId);
+        wcLoanHelper.approve(loanId, WorkingCapitalLoanRequestBuilders.approve(date, principal, date));
+        wcLoanHelper.disburse(loanId, WorkingCapitalLoanRequestBuilders.disburse(date, principal));
+        return loanId;
+    }
+
+    private Long createProduct() {
+        final String uniqueName = "WCL AddCharge " + Utils.uniqueRandomStringGenerator("", 8);
+        final String uniqueShortName = Utils.uniqueRandomStringGenerator("", 4);
+        final Long productId = productHelper
+                .createWorkingCapitalLoanProduct(
+                        new WorkingCapitalLoanProductTestBuilder().withName(uniqueName).withShortName(uniqueShortName).build())
+                .getResourceId();
+        createdProductIds.add(productId);
+        return productId;
+    }
+}