From fa9d03dfa4da00c4c4f32e408f3d4904800c439b Mon Sep 17 00:00:00 2001 From: Shivam Rajesh Gupta <56411166+shivamg9@users.noreply.github.com> Date: Thu, 2 Apr 2026 12:52:44 +0530 Subject: [PATCH] Add JSON processing for dynamic field values --- .../masterdata/service/impl/DynamicFieldServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/DynamicFieldServiceImpl.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/DynamicFieldServiceImpl.java index 2a7b4561a18..a7b122f7cf8 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/DynamicFieldServiceImpl.java +++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/DynamicFieldServiceImpl.java @@ -68,6 +68,8 @@ import io.mosip.kernel.masterdata.utils.PageUtils; import io.mosip.kernel.masterdata.validator.FilterColumnValidator; import io.mosip.kernel.masterdata.validator.FilterTypeValidator; +import com.fasterxml.jackson.core.JsonProcessingException; +import io.mosip.kernel.masterdata.dto.DynamicFieldCodeValueDTO; @Service public class DynamicFieldServiceImpl implements DynamicFieldService { @@ -516,19 +518,20 @@ public DynamicFieldConsolidateResponseDto getDynamicFieldByNameAndLangcode(Strin DynamicFieldConsolidateResponseDto dto = new DynamicFieldConsolidateResponseDto(); dto.setDescription(lst.get(0).getDescription()); dto.setName(lst.get(0).getName()); - dto.setJsonValues(null); + List dtolist = new ArrayList(); if (withValue == true) { List l = new ArrayList<>(); for (int i = 0; i < lst.size(); i++) { l.add(new JSONObject(lst.get(i).getValueJson())); + dtolist.add(objectMapper.readValue(lst.get(i).getValueJson(),DynamicFieldCodeValueDTO.class)); } - dto.setJsonValues(new JSONArray(l)); + dto.setValues(dtolist); } return dto; - } catch (DataAccessLayerException | DataAccessException | JSONException e) { + } catch (DataAccessLayerException | DataAccessException | JSONException | JsonProcessingException e) { throw new MasterDataServiceException(SchemaErrorCode.DYNAMIC_FIELD_FETCH_EXCEPTION.getErrorCode(), ExceptionUtils.parseException(e)); }