This is an automated email from the ASF dual-hosted git repository.

meonkeys pushed a commit to branch release/1.16.1
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 5f0ab9a585c3324c232b7d2a457214534184bcb5
Author: Adam Saghy <[email protected]>
AuthorDate: Mon Oct 26 16:02:15 2026 +0000

    FINERACT-2995: Align WC COB with Loan COB
    
    - WC COB worker reader implements StepExecutionListener like
      LoanItemReader, instead of relying on @BeforeStep annotation lookup
    - WC COB worker item listener is typed on WorkingCapitalLoan
    - WC COB job reports loans whose COB lock stayed in place through
      WorkingCapitalLoanAccountsStayedLockedBusinessEvent, as Loan COB does
      with LoanAccountsStayedLockedBusinessEvent
---
 ...orkingCapitalLoanAccountStayedLockedDataV1.avsc | 27 +++++++++++
 ...rkingCapitalLoanAccountsStayedLockedDataV1.avsc | 12 +++++
 ...nalEventConfigurationValidationServiceTest.java |  6 ++-
 .../StayedLockedWorkingCapitalLoansTasklet.java    | 53 ++++++++++++++++++++++
 ...italLoanAccountsStayedLockedBusinessEvent.java} | 28 ++++++++----
 ...orkingCapitalLoanAccountsStayedLockedData.java} | 23 ++++------
 .../WorkingCapitalLoanCOBManagerConfiguration.java | 14 ++++++
 .../WorkingCapitalLoanCOBWorkerItemListener.java   |  4 +-
 .../WorkingCapitalLoanCOBWorkerItemReader.java     |  7 ++-
 ...gCapitalLoanAccountsStayedLockedDataMapper.java | 34 ++++++++++++++
 ...ccountsStayedLockedBusinessEventSerializer.java | 52 +++++++++++++++++++++
 .../workingcapitalloan/module-changelog-master.xml |  1 +
 ..._loan_accounts_stayed_locked_external_event.xml | 38 ++++++++++++++++
 .../ExternalEventConfigurationTestData.java        |  3 +-
 14 files changed, 268 insertions(+), 34 deletions(-)

diff --git 
a/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountStayedLockedDataV1.avsc
 
b/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountStayedLockedDataV1.avsc
new file mode 100644
index 0000000000..4076a8a1ab
--- /dev/null
+++ 
b/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountStayedLockedDataV1.avsc
@@ -0,0 +1,27 @@
+{
+    "name": "WorkingCapitalLoanAccountStayedLockedDataV1",
+    "namespace": "org.apache.fineract.avro.workingcapitalloan.v1",
+    "type": "record",
+    "fields": [
+        {
+            "name": "id",
+            "type": "long"
+        },
+        {
+            "default": null,
+            "name": "externalId",
+            "type": [
+                "null",
+                "string"
+            ]
+        },
+        {
+            "default": null,
+            "name": "accountNo",
+            "type": [
+                "null",
+                "string"
+            ]
+        }
+    ]
+}
diff --git 
a/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountsStayedLockedDataV1.avsc
 
b/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountsStayedLockedDataV1.avsc
new file mode 100644
index 0000000000..c3bac39b34
--- /dev/null
+++ 
b/fineract-avro-schemas/src/main/avro/workingcapitalloan/v1/WorkingCapitalLoanAccountsStayedLockedDataV1.avsc
@@ -0,0 +1,12 @@
+{
+    "name": "WorkingCapitalLoanAccountsStayedLockedDataV1",
+    "namespace": "org.apache.fineract.avro.workingcapitalloan.v1",
+    "type": "record",
+    "fields": [{
+        "name": "workingCapitalLoanAccounts",
+        "type": {
+            "type": "array",
+            "items": 
"org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanAccountStayedLockedDataV1"
+        }
+    }]
+}
diff --git 
a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationServiceTest.java
 
