Skip to content

Commit

Permalink
Sowmya code changes for name isuue in Email notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Oct 31, 2023
1 parent 2d50a66 commit 077f031
Showing 1 changed file with 30 additions and 14 deletions.
44 changes: 30 additions & 14 deletions ...ip/registration/processor/message/sender/service/impl/MessageNotificationServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
Expand All @@ -15,11 +16,7 @@
import java.util.Map.Entry;
import java.util.Set;

import io.mosip.kernel.core.exception.BaseUncheckedException;
import io.mosip.kernel.core.exception.ServiceError;
import io.mosip.registration.processor.core.constant.*;
import io.mosip.registration.processor.core.idrepo.dto.VidInfoDTO;
import io.mosip.registration.processor.core.idrepo.dto.VidsInfosDTO;

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
Expand All @@ -38,13 +35,21 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import io.mosip.kernel.core.exception.BaseUncheckedException;
import io.mosip.kernel.core.exception.ServiceError;

import io.mosip.kernel.core.logger.spi.Logger;
import io.mosip.kernel.core.util.DateUtils;
import io.mosip.kernel.core.util.JsonUtils;
import io.mosip.kernel.core.util.exception.JsonMappingException;
import io.mosip.kernel.core.util.exception.JsonParseException;
import io.mosip.kernel.core.util.exception.JsonProcessingException;
import io.mosip.registration.processor.core.code.ApiName;
import io.mosip.registration.processor.core.constant.IdType;
import io.mosip.registration.processor.core.constant.LoggerFileConstant;
import io.mosip.registration.processor.core.constant.MappingJsonConstants;
import io.mosip.registration.processor.core.constant.ProviderStageName;
import io.mosip.registration.processor.core.constant.VidType;
import io.mosip.registration.processor.core.exception.ApisResourceAccessException;
import io.mosip.registration.processor.core.exception.PacketDecryptionFailureException;
import io.mosip.registration.processor.core.exception.PacketManagerException;
Expand All @@ -54,6 +59,8 @@
import io.mosip.registration.processor.core.http.RequestWrapper;
import io.mosip.registration.processor.core.http.ResponseWrapper;
import io.mosip.registration.processor.core.idrepo.dto.IdResponseDTO;
import io.mosip.registration.processor.core.idrepo.dto.VidInfoDTO;
import io.mosip.registration.processor.core.idrepo.dto.VidsInfosDTO;
import io.mosip.registration.processor.core.logger.RegProcessorLogger;
import io.mosip.registration.processor.core.notification.template.generator.dto.ResponseDto;
import io.mosip.registration.processor.core.notification.template.generator.dto.SmsRequestDto;
Expand All @@ -70,7 +77,7 @@
import io.mosip.registration.processor.message.sender.exception.TemplateNotFoundException;
import io.mosip.registration.processor.message.sender.template.TemplateGenerator;
import io.mosip.registration.processor.packet.manager.decryptor.Decryptor;
import io.mosip.registration.processor.packet.storage.dto.ConfigEnum;

import io.mosip.registration.processor.packet.storage.exception.IdRepoAppException;
import io.mosip.registration.processor.packet.storage.utils.PriorityBasedPacketManagerService;
import io.mosip.registration.processor.packet.storage.utils.Utilities;
Expand Down Expand Up @@ -553,7 +560,8 @@ private Map<String, Object> setAttributes(String idJsonString, Map<String, Objec
JsonValue[] jsonValues = JsonUtil.mapJsonNodeToJavaObject(JsonValue.class, node);
for (int count = 0; count < jsonValues.length; count++) {
if(jsonValues[count].getLanguage().equalsIgnoreCase(lang)) {
attribute.put(val , jsonValues[count].getValue());

attribute.put(val + "_" + lang, jsonValues[count].getValue());
}
}
} else if (object instanceof LinkedHashMap) {
Expand Down Expand Up @@ -602,13 +610,21 @@ private Map<String, Object> setAttributesFromIdJson(String id, String process, M
String regType, String lang, StringBuilder phoneNumber, StringBuilder emailId)
throws IOException, ApisResourceAccessException, PacketManagerException, JsonProcessingException, JSONException, PacketDecryptionFailureException, JsonParseException, JsonMappingException, io.mosip.kernel.core.exception.IOException {

JSONObject mapperIdentity = utility.getRegistrationProcessorMappingJson(MappingJsonConstants.IDENTITY);

if (mapperJsonKeys == null) {
String mapperJsonString = Utilities.getJson(utility.getConfigServerFileStorageURL(),
utility.getGetRegProcessorIdentityJson());
JSONObject mapperJson = JsonUtil.objectMapperReadValue(mapperJsonString, JSONObject.class);
mapperIdentity = JsonUtil.getJSONObject(mapperJson, utility.getGetRegProcessorDemographicIdentity());
mapperJsonKeys = new ArrayList<>(mapperIdentity.keySet());
}
List<String> mapperJsonValues = new ArrayList<>();
JsonUtil.getJSONValue(JsonUtil.getJSONObject(mapperIdentity, MappingJsonConstants.INDIVIDUAL_BIOMETRICS), VALUE);
mapperIdentity.keySet().forEach(key -> mapperJsonValues.add(JsonUtil.getJSONValue(JsonUtil.getJSONObject(mapperIdentity, key), VALUE)));

String source = utility.getDefaultSource(process, ConfigEnum.READER);
for (String key : mapperJsonKeys) {
JSONObject jsonValue = JsonUtil.getJSONObject(mapperIdentity, key);
if (jsonValue.get(VALUE) != null && !jsonValue.get(VALUE).toString().isBlank()) {
String[] valueArray = jsonValue.get(VALUE).toString().split(",");
mapperJsonValues.addAll(new ArrayList(Arrays.asList(valueArray)));
}
}
Map<String, String> fieldMap =null;
try {
fieldMap = packetManagerService.getFields(id, mapperJsonValues, process, ProviderStageName.MESSAGE_SENDER);
Expand All @@ -633,7 +649,7 @@ else if (json instanceof org.json.JSONArray) {
Object obj = jsonArray.get(i);
JsonValue jsonValue = mapper.readValue(obj.toString(), JsonValue.class);
if(jsonValue.getLanguage().equalsIgnoreCase(lang)) {
attribute.putIfAbsent(e.getKey().toString(), jsonValue.getValue());
attribute.putIfAbsent(e.getKey().toString() + "_" + lang, jsonValue.getValue());
}
}
} else
Expand Down

0 comments on commit 077f031

Please sign in to comment.