Infosys
diff --git a/‎certify-service/src/main/java/io/mosip/certify/credential/W3CJsonLD.java‎
Lines changed: 1 addition & 0 deletions b/‎certify-service/src/main/java/io/mosip/certify/credential/W3CJsonLD.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎certify-service/src/main/java/io/mosip/certify/services/CertifyIssuanceServiceImpl.java‎
Lines changed: 5 additions & 2 deletions b/‎certify-service/src/main/java/io/mosip/certify/services/CertifyIssuanceServiceImpl.java‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎certify-service/src/main/java/io/mosip/certify/services/CredentialConfigurationServiceImpl.java‎
Lines changed: 2 additions & 3 deletions b/‎certify-service/src/main/java/io/mosip/certify/services/CredentialConfigurationServiceImpl.java‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎certify-service/src/main/java/io/mosip/certify/services/StatusListCredentialService.java‎
Lines changed: 1 addition & 0 deletions b/‎certify-service/src/main/java/io/mosip/certify/services/StatusListCredentialService.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎certify-service/src/main/java/io/mosip/certify/utils/DIDDocumentUtil.java‎
Lines changed: 3 additions & 4 deletions b/‎certify-service/src/main/java/io/mosip/certify/utils/DIDDocumentUtil.java‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎certify-service/src/test/java/io/mosip/certify/services/CertifyIssuanceServiceImplTest.java‎
Lines changed: 1 addition & 0 deletions b/‎certify-service/src/test/java/io/mosip/certify/services/CertifyIssuanceServiceImplTest.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎certify-service/src/test/java/io/mosip/certify/services/CredentialLedgerServiceTestImpl.java‎
Lines changed: 118 additions & 0 deletions b/‎certify-service/src/test/java/io/mosip/certify/services/CredentialLedgerServiceTestImpl.java‎
Lines changed: 118 additions & 0 deletions
diff --git a/‎certify-service/src/test/java/io/mosip/certify/utils/DIDDocumentUtilTest.java‎
Lines changed: 1 addition & 1 deletion b/‎certify-service/src/test/java/io/mosip/certify/utils/DIDDocumentUtilTest.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/postman-collections/inji-certify-with-mock-identity.postman_collection.json‎
Lines changed: 4 additions & 3 deletions b/‎docs/postman-collections/inji-certify-with-mock-identity.postman_collection.json‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎docs/postman-collections/inji-certify-with-mock-mdoc-vci.postman_collection.json‎
Lines changed: 3 additions & 2 deletions b/‎docs/postman-collections/inji-certify-with-mock-mdoc-vci.postman_collection.json‎
Lines changed: 3 additions & 2 deletions
@@ -34,6 +34,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import foundation.identity.jsonld.JsonLDException;
 import foundation.identity.jsonld.JsonLDObject;
 import info.weboftrust.ldsignatures.LdProof;
 import io.mosip.certify.api.dto.VCResult;
 
