updated code
This commit is contained in:
@@ -103,13 +103,14 @@ public class FaqDao {
|
||||
public FaqEntity createOrUpdateFaqEntity(FaqReq faqReq, CallEntity callEntity, UserEntity userEntity,
|
||||
LookUpDataTypeEnum type) {
|
||||
FaqEntity faqEntity = null;
|
||||
FaqEntity oldFaqData = null;
|
||||
VersionHistoryRequest versionHistoryRequest = new VersionHistoryRequest();
|
||||
FaqEntity oldFaqEntity = null;
|
||||
VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
|
||||
if (isExistingFaq(faqReq)) {
|
||||
faqEntity = faqRepository.findByIdAndCallIdAndIsDeletedFalse(faqReq.getId(), callEntity.getId())
|
||||
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
|
||||
Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND)));
|
||||
oldFaqData = Utils.getClonedEntityForData(faqEntity);
|
||||
oldFaqEntity = Utils.getClonedEntityForData(faqEntity);
|
||||
actionType = VersionActionTypeEnum.UPDATE;
|
||||
} else {
|
||||
if (Boolean.FALSE.equals(userEntity.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue()))) {
|
||||
lookUpDataService.getOrCreateLookUpDataEntity(faqReq, type);
|
||||
@@ -119,6 +120,7 @@ public class FaqDao {
|
||||
faqEntity.setUser(userEntity);
|
||||
faqEntity.setIsVisible(false);
|
||||
faqEntity.setIsDeleted(false);
|
||||
actionType = VersionActionTypeEnum.INSERT;
|
||||
}
|
||||
if (faqReq.getResponse() != null && (faqEntity.getResponse() == null
|
||||
|| Boolean.FALSE.equals(faqReq.getResponse().equals(faqEntity.getResponse())))) {
|
||||
@@ -128,13 +130,11 @@ public class FaqDao {
|
||||
setIfUpdated(faqEntity::getValue, faqEntity::setValue, faqReq.getValue());
|
||||
setIfUpdated(faqEntity::getResponse, faqEntity::setResponse, faqReq.getResponse());
|
||||
setIfUpdated(faqEntity::getIsVisible, faqEntity::setIsVisible, faqReq.getIsVisible());
|
||||
FaqEntity newFaqData = faqRepository.save(faqEntity);
|
||||
versionHistoryRequest.setOldData(oldFaqData);
|
||||
versionHistoryRequest.setNewData(newFaqData);
|
||||
versionHistoryRequest.setActionType(VersionActionTypeEnum.INSERT);
|
||||
versionHistoryRequest.setRequest(request);
|
||||
loggingUtil.addVersionHistory(versionHistoryRequest);
|
||||
return newFaqData;
|
||||
faqEntity = faqRepository.save(faqEntity);
|
||||
|
||||
/** This code is responsible for adding a version history log for the "create or update faq" operation **/
|
||||
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldFaqEntity).newData(faqEntity).build());
|
||||
return faqEntity;
|
||||
}
|
||||
|
||||
private boolean isExistingFaq(FaqReq faqReq) {
|
||||
|
||||
Reference in New Issue
Block a user