b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationServiceTest.java
index e5ee078312..25e1b56d5f 100644
--- 
a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationServiceTest.java
+++ 
b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationServiceTest.java
@@ -145,7 +145,8 @@ public class 
ExternalEventConfigurationValidationServiceTest {
                 "WorkingCapitalLoanDelinquencyPauseBusinessEvent", 
"WorkingCapitalLoanDelinquencyResumeBusinessEvent",
                 "WorkingCapitalLoanDelinquencyRescheduleBusinessEvent", 
"WorkingCapitalLoanDelinquencyResetBusinessEvent",
                 "WorkingCapitalLoanDelinquencyUndoResetBusinessEvent", 
"WorkingCapitalLoanAccrualTransactionBusinessEvent",
-                "WorkingCapitalLoanAccrualAdjustmentTransactionBusinessEvent", 
"WorkingCapitalLoanChargeWaiverTransactionBusinessEvent");
+                "WorkingCapitalLoanAccrualAdjustmentTransactionBusinessEvent", 
"WorkingCapitalLoanChargeWaiverTransactionBusinessEvent",
+                "WorkingCapitalLoanAccountsStayedLockedBusinessEvent");
 
         List<FineractPlatformTenant> tenants = List
                 .of(new FineractPlatformTenant(1L, "default", "Default 
Tenant", "Europe/Budapest", null));
@@ -245,7 +246,8 @@ public class 
ExternalEventConfigurationValidationServiceTest {
                 
"LoanBuyDownFeeAmortizationAdjustmentTransactionCreatedBusinessEvent", 
"LoanApprovedAmountChangedBusinessEvent",
                 "SavingsAccountsStayedLockedBusinessEvent", 
"SavingsAccountForceWithdrawalBusinessEvent",
                 "WorkingCapitalLoanDisbursalTransactionBusinessEvent", 
"WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent",
-                "WorkingCapitalLoanRepaymentTransactionBusinessEvent", 
"WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent");
+                "WorkingCapitalLoanRepaymentTransactionBusinessEvent", 
"WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent",
+                "WorkingCapitalLoanAccountsStayedLockedBusinessEvent");
 
         List<FineractPlatformTenant> tenants = Arrays
                 .asList(new FineractPlatformTenant(1L, "default", "Default 
Tenant", "Europe/Budapest", null));
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/StayedLockedWorkingCapitalLoansTasklet.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/StayedLockedWorkingCapitalLoansTasklet.java
new file mode 100644
index 0000000000..65fa142edd
--- /dev/null
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/StayedLockedWorkingCapitalLoansTasklet.java
@@ -0,0 +1,53 @@
+/**
+ * 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.cob.workingcapitalloan;
+
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.cob.data.COBIdAndExternalIdAndAccountNo;
+import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
+import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
+import 
org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.infrastructure.repeat.RepeatStatus;
+
+/**
+ * Reports the working capital loans whose COB lock was placed on the current 
COB date and is still held after the
+ * partitioned step: they were not processed and stay one COB day behind until 
the lock is released.
+ */
+@RequiredArgsConstructor
+public class StayedLockedWorkingCapitalLoansTasklet implements Tasklet {
+
+    private final BusinessEventNotifierService businessEventNotifierService;
+    private final WorkingCapitalLoanRetrieveIdService retrieveIdService;
+
+    @Override
+    public RepeatStatus execute(StepContribution contribution, ChunkContext 
chunkContext) throws Exception {
+        LocalDate cobBusinessDate = 
ThreadLocalContextUtil.getBusinessDateByType(BusinessDateType.COB_DATE);
+        List<COBIdAndExternalIdAndAccountNo> stayedLockedAccounts = 
retrieveIdService.findAllStayedLockedByCobBusinessDate(cobBusinessDate);
+        if (!stayedLockedAccounts.isEmpty()) {
+            businessEventNotifierService.notifyPostBusinessEvent(new 
WorkingCapitalLoanAccountsStayedLockedBusinessEvent(
+                    new 
WorkingCapitalLoanAccountsStayedLockedData(stayedLockedAccounts)));
+        }
+        return RepeatStatus.FINISHED;
+    }
+}
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEvent.java
similarity index 54%
copy from 
fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
copy to 
fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEvent.java
index ab2335e3a8..455cef0a6d 100644
--- 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEvent.java
@@ -18,21 +18,29 @@
  */
 package org.apache.fineract.cob.workingcapitalloan;
 
-import org.apache.fineract.cob.domain.LockOwner;
-import org.apache.fineract.cob.domain.LockingService;
-import org.apache.fineract.cob.listener.AbstractLoanItemListener;
-import org.apache.fineract.portfolio.loanaccount.domain.Loan;
-import org.springframework.transaction.support.TransactionTemplate;
+import 
org.apache.fineract.infrastructure.event.business.domain.AbstractBusinessEvent;
 
-public class WorkingCapitalLoanCOBWorkerItemListener extends 
AbstractLoanItemListener<Loan> {
+public class WorkingCapitalLoanAccountsStayedLockedBusinessEvent extends 
AbstractBusinessEvent<WorkingCapitalLoanAccountsStayedLockedData> {
 
-    public WorkingCapitalLoanCOBWorkerItemListener(LockingService 
lockingService, TransactionTemplate requiresNewTransactionJdbcTemplate) {
-        super(lockingService, requiresNewTransactionJdbcTemplate);
+    private static final String CATEGORY = "Working Capital Loan COB";
+    private static final String TYPE = 
"WorkingCapitalLoanAccountsStayedLockedBusinessEvent";
+
+    public 
WorkingCapitalLoanAccountsStayedLockedBusinessEvent(WorkingCapitalLoanAccountsStayedLockedData
 value) {
+        super(value);
+    }
+
+    @Override
+    public String getType() {
+        return TYPE;
     }
 
     @Override
-    protected LockOwner getLockOwner() {
-        return LockOwner.LOAN_COB_CHUNK_PROCESSING;
+    public String getCategory() {
+        return CATEGORY;
     }
 
+    @Override
+    public Long getAggregateRootId() {
+        return null;
+    }
 }
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedData.java
similarity index 54%
copy from 
fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
copy to 
fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedData.java
index ab2335e3a8..84f9dad099 100644
--- 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedData.java
@@ -18,21 +18,14 @@
  */
 package org.apache.fineract.cob.workingcapitalloan;
 
-import org.apache.fineract.cob.domain.LockOwner;
-import org.apache.fineract.cob.domain.LockingService;
-import org.apache.fineract.cob.listener.AbstractLoanItemListener;
-import org.apache.fineract.portfolio.loanaccount.domain.Loan;
-import org.springframework.transaction.support.TransactionTemplate;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.fineract.cob.data.COBIdAndExternalIdAndAccountNo;
 
-public class WorkingCapitalLoanCOBWorkerItemListener extends 
AbstractLoanItemListener<Loan> {
-
-    public WorkingCapitalLoanCOBWorkerItemListener(LockingService 
lockingService, TransactionTemplate requiresNewTransactionJdbcTemplate) {
-        super(lockingService, requiresNewTransactionJdbcTemplate);
-    }
-
-    @Override
-    protected LockOwner getLockOwner() {
-        return LockOwner.LOAN_COB_CHUNK_PROCESSING;
-    }
+@Getter
+@AllArgsConstructor
+public class WorkingCapitalLoanAccountsStayedLockedData {
 
+    private List<COBIdAndExternalIdAndAccountNo> workingCapitalLoanAccounts;
 }
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBManagerConfiguration.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBManagerConfiguration.java
index 40f8dd0258..cc4b14b246 100644
--- 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBManagerConfiguration.java
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBManagerConfiguration.java
@@ -34,6 +34,7 @@ import 
org.apache.fineract.cob.conditions.BatchManagerCondition;
 import org.apache.fineract.cob.domain.WorkingCapitalLoanAccountLock;
 import org.apache.fineract.cob.listener.COBExecutionListenerRunner;
 import org.apache.fineract.cob.service.AccountLockService;
+import 
org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
 import org.apache.fineract.infrastructure.springbatch.PropertyService;
 import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.batch.core.job.Job;
@@ -69,6 +70,7 @@ public class WorkingCapitalLoanCOBManagerConfiguration {
     private final PropertyService propertyService;
     private final WorkingCapitalLoanRetrieveIdService retrieveIdService;
     private final AccountLockService<WorkingCapitalLoanAccountLock> 
accountLockService;
+    private final BusinessEventNotifierService businessEventNotifierService;
 
     @Bean(WORKING_CAPITAL_LOAN_COB_PARTITIONER)
     @StepScope
@@ -84,10 +86,22 @@ public class WorkingCapitalLoanCOBManagerConfiguration {
                 .listener(new COBExecutionListenerRunner(applicationContext, 
WORKING_CAPITAL_LOAN_COB_JOB.name())) //
                 .start(resolveCustomJobParametersForWorkingCapitalStep()) //
                 
.next(workingCapitalLoanCOBStep(workingCapitalLoanCOBPartitioner)) //
+                .next(stayedLockedWorkingCapitalLoansStep()) //
                 .next(unlockProcessedWorkingCapitalLoansStep()) //
                 .build();
     }
 
+    @Bean
+    public Step stayedLockedWorkingCapitalLoansStep() {
+        return new StepBuilder("Stayed locked working capital loan accounts - 
Step", jobRepository)
+                .tasklet(stayedLockedWorkingCapitalLoansTasklet(), 
transactionManager).build();
+    }
+
+    @Bean
+    public StayedLockedWorkingCapitalLoansTasklet 
stayedLockedWorkingCapitalLoansTasklet() {
+        return new 
StayedLockedWorkingCapitalLoansTasklet(businessEventNotifierService, 
retrieveIdService);
+    }
+
     @Bean
     public Step unlockProcessedWorkingCapitalLoansStep() {
         return new StepBuilder("Unlock processed working capital loan accounts 
- Step", jobRepository)
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
index ab2335e3a8..caf9111d52 100644
--- 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemListener.java
@@ -21,10 +21,10 @@ package org.apache.fineract.cob.workingcapitalloan;
 import org.apache.fineract.cob.domain.LockOwner;
 import org.apache.fineract.cob.domain.LockingService;
 import org.apache.fineract.cob.listener.AbstractLoanItemListener;
-import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import 
org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan;
 import org.springframework.transaction.support.TransactionTemplate;
 
-public class WorkingCapitalLoanCOBWorkerItemListener extends 
AbstractLoanItemListener<Loan> {
+public class WorkingCapitalLoanCOBWorkerItemListener extends 
AbstractLoanItemListener<WorkingCapitalLoan> {
 
     public WorkingCapitalLoanCOBWorkerItemListener(LockingService 
lockingService, TransactionTemplate requiresNewTransactionJdbcTemplate) {
         super(lockingService, requiresNewTransactionJdbcTemplate);
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java
index 1c7fd06668..440ae8dd8b 100644
--- 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java
@@ -30,13 +30,13 @@ import 
org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoa
 import 
org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
-import org.springframework.batch.core.annotation.BeforeStep;
+import org.springframework.batch.core.listener.StepExecutionListener;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.infrastructure.item.ItemReader;
 
 @Slf4j
 @RequiredArgsConstructor
-public class WorkingCapitalLoanCOBWorkerItemReader implements 
ItemReader<WorkingCapitalLoan> {
+public class WorkingCapitalLoanCOBWorkerItemReader implements 
ItemReader<WorkingCapitalLoan>, StepExecutionListener {
 
     private final WorkingCapitalLoanRepository repository;
     private final BeforeStepLockingItemReaderHelper itemReaderHelper;
@@ -58,8 +58,7 @@ public class WorkingCapitalLoanCOBWorkerItemReader implements 
ItemReader<Working
         return null;
     }
 
-    @BeforeStep
-    @SuppressWarnings({ "unchecked" })
+    @Override
     public void beforeStep(@NonNull StepExecution stepExecution) {
         setRemainingData(itemReaderHelper.filterRemainingData(stepExecution));
     }
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedDataMapper.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedDataMapper.java
new file mode 100644
index 0000000000..7460418f3a
--- /dev/null
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedDataMapper.java
@@ -0,0 +1,34 @@
+/**
+ * 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.infrastructure.event.external.service.serialization.mapper.workingcapitalloan;
+
+import 
org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanAccountStayedLockedDataV1;
+import 
org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanAccountsStayedLockedDataV1;
+import org.apache.fineract.cob.data.COBIdAndExternalIdAndAccountNo;
+import 
org.apache.fineract.cob.workingcapitalloan.WorkingCapitalLoanAccountsStayedLockedData;
+import 
org.apache.fineract.infrastructure.event.external.service.serialization.mapper.support.AvroMapperConfig;
+import org.mapstruct.Mapper;
+
+@Mapper(config = AvroMapperConfig.class)
+public interface WorkingCapitalLoanAccountsStayedLockedDataMapper {
+
+    WorkingCapitalLoanAccountsStayedLockedDataV1 
map(WorkingCapitalLoanAccountsStayedLockedData 
workingCapitalLoanAccountsStayedLockedData);
+
+    WorkingCapitalLoanAccountStayedLockedDataV1 
map(COBIdAndExternalIdAndAccountNo cobIdAndExternalIdAndAccountNo);
+}
diff --git 
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEventSerializer.java
 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEventSerializer.java
new file mode 100644
index 0000000000..e5fa7e670e
--- /dev/null
+++ 
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanAccountsStayedLockedBusinessEventSerializer.java
@@ -0,0 +1,52 @@
+/**
+ * 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.infrastructure.event.external.service.serialization.serializer.workingcapitalloan;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.avro.generic.GenericContainer;
+import org.apache.fineract.avro.generator.ByteBufferSerializable;
+import 
org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanAccountsStayedLockedDataV1;
+import 
org.apache.fineract.cob.workingcapitalloan.WorkingCapitalLoanAccountsStayedLockedBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.domain.BusinessEvent;
+import 
org.apache.fineract.infrastructure.event.external.service.serialization.mapper.workingcapitalloan.WorkingCapitalLoanAccountsStayedLockedDataMapper;
+import 
org.apache.fineract.infrastructure.event.external.service.serialization.serializer.BusinessEventSerializer;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class WorkingCapitalLoanAccountsStayedLockedBusinessEventSerializer 
implements BusinessEventSerializer {
+
+    private final WorkingCapitalLoanAccountsStayedLockedDataMapper mapper;
+
+    @Override
+    public <T> boolean canSerialize(final BusinessEvent<T> event) {
+        return event instanceof 
WorkingCapitalLoanAccountsStayedLockedBusinessEvent;
+    }
+
+    @Override
+    public <T> ByteBufferSerializable toAvroDTO(final BusinessEvent<T> 
rawEvent) {
+        final WorkingCapitalLoanAccountsStayedLockedBusinessEvent event = 
(WorkingCapitalLoanAccountsStayedLockedBusinessEvent) rawEvent;
+        return mapper.map(event.get());
+    }
+
+    @Override
+    public Class<? extends GenericContainer> getSupportedSchema() {
+        return WorkingCapitalLoanAccountsStayedLockedDataV1.class;
+    }
+}
diff --git 
a/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/module-changelog-master.xml
 
b/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/module-changelog-master.xml
index 25624f74bd..4153657ed1 100644
--- 
a/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/module-changelog-master.xml
+++ 
b/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/module-changelog-master.xml
@@ -114,4 +114,5 @@
   <include relativeToChangelogFile="true" 
file="parts/0090_wc_adjust-by-delta-transaction-permission.xml"/>
   <include relativeToChangelogFile="true" 
file="parts/0091_wc_clear_dependent_grace_without_parent.xml"/>
   <include relativeToChangelogFile="true" 
file="parts/0092_wc_loan_account_no_named_unique.xml"/>
+  <include relativeToChangelogFile="true" 
file="parts/0093_wc_loan_accounts_stayed_locked_external_event.xml"/>
 </databaseChangeLog>
diff --git 
a/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/parts/0093_wc_loan_accounts_stayed_locked_external_event.xml
 
b/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/parts/0093_wc_loan_accounts_stayed_locked_external_event.xml
new file mode 100644
index 0000000000..ce20436356
--- /dev/null
+++ 
b/fineract-working-capital-loan/src/main/resources/db/changelog/tenant/module/workingcapitalloan/parts/0093_wc_loan_accounts_stayed_locked_external_event.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog";
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+                   
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd";>
+
+    <changeSet author="fineract" id="wc-loan-accounts-stayed-locked-event">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">
+                SELECT COUNT(*) FROM m_external_event_configuration WHERE type 
= 'WorkingCapitalLoanAccountsStayedLockedBusinessEvent'
+            </sqlCheck>
+        </preConditions>
+        <insert tableName="m_external_event_configuration">
+            <column name="type" 
value="WorkingCapitalLoanAccountsStayedLockedBusinessEvent"/>
+            <column name="enabled" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/ExternalEventConfigurationTestData.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/ExternalEventConfigurationTestData.java
index c0bcc88d7f..50c6e02cbb 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/ExternalEventConfigurationTestData.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/modules/ExternalEventConfigurationTestData.java
@@ -218,7 +218,8 @@ public final class ExternalEventConfigurationTestData {
             "WorkingCapitalLoanDelinquencyResetBusinessEvent", //
             "WorkingCapitalLoanDelinquencyUndoResetBusinessEvent", //
             "WorkingCapitalLoanAccrualTransactionBusinessEvent", //
-            "WorkingCapitalLoanAccrualAdjustmentTransactionBusinessEvent"//
+            "WorkingCapitalLoanAccrualAdjustmentTransactionBusinessEvent", //
+            "WorkingCapitalLoanAccountsStayedLockedBusinessEvent"//
     );
 
     private ExternalEventConfigurationTestData() {}

Reply via email to