@@ -220,11 +220,14 @@ private VCResult<?> getVerifiableCredential(CredentialRequest credentialRequest,
 
             // Common logic for all formats
             templateParams.put(Constants.TEMPLATE_NAME, templateName);
-            templateParams.put(Constants.DID_URL, didUrl);
+                    templateParams.put(Constants.ISSUER_URI, issuerURI);
+                    if (statusListEnabled) {
+                        addCredentialStatus(jsonObject);
+                    }
             if (!StringUtils.isEmpty(renderTemplateId)) {
                 templateParams.put(Constants.RENDERING_TEMPLATE_ID, renderTemplateId);
             }
-            jsonObject.put("_holderId", holderId);
+                    jsonObject.put("_holderId", holderId);
             templateParams.putAll(jsonObject.toMap());
             if(!StringUtils.isEmpty(idPrefix)) {
                 templateParams.put(VCDMConstants.CREDENTIAL_ID, idPrefix + UUID.randomUUID());
 
@@ -8,7 +8,6 @@
 import com.danubetech.dataintegrity.suites.DataIntegrityProofDataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import io.mosip.certify.core.constants.Constants;
-import io.mosip.certify.core.constants.ErrorConstants;
 import io.mosip.certify.core.constants.VCFormats;
 import io.mosip.certify.core.dto.*;
 import io.mosip.certify.core.exception.CertifyException;
@@ -179,8 +178,8 @@ private void validateKeyAliasMapperConfiguration(CredentialConfigurationDTO cred
     }
 
     @Override
-    public CredentialConfigurationDTO getCredentialConfigurationById(String credentialConfigKeyId) {
-        Optional<CredentialConfig> optional = credentialConfigRepository.findByCredentialConfigKeyId(credentialConfigKeyId);
+    public CredentialConfigurationDTO getCredentialConfigurationById(String id) throws JsonProcessingException {
+        Optional<CredentialConfig> optional = credentialConfigRepository.findById(id);
 
         if(optional.isEmpty()) {
             throw new CredentialConfigException(ErrorConstants.CONFIG_NOT_FOUND_BY_ID, "Configuration not found for the provided ID: " + credentialConfigKeyId);
 
@@ -9,6 +9,7 @@
 import io.mosip.certify.credential.Credential;
 import io.mosip.certify.credential.CredentialFactory;
 import io.mosip.certify.entity.StatusListCredential;
+import io.mosip.certify.repository.StatusListAvailableIndicesRepository;
 import io.mosip.certify.repository.StatusListCredentialRepository;
 import io.mosip.certify.utils.BitStringStatusListUtils;
 import io.mosip.certify.vcformatters.VCFormatter;
 
@@ -40,7 +40,6 @@
 import org.springframework.stereotype.Component;
 
 @Slf4j
-@Component
 public class DIDDocumentUtil {
     @Autowired
     KeymanagerService keymanagerService;
@@ -130,11 +129,11 @@ private static Map<String, Object> generateVerificationMethod(String signatureAl
             throw new CertifyException(ErrorConstants.VERIFICATION_METHOD_GENERATION_FAILED, "Exception occurred while generating verification method for given signature algorithm: " + signatureAlgo);
         }
 
-        verificationMethod.put("id", didUrl + "#" + kid);
-        return verificationMethod;
+        didDocument.put("verificationMethod", Collections.singletonList(verificationMethod));
+        return didDocument;
     }
 
-    private static Map<String, Object> generateECR1VerificationMethod(PublicKey publicKey, String didUrl) {
+    private static Map<String, Object> generateECR1VerificationMethod(PublicKey publicKey, String issuerURI, String issuerPublicKeyURI) {
         ECPublicKey ecPublicKey = (ECPublicKey) publicKey;
         BigInteger yBI = ecPublicKey.getW().getAffineY();
         byte prefixByte = yBI.testBit(0) ? (byte) 0x03 : (byte) 0x02;
 
@@ -33,6 +33,7 @@
 import io.mosip.certify.utils.LedgerUtils;
 import io.mosip.certify.vcformatters.VCFormatter;
 import io.mosip.kernel.keymanagerservice.service.KeymanagerService;
+
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -0,0 +1,118 @@
+package io.mosip.certify.services;
+
+import io.mosip.certify.core.dto.CredentialLedgerSearchRequest;
+import io.mosip.certify.core.dto.CredentialStatusResponse;
+import io.mosip.certify.core.exception.CertifyException;
+import io.mosip.certify.entity.Ledger;
+import io.mosip.certify.repository.LedgerRepository;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CredentialLedgerServiceTestImpl {
+    @Mock
+    private LedgerRepository ledgerRepository;
+
+    @InjectMocks
+    private CredentialLedgerServiceImpl ledgerService;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.openMocks(this);
+    }
+
+    @Test
+    public void searchCredentials_ValidRequestWithAllFields_ReturnsResult() {
+        CredentialLedgerSearchRequest request = new CredentialLedgerSearchRequest();
+        request.setIssuerId("did:web:test");
+        request.setCredentialType("VerifiableCredential");
+        request.setCredentialId("67823e96-fda0-4eba-9828-a32a8d22cc42");
+        request.setIndexedAttributesEquals(Map.of("recipientEmail", "abc@example.com"));
+
+        Ledger ledger = createLedger("67823e96-fda0-4eba-9828-a32a8d22cc42");
+        when(ledgerRepository.findBySearchRequest(request)).thenReturn(List.of(ledger));
+
+        List<CredentialStatusResponse> results = ledgerService.searchCredentialLedger(request);
+
+        Assert.assertEquals(1, results.size());
+        Assert.assertEquals("67823e96-fda0-4eba-9828-a32a8d22cc42", results.get(0).getCredentialId());
+    }
+
+    @Test
+    public void searchCredentials_ValidRequestNoResults_ReturnsEmptyList() {
+        CredentialLedgerSearchRequest request = new CredentialLedgerSearchRequest();
+        request.setIssuerId("did:web:test");
+        request.setCredentialType("VerifiableCredential");
+        request.setIndexedAttributesEquals(Map.of("recipientName", "Unknown"));
+
+        when(ledgerRepository.findBySearchRequest(request)).thenReturn(Collections.emptyList());
+
+        List<CredentialStatusResponse> results = ledgerService.searchCredentialLedger(request);
+
+        assertTrue(results.isEmpty());
+    }
+
+    @Test
+    public void searchCredentials_NullIndexedAttrs_ThrowsCertifyException() {
+        CredentialLedgerSearchRequest request = new CredentialLedgerSearchRequest();
+        request.setIssuerId("did:web:test");
+        request.setCredentialType("VerifiableCredential");
+        request.setIndexedAttributesEquals(null);
+
+        CertifyException ex = assertThrows(CertifyException.class, () -> ledgerService.searchCredentialLedger(request));
+        Assert.assertEquals("INVALID_SEARCH_CRITERIA", ex.getErrorCode());
+    }
+
+    @Test
+    public void searchCredentials_EmptyIndexedAttrs_ThrowsCertifyException() {
+        CredentialLedgerSearchRequest request = new CredentialLedgerSearchRequest();
+        request.setIssuerId("did:web:test");
+        request.setCredentialType("VerifiableCredential");
+        request.setIndexedAttributesEquals(Collections.emptyMap());
+
+        CertifyException ex = assertThrows(CertifyException.class, () -> ledgerService.searchCredentialLedger(request));
+        Assert.assertEquals("INVALID_SEARCH_CRITERIA", ex.getErrorCode());
+    }
+
+    @Test
+    public void searchCredentials_RepositoryThrowsException_ThrowsCertifyException() {
+        CredentialLedgerSearchRequest request = new CredentialLedgerSearchRequest();
+        request.setIssuerId("did:web:test");
+        request.setCredentialType("VerifiableCredential");
+        request.setIndexedAttributesEquals(Map.of("recipientEmail", "abc@example.com"));
+
+        when(ledgerRepository.findBySearchRequest(request)).thenThrow(new RuntimeException("DB error"));
+
+        CertifyException ex = assertThrows(CertifyException.class, () -> ledgerService.searchCredentialLedger(request));
+        Assert.assertEquals("SEARCH_CREDENTIALS_FAILED", ex.getErrorCode());
+    }
+
+    private Ledger createLedger(String credentialId) {
+        Ledger ledger = new Ledger();
+        ledger.setId(1L);
+        ledger.setCredentialId(credentialId);
+        ledger.setIssuerId("did:web:Nandeesh778.github.io:local-test:certify_did");
+        ledger.setIssueDate(OffsetDateTime.parse("2025-06-10T10:23:24Z"));
+        ledger.setExpirationDate(null);
+        ledger.setCredentialType("VerifiableCredential");
+        ledger.setCredentialStatusDetails(new ArrayList<>());
+        return ledger;
+    }
+
+}
@@ -135,7 +135,7 @@ void testGenerateVerificationMethodUnsupportedAlgorithmViaReflection() {
             ReflectionTestUtils.invokeMethod(didDocumentUtil, "generateVerificationMethod", signatureCryptoSuite, certificateString, didUrl, kid);
         });
 
-        assertEquals(ErrorConstants.UNSUPPORTED_ALGORITHM, exception.getErrorCode());
+        assertEquals("unsupported_algorithm", exception.getErrorCode());
     }
 
     @Test
 
@@ -2492,12 +2492,13 @@
 							}
 						},
 						"url": {
-							"raw": "{{certifyurl}}/credential-configurations",
+							"raw": "{{certifyurl}}/credentials/configurations",
 							"host": [
 								"{{certifyurl}}"
 							],
 							"path": [
-								"credential-configurations"
+								"credentials",
+								"configurations"
 							]
 						}
 					},
@@ -2536,7 +2537,7 @@
 							}
 						},
 						"url": {
-							"raw": "{{certifyurl}}/credential-configurations/{{configId}}",
+							"raw": "{{certifyurl}}/credentials/configurations/{{configId}}",
 							"host": [
 								"{{certifyurl}}"
 							],
 
@@ -586,12 +586,13 @@
 							}
 						},
 						"url": {
-							"raw": "{{certifyurl}}/credential-configurations/{{configId}}",
+							"raw": "{{certifyurl}}/credentials/configurations/{{configId}}",
 							"host": [
 								"{{certifyurl}}"
 							],
 							"path": [
-								"credential-configurations",
+								"credentials",
+								"configurations",
 								"{{configId}}"
 							]
 						}
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ void testGenerateVerificationMethodUnsupportedAlgorithmViaReflection() {`
`135`	`135`	`ReflectionTestUtils.invokeMethod(didDocumentUtil, "generateVerificationMethod", signatureCryptoSuite, certificateString, didUrl, kid);`
`136`	`136`	`});`
`137`	`137`
`138`		`- assertEquals(ErrorConstants.UNSUPPORTED_ALGORITHM, exception.getErrorCode());`
	`138`	`+ assertEquals("unsupported_algorithm", exception.getErrorCode());`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -2492,12 +2492,13 @@`
