Notification setting

java/claim/src/main/java/dev/sunbirdrc/claim/contants/AttributeNames.java

@@ -9,6 +9,8 @@ public class AttributeNames {
     public static final String ENTITY = "ENTITY";
     public static final String LOWERCASE_ENTITY = "entity";;
     public static final String ATTESTOR_INFO = "attestorInfo";
+
+    public static final String REQUESTOR_INFO = "reguestorInfo";
     public static final String CONTENT = "content";
     public static final String TOTAL_PAGES = "totalPages";
     public static final String TOTAL_ELEMENTS = "totalElements";

java/claim/src/main/java/dev/sunbirdrc/claim/controller/ClaimsController.java

@@ -17,11 +17,11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static dev.sunbirdrc.claim.contants.AttributeNames.ATTESTOR_INFO;
-import static dev.sunbirdrc.claim.contants.AttributeNames.LOWERCASE_ENTITY;
+import static dev.sunbirdrc.claim.contants.AttributeNames.*;
 
 @Controller
 public class ClaimsController {
@@ -45,6 +45,15 @@ public ResponseEntity<Map<String, Object>> getClaims(@RequestHeader HttpHeaders
         return new ResponseEntity<>(claims, HttpStatus.OK);
     }
 
+
+    @RequestMapping(value = "/api/v2/getClaims", method = RequestMethod.POST)
+    public ResponseEntity<List<Claim>> getStudentClaims(@RequestHeader HttpHeaders headers,
+                                                         @RequestBody JsonNode requestBody, Pageable pageable) {
+        String entity = requestBody.get(LOWERCASE_ENTITY).asText();
+        JsonNode attestorNode = requestBody.get(ATTESTOR_INFO);
+        List<Claim> claims = claimService.findByRequestorName(attestorNode.asText(), pageable);
+        return new ResponseEntity<>(claims, HttpStatus.OK);
+    }
     @RequestMapping(value = "/api/v1/getClaims/{claimId}", method = RequestMethod.POST)
     public ResponseEntity<ClaimWithNotesDTO> getClaimById(@RequestHeader HttpHeaders headers, @PathVariable String claimId,
                                               @RequestBody JsonNode requestBody) {

java/claim/src/main/java/dev/sunbirdrc/claim/repository/ClaimRepository.java

@@ -11,4 +11,6 @@ public interface ClaimRepository extends JpaRepository<Claim, String> {
     List<Claim> findByConditionsIn(List<String> conditions);
     List<Claim> findByAttestorEntityIn(List<String> entities);
     List<Claim> findByAttestorEntity(String entity);
+
+    List<Claim> findByRequestorName(String requestorName);
 }

java/claim/src/main/java/dev/sunbirdrc/claim/service/ClaimService.java

@@ -63,6 +63,14 @@ public Map<String, Object> findClaimsForAttestor(String entity, JsonNode attesto
         return toMap(claimsToAttestor, pageable);
     }
 
+    public List<Claim> findByRequestorName(String entity, Pageable pageable) {
+        List<Claim> claims = claimRepository.findByRequestorName(entity);
+        logger.info("Found {} claims to process", claims.size());
+        List<Claim> claimsRequestor = claims.stream()
+                .collect(Collectors.toList());
+        return claimsRequestor;
+    }
+
     private Map<String, Object> toMap(List<Claim> claims, Pageable pageable) {
         Map<String, Object> response = new HashMap<>();
         response.put(TOTAL_PAGES, (int)(Math.ceil(claims.size() * 1.0/pageable.getPageSize())));

java/claim/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8082
 
-spring.datasource.url=${connectionInfo_uri:jdbc:postgresql://localhost:5432/registry5}
+spring.datasource.url=${connectionInfo_uri:jdbc:postgresql://localhost:5432/registry}
 spring.datasource.username=${connectionInfo_username:postgres}
 spring.datasource.password=${connectionInfo_password:postgres}
 
@@ -9,11 +9,11 @@ spring.jpa.hibernate.ddl-auto=update
 
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 sunbirdrc.url=${sunbirdrc_url:http://localhost:8081}
-spring.mail.host=smtp.gmail.com
-spring.mail.port=465
-spring.mail.username=upsmf.otp@upsmfac.org
-spring.mail.password=OTP22023##
-spring.mail.properties.mail.smtp.ssl.enable = true
+spring.mail.host=smtp.sendgrid.net
+spring.mail.port=587
+spring.mail.username=apikey
+
+spring.mail.password=
 
 
 # Other properties

java/registry/src/main/java/dev/sunbirdrc/registry/app/SunbirdRCApplication.java

@@ -51,8 +51,8 @@ public static ApplicationContext getAppContext() {
         return context;
     }
 
-//    @Value("${cors.allowedOrigin}")
-//    public String corsAllowedOrigin;
+    @Value("${cors.allowedOrigin}")
+    public String corsAllowedOrigin;
 
     @Bean
     public FilterRegistrationBean corsFilter() {
@@ -61,17 +61,17 @@ public FilterRegistrationBean corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
         //config.setAllowCredentials(true);
-//        config.addAllowedOrigin(corsAllowedOrigin);
+          config.addAllowedOrigin(corsAllowedOrigin);
           config.addAllowedOrigin("*");
-//        config.setAllowedOrigins(list);
-//        config.addAllowedHeader("*");
-//        config.addAllowedMethod("POST");
-//        config.addAllowedMethod("DELETE");
-//        config.addAllowedMethod("GET");
-//        config.addAllowedMethod("OPTIONS");
-//        config.addAllowedMethod("PUT");
-//        source.registerCorsConfiguration("/**", config);
-        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+          config.setAllowedOrigins(list);
+          config.addAllowedHeader("*");
+          config.addAllowedMethod("POST");
+          config.addAllowedMethod("DELETE");
+          config.addAllowedMethod("GET");
+          config.addAllowedMethod("OPTIONS");
+          config.addAllowedMethod("PUT");
+          source.registerCorsConfiguration("/**", config);
+          FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
         bean.setOrder(0);
         return bean;
     }

java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryClaimsController.java

@@ -57,6 +57,22 @@ public ResponseEntity<Object> getAllClaims(@PathVariable String entityName, Page
         }
     }
 
+
+    @RequestMapping(value = "/api/v2/{entityName}/claims", method = RequestMethod.GET)
+    public ResponseEntity<Object> getStudentsClaims(@PathVariable String entityName, Pageable pageable,
+                                               HttpServletRequest request) {
+        try {
+            JsonNode result = registryHelper.getRequestedUserDetails(request, entityName);
+            JsonNode claims = claimRequestClient.getStudentsClaims(result.get(entityName).get(0).get("email"), pageable, entityName);
+            logger.info("Received {} claims", claims.size());
+            return new ResponseEntity<>(claims, HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Fetching claims failed {}", e.getMessage());
+            e.printStackTrace();
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
     @RequestMapping(value = "/api/v1/{entityName}/claims/{claimId}", method = RequestMethod.GET)
     public ResponseEntity<Object> getClaim(@PathVariable String entityName, @PathVariable String claimId,
                                            HttpServletRequest request) {

java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java

@@ -448,7 +448,8 @@ private JsonNode getAttestationNode(String attestationId, JsonNode node) {
         JsonNode attestationNode = null;
         while (iterator.hasNext()) {
             attestationNode = iterator.next();
-            if (attestationNode.get(uuidPropertyName).toString().equals(attestationId)) {
+            JsonNode jsonNode = attestationNode.get(uuidPropertyName);
+            if (jsonNode!=null && jsonNode.toString().equals(attestationId)) {
                 break;
             }
         }
@@ -494,7 +495,7 @@ public ResponseEntity<Object> getUserDetails(
         try {
             checkEntityNameInDefinitionManager(entityName);
             ArrayList<String> fields = getConsentFields(request);
-            JsonNode userInfoFromRegistry = registryHelper.getRequestedUserDetailsSearch(request, entityName);
+            JsonNode userInfoFromRegistry = registryHelper.getRequestedUserDetails(request, entityName);
             JsonNode jsonNode = userInfoFromRegistry.get(entityName);
             if (jsonNode instanceof ArrayNode) {
                 ArrayNode values = (ArrayNode) jsonNode;
@@ -572,11 +573,11 @@ public ResponseEntity<Object> getEntityType(@PathVariable String entityName,
             JsonNode node = registryHelper.readEntity(readerUserId, entityName, entityId, false,
                             viewTemplateManager.getViewTemplateById(viewTemplateId), false)
                     .get(entityName);
-            JsonNode signedNode = objectMapper.readTree(node.get(OSSystemFields._osSignedData.name()).asText());
+//            JsonNode signedNode = objectMapper.readTree(node.get(OSSystemFields._osSignedData.name()).asText());
 
             String templateUrlFromRequest = getTemplateUrlFromRequest(request, entityName);
 
-            return new ResponseEntity<>(certificateService.getCertificate(signedNode,
+            return new ResponseEntity<>(certificateService.getCertificate(node,
                     entityName,
                     entityId,
                     request.getHeader(HttpHeaders.ACCEPT),
@@ -727,6 +728,13 @@ public ResponseEntity<Object> getEntityByToken(@PathVariable String entityName,
                                                    @RequestHeader(required = false) String viewTemplateId) throws RecordNotFoundException {
         ResponseParams responseParams = new ResponseParams();
         Response response = new Response(Response.API_ID.GET, "OK", responseParams);
+        ResponseEntity<Object> objectResponseEntity = getObjectResponseEntity(entityName, request, viewTemplateId, responseParams, response);
+        return objectResponseEntity;
+    }
+
+
+    @NotNull
+    private ResponseEntity<Object> getObjectResponseEntity(String entityName, HttpServletRequest request, String viewTemplateId, ResponseParams responseParams, Response response) {
         try {
             checkEntityNameInDefinitionManager(entityName);
             String userId = registryHelper.getUserId(request, entityName);
@@ -746,7 +754,7 @@ public ResponseEntity<Object> getEntityByToken(@PathVariable String entityName,
                 return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
             }
         } catch (RecordNotFoundException e) {
-             createSchemaNotFoundResponse(e.getMessage(),responseParams);
+             createSchemaNotFoundResponse(e.getMessage(), responseParams);
             response = new Response(Response.API_ID.GET, "ERROR", responseParams);
             return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
         } catch (Exception e) {
@@ -981,7 +989,18 @@ public ResponseEntity<Object> revokeACredential (
             return new ResponseEntity<>(response,HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-
+    @Nullable
+    private JsonNode getAttestationNode1(String attestationId, JsonNode node) {
+        Iterator<JsonNode> iterator = node.iterator();
+        JsonNode attestationNode = null;
+        while (iterator.hasNext()) {
+            attestationNode = iterator.next();
+            if (attestationNode.get(uuidPropertyName).toString().equals(attestationId)) {
+                break;
+            }
+        }
+        return attestationNode;
+    }
     /**
      * PULL-URI-Request API for DigiLocker
      * @param request
@@ -1016,20 +1035,33 @@ public ResponseEntity<Object> issueCertificateToDigiLocker(HttpServletRequest re
         Response response = new Response(Response.API_ID.SEARCH, "OK", responseParams);
         String osid = null;
         JsonNode result = null;
-        try {
-            result = registryHelper.getRequestedUserDetailsCustom(request, entityName, xmlString);
-            if (result != null && result.get(entityName) != null && result.get(entityName).size() > 0) {
-                ArrayNode responseFromDb = registryHelper.fetchFromDBUsingEsResponse(entityName, (ArrayNode) result.get(entityName));
-                if(responseFromDb!=null && responseFromDb.size() > 0){
-                    osid = responseFromDb.get(0).get("osid").asText();
-                }
-            }
+        try{
+            String userId = registryHelper.getUserId(request, entityName);
+            JsonNode responseFromDb = registryHelper.searchEntitiesByUserId(entityName, userId, null);
+            JsonNode entities = responseFromDb.get(entityName);
         } catch (Exception e) {
             statusCode = "0";
             e.printStackTrace();
             return new ResponseEntity<>(statusCode, HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
+
+//        ResponseEntity<Object> objectResponseEntity = getObjectResponseEntity(entityName, request, null, responseParams, response);
+
+//        try {
+//            result = registryHelper.getRequestedUserDetailsCustom(request, entityName, xmlString);
+//            if (result != null && result.get(entityName) != null && result.get(entityName).size() > 0) {
+//                ArrayNode responseFromDb = registryHelper.fetchFromDBUsingEsResponse(entityName, (ArrayNode) result.get(entityName));
+//                if(responseFromDb!=null && responseFromDb.size() > 0){
+//                    osid = responseFromDb.get(0).get("osid").asText();
+//                }
+//            }
+//        } catch (Exception e) {
+//            statusCode = "0";
+//            e.printStackTrace();
+//            return new ResponseEntity<>(statusCode, HttpStatus.INTERNAL_SERVER_ERROR);
+//        }
+
         if(osid!=null) {
             try {
                 String readerUserId = getUserId(entityName, request);