Mosip 26350 fix share cred req (mosip#802)

* Fix for setting read status to false * Revert "Fix for setting read status to false (mosip#791)" This reverts commit c00a051. * Check test fix * Fix NPE in test in github * Test fix * logic fix in test * Test fix * Test fix * Minor fixes * Ignoring test for build failure in github action. to be reverted and fixed * Fix for setting read status to false (mosip#791) Co-authored-by: Loganathan Sekar <[email protected]> * Fix for share credential request to cred req service * fix for is masked false * Fix for isMasked --------- Co-authored-by: Loganathan Sekar <[email protected]>
loganathan-sekaran · Mar 17, 2023 · 762d163 · 762d163
1 parent f201619
commit 762d163
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/...dent-service/src/main/java/io/mosip/resident/controller/ResidentCredentialController.java b/...dent-service/src/main/java/io/mosip/resident/controller/ResidentCredentialController.java
@@ -38,6 +38,7 @@
 import io.mosip.resident.dto.ResidentCredentialRequestDto;
 import io.mosip.resident.dto.ResidentCredentialResponseDto;
 import io.mosip.resident.dto.ResidentCredentialResponseDtoV2;
+import io.mosip.resident.dto.SharableAttributesDTO;
 import io.mosip.resident.dto.ShareCredentialRequestDto;
 import io.mosip.resident.exception.ApisResourceAccessException;
 import io.mosip.resident.exception.ResidentServiceCheckedException;
@@ -221,11 +222,17 @@ private void buildAdditionalMetadata(RequestWrapper<ShareCredentialRequestDto> r
 				requestDTO.getRequest().getSharableAttributes(), UISchemaTypes.SHARE_CREDENTIAL.getFileIdentifier());
 		if (Objects.nonNull(requestDTO.getRequest().getSharableAttributes())) {
 			request.getRequest().setSharableAttributes(sharableAttr);
+			Map<String, String> formattingAttributes = requestDTO.getRequest().getSharableAttributes()
+															.stream()
+															.filter(attrib -> attrib.getFormat() != null && !attrib.getFormat().isEmpty())
+															.collect(Collectors.toMap(SharableAttributesDTO::getAttributeName, SharableAttributesDTO::getFormat));
 			request.getRequest()
-					.setAdditionalData(Map.of("formatingAttributes", requestDTO.getRequest().getSharableAttributes(),
+					.setAdditionalData(Map.of("formatingAttributes", formattingAttributes,
 							"maskingAttributes",
-							requestDTO.getRequest().getSharableAttributes().stream().filter(attr -> attr.isMasked())
-									.map(attr -> attr.getAttributeName()).collect(Collectors.toList())));
+							requestDTO.getRequest().getSharableAttributes().stream()
+									.filter(attr -> attr.isMasked())
+									.map(attr -> attr.getAttributeName())
+									.collect(Collectors.toList())));
 
 		}
 	}

diff --git a/resident/resident-service/src/main/java/io/mosip/resident/dto/SharableAttributesDTO.java b/resident/resident-service/src/main/java/io/mosip/resident/dto/SharableAttributesDTO.java
@@ -1,5 +1,7 @@
 package io.mosip.resident.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 /**
@@ -13,5 +15,6 @@ public class SharableAttributesDTO {
 
 	private String format;
 
+	@JsonProperty("isMasked")
 	private boolean isMasked;
 }
diff --git a/...ident-service/src/main/java/io/mosip/resident/service/impl/ResidentConfigServiceImpl.java b/...ident-service/src/main/java/io/mosip/resident/service/impl/ResidentConfigServiceImpl.java
@@ -41,6 +41,8 @@
 @Component
 public class ResidentConfigServiceImpl implements ResidentConfigService {
 
+	private static final String VALUE = "value";
+
 	private static final String UI_SCHEMA_ATTRIBUTE_NAME = "mosip.resident.schema.attribute-name";
 
 	private static final String CONTROL_TYPE = "controlType";
@@ -189,24 +191,24 @@ public List<String> getSharableAttributesList(List<SharableAttributesDTO> sharab
 		List<String> idsListFromUISchema = identityList.stream().map(map -> String.valueOf(map.get(env.getProperty(UI_SCHEMA_ATTRIBUTE_NAME))))
 				.collect(Collectors.toList());
 
-		// attribute list from format present in both identity-mapping & ui-schema json
-		List<String> sharableList1 = sharableAttrList.stream()
-				.filter(map -> identityMap.containsKey(map.getAttributeName()) && map.getFormat()!=null)
-				.flatMap(attr -> Stream.of(attr.getFormat().split(",")))
-				.filter(idsListFromUISchema::contains)
-				.collect(Collectors.toList());
-
-		// attribute list from format not present in identity-mapping & but in ui-schema json
-		List<String> sharableList2 = sharableAttrList.stream()
-				.filter(map -> !identityMap.containsKey(map.getAttributeName()) && map.getFormat()!=null)
-				.map(map -> map.getFormat())
+		List<String> shareableAttributes = sharableAttrList.stream()
+				.flatMap(attribute -> {
+					// Get the attributes from the format if specified
+					if(attribute.getFormat()!=null && !attribute.getFormat().isEmpty()) {
+						return Stream.of(attribute.getFormat().split(","));
+					}
+					// Get the attributes from the identity mapping
+					if(identityMap.containsKey(attribute.getAttributeName())) {
+						return Stream.of(String.valueOf(((Map) identityMap.get(attribute.getAttributeName())).get(VALUE))
+								.split(","));
+					}
+					// Return the attribute name itself
+					return Stream.of(attribute.getAttributeName());
+				})
 				.filter(idsListFromUISchema::contains)
 				.collect(Collectors.toList());
 
-		return Stream.of(sharableList1, sharableList2)
-                .flatMap(x -> x.stream())
-                .distinct()
-                .collect(Collectors.toList());
+		return shareableAttributes;
 	}
 
 }