`2492`	`2492`	`}`
`2493`	`2493`	`},`
`2494`	`2494`	`"url": {`
`2495`		`- "raw": "{{certifyurl}}/credential-configurations",`
	`2495`	`+ "raw": "{{certifyurl}}/credentials/configurations",`
`2496`	`2496`	`"host": [`
`2497`	`2497`	`"{{certifyurl}}"`
`2498`	`2498`	`],`
`2499`	`2499`	`"path": [`
`2500`		`- "credential-configurations"`
	`2500`	`+ "credentials",`
	`2501`	`+ "configurations"`
`2501`	`2502`	`]`
`2502`	`2503`	`}`
`2503`	`2504`	`},`
`@@ -2536,7 +2537,7 @@`
`2536`	`2537`	`}`
`2537`	`2538`	`},`
`2538`	`2539`	`"url": {`
`2539`		`- "raw": "{{certifyurl}}/credential-configurations/{{configId}}",`
	`2540`	`+ "raw": "{{certifyurl}}/credentials/configurations/{{configId}}",`
`2540`	`2541`	`"host": [`
`2541`	`2542`	`"{{certifyurl}}"`
`2542`	`2543`	`],`
Original file line number	Diff line number	Diff line change
`@@ -586,12 +586,13 @@`
`586`	`586`	`}`
`587`	`587`	`},`
`588`	`588`	`"url": {`
`589`		`- "raw": "{{certifyurl}}/credential-configurations/{{configId}}",`
	`589`	`+ "raw": "{{certifyurl}}/credentials/configurations/{{configId}}",`
`590`	`590`	`"host": [`
`591`	`591`	`"{{certifyurl}}"`
`592`	`592`	`],`
`593`	`593`	`"path": [`
`594`		`- "credential-configurations",`
	`594`	`+ "credentials",`
	`595`	`+ "configurations",`
`595`	`596`	`"{{configId}}"`
`596`	`597`	`]`
`597`	`598`	`}`