Merge pull request Sunbird-Knowlg#1299 from PradyumnaNagendra/release…

…-3.5.0 Merge branch 'release-3.4.0' into release-3.5.0
eagle-sb · Dec 16, 2020 · e8f7511 · e8f7511
2 parents 14e2bdc + c653746
commit e8f7511
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/...-generator-v2/src/main/java/org/sunbird/jobs/samza/service/util/CertificateGenerator.java b/...-generator-v2/src/main/java/org/sunbird/jobs/samza/service/util/CertificateGenerator.java
@@ -202,6 +202,7 @@ private void generateCertificate(List<Map<String, String>> certificates, String
                 if(CollectionUtils.isNotEmpty(updatedCerts)) {
                     Map<String, Object> dataToUpdate = new HashMap<String, Object>() {{
                         put(CourseCertificateParams.issued_certificates.name(), updatedCerts);
+                        put(CourseCertificateParams.certstatus.name(), 2);
                     }};
                     Map<String, Object> dataToSelect = new HashMap<String, Object>() {{
                         put(CourseCertificateParams.userId.name(), userId);

diff --git a/...cate-generator-v2/src/main/java/org/sunbird/jobs/samza/service/util/IssueCertificate.java b/...cate-generator-v2/src/main/java/org/sunbird/jobs/samza/service/util/IssueCertificate.java
@@ -93,7 +93,6 @@ private void fetchUsersAndIssueCertificates(String batchId, String courseId, Boo
             LOGGER.info("IssueCertificate:fetchUsersAndIssueCertificates: userIds " + userIds);
             for (String key : templates.keySet()) {
                 Map<String, String> template = templates.get(key);
-                //String certName = template.getOrDefault("name", "");
                 String criteriaString = template.get("criteria");
                 if (StringUtils.isNotBlank(criteriaString)) {
                     Map<String, Object> criteria = mapper.readValue(criteriaString, new TypeReference<Map<String, Object>>() {
@@ -118,6 +117,10 @@ private void fetchUsersAndIssueCertificates(String batchId, String courseId, Boo
                                 }).orElse(Arrays.asList());
 
                         generateCertificatesForEnrollment(usersToIssue, batchId, courseId, reIssue, template, collector);
+
+                        List<String> criteriaNotMatchedList = userIds.stream().filter(u -> !usersToIssue.contains(u)).collect(Collectors.toList());
+                        // certstatus = 3 means - the criteria didn't match.
+                        updateEnrolmentCertStatus(criteriaNotMatchedList, courseId, batchId, 3);
                     } else {
                         LOGGER.info("IssueCertificate:fetchUsersAndIssueCertificates: Certificate template has empty/invalid criteria: " + criteria);
                         throw new ClientException("ERR_INVALID_CERTIFICATE_TEMPLATE", "Certificate template has empty/invalid criteria: " + criteria);
@@ -133,6 +136,20 @@ private void fetchUsersAndIssueCertificates(String batchId, String courseId, Boo
         }
     }
 
+    private void updateEnrolmentCertStatus(List<String> userIds, String courseId, String batchId, Integer certStatus) {
+        for (String userId: userIds) {
+            Map<String, Object> dataToUpdate = new HashMap<String, Object>() {{
+                put(CourseCertificateParams.certstatus.name(), certStatus);
+            }};
+            Map<String, Object> dataToSelect = new HashMap<String, Object>() {{
+                put(CourseCertificateParams.userId.name(), userId);
+                put(CourseCertificateParams.courseId.name(), courseId);
+                put(CourseCertificateParams.batchId.name(), batchId);
+            }};
+            SunbirdCassandraUtil.update(cassandraSession, KEYSPACE, USER_COURSES_TABLE, dataToUpdate, dataToSelect);
+        }
+    }
+
     private static List<String> getUsersFromUserCriteria(Map<String, Object> criteria, List<String> userIds) throws Exception {
         if(MapUtils.isEmpty(criteria))
             return new ArrayList<>();
@@ -321,7 +338,6 @@ private void generateCertificatesForEnrollment(List<String> usersToIssue, String
             }
         } else {
             LOGGER.info("IssueCertificate:generateCertificatesForEnrollment: NO users satisfied the criteria for batchId: " + batchId + " and courseId: " + courseId);
-            throw new ClientException("ERR_GENERATE_CERTIFICATE", "NO users satisfied the criteria for batchId: " + batchId + " and courseId: " + courseId);
         }
     }
 

diff --git a/...icate-generator-v2/src/main/java/org/sunbird/jobs/samza/util/CourseCertificateParams.java b/...icate-generator-v2/src/main/java/org/sunbird/jobs/samza/util/CourseCertificateParams.java
@@ -4,5 +4,5 @@ public enum CourseCertificateParams {
     edata, object, iteration, id, batchId, userId, certificates, reIssue, request,certificate, data, recipientName,
     recipientId, courseName, name, issuer, signatoryList, tag, orgId, htmlTemplate, url, pdfUrl, lastIssuedOn,
     jsonData, issuedDate, token, accessCode, jsonUrl, courseId, oldId, keys, criteria, narrative, basePath, userIds,
-    svgTemplate, identifier, type, rollup, l1, channel, pdata, pid, ver, env, cdata, props, mid, eid, issued_certificates
+    svgTemplate, identifier, type, rollup, l1, channel, pdata, pid, ver, env, cdata, props, mid, eid, issued_certificates, certstatus
 }
diff --git a/...s/samza/course-common/src/main/java/org/sunbird/jobs/samza/util/SunbirdCassandraUtil.java b/...s/samza/course-common/src/main/java/org/sunbird/jobs/samza/util/SunbirdCassandraUtil.java
@@ -30,8 +30,7 @@ public static void update(Session session, String keyspace, String table, Map<St
             else
                 updateQuery.and(QueryBuilder.eq(entry.getKey(), entry.getValue()));
         });
-
-
+
         session.execute(updateQuery);
     }
 

diff --git a/platform-jobs/samza/distribution/pom.xml b/platform-jobs/samza/distribution/pom.xml
@@ -78,13 +78,6 @@
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.ekstep</groupId>
-			<artifactId>course-certificate-generator</artifactId>
-			<version>0.0.68</version>
-			<type>tar.gz</type>
-			<classifier>distribution</classifier>
-		</dependency>
 		<dependency>
 			<groupId>org.ekstep</groupId>
 			<artifactId>course-certificate-generator-v2</artifactId>

diff --git a/platform-jobs/samza/pom.xml b/platform-jobs/samza/pom.xml
@@ -33,7 +33,6 @@
         <module>post-publish-processor</module>
         <module>qr-image-generator</module>
 		<module>merge-user-courses</module>
-		<module>course-certificate-generator</module>
 		<module>course-certificate-generator-v2</module>
         <module>auto-creator</module>
 		<module>mvc-processor-indexer</module>
-Original file line number
+Diff line change
@@ Expand Up @@
                 else
                     updateQuery.and(QueryBuilder.eq(entry.getKey(), entry.getValue()));
             });
             session.execute(updateQuery);
         }
@@ Expand Down @@