MOSIP-27014 Fixed ack template issue. (#894)

* Fixed service history issue. * MOSIP-27014 Fixed ack template issue.
mosip · Apr 25, 2023 · 8383614 · 8383614
1 parent e0de961
commit 8383614
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/resident/resident-service/src/main/java/io/mosip/resident/util/TemplateUtil.java b/resident/resident-service/src/main/java/io/mosip/resident/util/TemplateUtil.java
@@ -57,6 +57,7 @@ public class TemplateUtil {
 	private static final String LOGO_URL = "logoUrl";
     private static final CharSequence GENERATED = "generated";
     private static final CharSequence REVOKED = "revoked";
+    private static final String UNKNOWN = "Unknown";
 
     @Autowired
     private ResidentTransactionRepository residentTransactionRepository;
@@ -113,8 +114,15 @@ public Tuple2<Map<String, String>, ResidentTransactionEntity> getCommonTemplateV
         templateVariables.put(TemplateVariablesConstants.PURPOSE, residentTransactionEntity.getPurpose());
         templateVariables.put(TemplateVariablesConstants.ATTRIBUTE_LIST, getAttributesDisplayText(replaceNullWithEmptyString(
                 residentTransactionEntity.getAttributeList()), languageCode));
-        templateVariables.put(TemplateVariablesConstants.AUTHENTICATION_MODE,
-                getAuthTypeCodeTemplateValue(replaceNullWithEmptyString(residentTransactionEntity.getAuthTypeCode()), languageCode));
+        String authenticationMode =
+                getAuthTypeCodeTemplateValue(replaceNullWithEmptyString(residentTransactionEntity.getAuthTypeCode()), languageCode);
+        if(authenticationMode.equalsIgnoreCase(UNKNOWN)){
+            templateVariables.put(TemplateVariablesConstants.AUTHENTICATION_MODE,
+                    replaceNullWithEmptyString(residentTransactionEntity.getAuthTypeCode()));
+        }else {
+            templateVariables.put(TemplateVariablesConstants.AUTHENTICATION_MODE,
+                    authenticationMode);
+        }
         try {
             templateVariables.put(TemplateVariablesConstants.INDIVIDUAL_ID, getIndividualIdType());
         } catch (ApisResourceAccessException e) {
@@ -295,7 +303,7 @@ public Tuple2<Map<String, String>, String> getAckTemplateVariablesForDownloadPer
     /**
      * This method will replace attribute placeholder in template and add attribute list into it.
      * @param fileText This contains value of template.
-     * @param purpose This contains purpose of request type stored in template.
+     * @param attributes This contains attributes of request type stored in template.
      * @param languageCode This contains logged-in language code.
      * @return purpose after adding attributes.
      */