updated code
This commit is contained in:
rajesh
@@ -109,9 +109,7 @@ public class CallDao {
|
||||
CallEntity callEntity = convertToCallEntity(createCallRequest, userEntity);
|
||||
|
||||
updateFaq(createCallRequest.getFaq(), callEntity, userEntity,LookUpDataTypeEnum.FAQ);
|
||||
|
||||
convertLookUpDataEntities(createCallRequest.getAimedTo(), callEntity,
|
||||
LookUpDataTypeEnum.AIMED_TO);
|
||||
updateLookUpData(callEntity, createCallRequest.getAimedTo(), LookUpDataTypeEnum.AIMED_TO);
|
||||
|
||||
CallResponse createCallResponseBean = getCallResponseBean(callEntity);
|
||||
createCallResponseBean.setCurrentStep(GepafinConstant.STEP_1);
|
||||
@@ -152,7 +150,6 @@ public class CallDao {
|
||||
|
||||
public CallEntity convertToCallEntity(CreateCallRequestStep1 createCallRequest, UserEntity userEntity) {
|
||||
CallEntity callEntity = new CallEntity();
|
||||
VersionHistoryRequest versionHistoryRequest = new VersionHistoryRequest();
|
||||
// validateCallEntity(createCallRequest);
|
||||
RegionEntity region = regionRepository.findById(createCallRequest.getRegionId())
|
||||
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
|
||||
@@ -189,11 +186,9 @@ public class CallDao {
|
||||
callEntity.setEndTime(DateTimeUtil.parseTime(createCallRequest.getEndTime()));
|
||||
callEntity.setHub(userEntity.getHub());
|
||||
callEntity = callRepository.save(callEntity);
|
||||
versionHistoryRequest.setOldData(null);
|
||||
versionHistoryRequest.setNewData(callEntity);
|
||||
versionHistoryRequest.setRequest(request);
|
||||
versionHistoryRequest.setActionType(VersionActionTypeEnum.INSERT);
|
||||
loggingUtil.addVersionHistory(versionHistoryRequest);
|
||||
|
||||
/** This code is responsible for adding a version history log for the "Create Call" operation. **/
|
||||
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(null).newData(callEntity).build());
|
||||
return callEntity;
|
||||
}
|
||||
|
||||
@@ -211,15 +206,7 @@ public class CallDao {
|
||||
|
||||
List<EvaluationCriteriaEntity> evaluationCriteriaEntities = criteriaReqList.stream()
|
||||
.map(req -> convertToEvaluationCriteriaEntity(req, callEntity, type)).collect(Collectors.toList());
|
||||
List<EvaluationCriteriaEntity> data = evaluationCriteriaRepository.saveAll(evaluationCriteriaEntities);
|
||||
data.forEach(entity -> {
|
||||
VersionHistoryRequest versionHistoryRequest = new VersionHistoryRequest();
|
||||
versionHistoryRequest.setOldData(null);
|
||||
versionHistoryRequest.setNewData(entity);
|
||||
versionHistoryRequest.setRequest(request);
|
||||
versionHistoryRequest.setActionType(VersionActionTypeEnum.INSERT);
|
||||
loggingUtil.addVersionHistory(versionHistoryRequest);
|
||||
});
|
||||
|
||||
return evaluationCriteriaEntities;
|
||||
}
|
||||
|
||||
@@ -237,22 +224,31 @@ public class CallDao {
|
||||
private EvaluationCriteriaEntity convertToEvaluationCriteriaEntity(EvaluationCriteriaReq criteriaReq,
|
||||
CallEntity callEntity, LookUpDataTypeEnum type) {
|
||||
EvaluationCriteriaEntity criteriaEntity = null;
|
||||
EvaluationCriteriaEntity oldCriteriaEntity = null;
|
||||
VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
|
||||
LookUpDataEntity lookupDataEntity = lookUpDataService.getOrCreateLookUpDataEntity(criteriaReq, type);
|
||||
if (criteriaReq.getId() != null && criteriaReq.getId() > 0) {
|
||||
criteriaEntity = evaluationCriteriaRepository.findById(criteriaReq.getId())
|
||||
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
|
||||
Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
|
||||
oldCriteriaEntity = Utils.getClonedEntityForData(oldCriteriaEntity);
|
||||
actionType = VersionActionTypeEnum.UPDATE;
|
||||
} else {
|
||||
criteriaEntity = new EvaluationCriteriaEntity();
|
||||
criteriaEntity.setCall(callEntity);
|
||||
criteriaEntity.setLookupData(lookupDataEntity);
|
||||
criteriaEntity.setScore(0L);
|
||||
criteriaEntity.setIsDeleted(false);
|
||||
actionType = VersionActionTypeEnum.INSERT;
|
||||
}
|
||||
setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore());
|
||||
if (Boolean.FALSE.equals(criteriaEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) {
|
||||
criteriaEntity.setLookupData(lookupDataEntity);
|
||||
}
|
||||
criteriaEntity = evaluationCriteriaRepository.save(criteriaEntity) ;
|
||||
|
||||
/** This code is responsible for adding a version history log for the "create or update evaluation criteria" operation **/
|
||||
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldCriteriaEntity).newData(criteriaEntity).build());
|
||||
return criteriaEntity;
|
||||
}
|
||||
|
||||
@@ -402,38 +398,37 @@ public class CallDao {
|
||||
return createCallResponseBean;
|
||||
}
|
||||
|
||||
public List<LookUpDataResponse> convertLookUpDataEntities(List<LookUpDataReq> lookUpData, CallEntity callEntity,
|
||||
LookUpDataEntity.LookUpDataTypeEnum type) {
|
||||
if(lookUpData == null) {
|
||||
return null;
|
||||
}
|
||||
List<LookUpDataEntity> lookUpDataEntities = lookUpData.stream()
|
||||
.map(req -> lookUpDataService.getOrCreateLookUpDataEntity(req, type)).collect(Collectors.toList());
|
||||
// public List<LookUpDataResponse> convertLookUpDataEntities(List<LookUpDataReq> lookUpData, CallEntity callEntity,
|
||||
// LookUpDataEntity.LookUpDataTypeEnum type) {
|
||||
// if(lookUpData == null) {
|
||||
// return null;
|
||||
// }
|
||||
// List<LookUpDataEntity> lookUpDataEntities = lookUpData.stream()
|
||||
// .map(req -> lookUpDataService.getOrCreateLookUpDataEntity(req, type)).collect(Collectors.toList());
|
||||
//
|
||||
// return createCallTargetAudienceCheckList(callEntity, lookUpDataEntities);
|
||||
// }
|
||||
|
||||
return createCallTargetAudienceCheckList(callEntity, lookUpDataEntities);
|
||||
}
|
||||
|
||||
private List<LookUpDataResponse> createCallTargetAudienceCheckList(CallEntity callEntity,
|
||||
List<LookUpDataEntity> lookUpDataEntities) {
|
||||
List<LookUpDataResponse> lookUpDataResponses = new ArrayList<>();
|
||||
VersionHistoryRequest versionHistoryRequest = new VersionHistoryRequest();
|
||||
for (LookUpDataEntity lookUpDataEntity : lookUpDataEntities) {
|
||||
CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity = new CallTargetAudienceChecklistEntity();
|
||||
callTargetAudienceChecklistEntity.setIsValidated(false);
|
||||
callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity);
|
||||
callTargetAudienceChecklistEntity.setCall(callEntity);
|
||||
callTargetAudienceChecklistEntity.setIsDeleted(false);
|
||||
callTargetAudienceChecklistEntity = callTargetAudienceChecklistRepository
|
||||
.save(callTargetAudienceChecklistEntity);
|
||||
versionHistoryRequest.setOldData(null);
|
||||
versionHistoryRequest.setNewData(callTargetAudienceChecklistEntity);
|
||||
versionHistoryRequest.setActionType(VersionActionTypeEnum.INSERT);
|
||||
versionHistoryRequest.setRequest(request);
|
||||
loggingUtil.addVersionHistory(versionHistoryRequest);
|
||||
lookUpDataResponses.add(convertToLookUpDataResponseBean(callTargetAudienceChecklistEntity));
|
||||
}
|
||||
return lookUpDataResponses;
|
||||
}
|
||||
// private List<LookUpDataResponse> createCallTargetAudienceCheckList(CallEntity callEntity,
|
||||
// List<LookUpDataEntity> lookUpDataEntities) {
|
||||
// List<LookUpDataResponse> lookUpDataResponses = new ArrayList<>();
|
||||
// for (LookUpDataEntity lookUpDataEntity : lookUpDataEntities) {
|
||||
// CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity = new CallTargetAudienceChecklistEntity();
|
||||
// callTargetAudienceChecklistEntity.setIsValidated(false);
|
||||
// callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity);
|
||||
// callTargetAudienceChecklistEntity.setCall(callEntity);
|
||||
// callTargetAudienceChecklistEntity.setIsDeleted(false);
|
||||
// callTargetAudienceChecklistEntity = callTargetAudienceChecklistRepository
|
||||
// .save(callTargetAudienceChecklistEntity);
|
||||
// versionHistoryRequest.setOldData(null);
|
||||
// versionHistoryRequest.setNewData(callTargetAudienceChecklistEntity);
|
||||
// versionHistoryRequest.setActionType(VersionActionTypeEnum.INSERT);
|
||||
// versionHistoryRequest.setRequest(request);
|
||||
// loggingUtil.addVersionHistory(versionHistoryRequest);
|
||||
// lookUpDataResponses.add(convertToLookUpDataResponseBean(callTargetAudienceChecklistEntity));
|
||||
// }
|
||||
// return lookUpDataResponses;
|
||||
// }
|
||||
|
||||
public LookUpDataResponse convertToLookUpDataResponseBean(
|
||||
CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) {
|
||||
@@ -604,6 +599,8 @@ public class CallDao {
|
||||
private void createOrUpdateCallTargetAudienceChecklist(LookUpDataReq lookUpDataReq, CallEntity callEntity,
|
||||
LookUpDataTypeEnum type) {
|
||||
CallTargetAudienceChecklistEntity checklistEntity = null;
|
||||
CallTargetAudienceChecklistEntity oldChecklistEntity = null;
|
||||
VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
|
||||
LookUpDataEntity lookupDataEntity = lookUpDataService.getOrCreateLookUpDataEntity(lookUpDataReq, type);
|
||||
if (lookUpDataReq.getId() != null && lookUpDataReq.getId() > 0) {
|
||||
checklistEntity = callTargetAudienceChecklistRepository.findById(lookUpDataReq.getId())
|
||||
@@ -613,15 +610,20 @@ public class CallDao {
|
||||
if (Boolean.FALSE.equals(checklistEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) {
|
||||
checklistEntity.setLookupData(lookupDataEntity);
|
||||
}
|
||||
actionType = VersionActionTypeEnum.UPDATE;
|
||||
} else {
|
||||
checklistEntity = new CallTargetAudienceChecklistEntity();
|
||||
checklistEntity.setCall(callEntity);
|
||||
checklistEntity.setLookupData(lookupDataEntity);
|
||||
checklistEntity.setIsValidated(false);
|
||||
checklistEntity.setIsDeleted(false);
|
||||
actionType = VersionActionTypeEnum.INSERT;
|
||||
}
|
||||
|
||||
callTargetAudienceChecklistRepository.save(checklistEntity);
|
||||
checklistEntity = callTargetAudienceChecklistRepository.save(checklistEntity);
|
||||
|
||||
/** This code is responsible for adding a version history log for the "create or update aimedTo Checklist" operation **/
|
||||
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldChecklistEntity).newData(checklistEntity).build());
|
||||
}
|
||||
|
||||
private void softDeleteCallTargetAudienceChecklist(
|
||||
|
||||
Reference in New Issue
Block a user