varnitgoyal95/deployment-portal-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1290 from navi-infra/infra-4079-cr-approve-flow-update

Browse Source 
INFRA-4079 | Harinder | While approving the change request, context is set to approver. Changing the same to the person who raised the request
This commit is contained in:
Abhishek K
2024-12-23 20:54:04 +05:30
committed by GitHub
parent 7cd54e0460 53cf71dcaf
commit 25ca591f44
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/navi/infra/portal/v2/changerequest/service/ChangeRequestServiceImpl.java
View File

@@ -258,22 +258,20 @@ public class ChangeRequestServiceImpl implements ChangeRequestService {
"Change request: {} is approved. Initiated merging with current version of the manifest",
changeRequestId);
final var manifest = manifestService.fetchByIdWithoutAuthorization(
changeRequest.getManifestId());
try {
changeRequestSlackService.handleChangeRequestUpdate(manifest, changeRequest);
} catch (Exception e) {
log.error("Error updating slack message while mering CR id:{} of manifest:{} : {}",
changeRequestId, manifest.fullName(), e.getMessage());
}
final var manifestMap = manifest.convertToMap();
mergeCr(manifestMap, changeRequest);
final var mergedManifest = objectMapper.convertValue(manifestMap, Manifest.class);
SecurityContext originalContext = SecurityContextHolder.getContext();
var crCreatorContext = authUtil.getSecurityContextForUser(changeRequest.getCreatedBy());
try {
SecurityContextHolder.setContext(crCreatorContext);
final var manifest = manifestService.fetchById(changeRequest.getManifestId());
try {
changeRequestSlackService.handleChangeRequestUpdate(manifest, changeRequest);
} catch (Exception e) {
log.error("Error updating slack message while mering CR id:{} of manifest:{} : {}",
changeRequestId, manifest.fullName(), e.getMessage());
}
final var manifestMap = manifest.convertToMap();
mergeCr(manifestMap, changeRequest);
final var mergedManifest = objectMapper.convertValue(manifestMap, Manifest.class);
manifestService.createOrUpdate(mergedManifest, true);
} finally {
SecurityContextHolder.setContext(originalContext);