From eb8a3572ae4ae3eb6dfb97cd7ec274ec27b099fd Mon Sep 17 00:00:00 2001
From: Natasha <20606687+nnatarajan@users.noreply.github.com>
Date: Sun, 5 Apr 2020 18:20:52 -0600
Subject: [PATCH] FINERACT-122 added clientId, officeId, and groupId.

---
 ...heduleRequestWritePlatformServiceImpl.java | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
index dd70facb1..faa3c1698 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
@@ -282,8 +282,14 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche
             this.loanRescheduleRequestRepository.save(loanRescheduleRequest);
             this.loanRepositoryWrapper.save(loan);
 
-            return new CommandProcessingResultBuilder().withCommandId(jsonCommand.commandId()).withEntityId(loanRescheduleRequest.getId())
-                    .withLoanId(loan.getId()).build();
+            return new CommandProcessingResultBuilder()
+                    .withCommandId(jsonCommand.commandId())
+                    .withEntityId(loanRescheduleRequest.getId())
+                    .withLoanId(loan.getId())
+                    .withClientId(loan.getClientId())
+                    .withOfficeId(loan.getOfficeId())
+                    .withGroupId(loan.getGroupId())
+                    .build();
         }
 
         catch (final DataIntegrityViolationException dve) {
@@ -485,8 +491,15 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche
 
             this.loanAccountDomainService.recalculateAccruals(loan, true);
 
-            return new CommandProcessingResultBuilder().withCommandId(jsonCommand.commandId()).withEntityId(loanRescheduleRequestId)
-                    .withLoanId(loanRescheduleRequest.getLoan().getId()).with(changes).build();
+            return new CommandProcessingResultBuilder()
+                    .withCommandId(jsonCommand.commandId())
+                    .withEntityId(loanRescheduleRequestId)
+                    .withLoanId(loanRescheduleRequest.getLoan().getId())
+                    .with(changes)
+                    .withClientId(loan.getClientId())
+                    .withOfficeId(loan.getOfficeId())
+                    .withGroupId(loan.getGroupId())
+                    .build();
         }
 
         catch (final DataIntegrityViolationException dve) {
@@ -563,8 +576,15 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche
                 }
             }
 
-            return new CommandProcessingResultBuilder().withCommandId(jsonCommand.commandId()).withEntityId(loanRescheduleRequestId)
-                    .withLoanId(loanRescheduleRequest.getLoan().getId()).with(changes).build();
+            return new CommandProcessingResultBuilder()
+                    .withCommandId(jsonCommand.commandId())
+                    .withEntityId(loanRescheduleRequestId)
+                    .withLoanId(loanRescheduleRequest.getLoan().getId())
+                    .with(changes)
+                    .withClientId(loanRescheduleRequest.getLoan().getClientId())
+                    .withOfficeId(loanRescheduleRequest.getLoan().getOfficeId())
+                    .withGroupId(loanRescheduleRequest.getLoan().getGroupId())
+                    .build();
         }
 
         catch (final DataIntegrityViolationException dve) {