Merge pull request #122 from shikshalokam/ED-599-Integration

consentShared key added and kafka event trigger conditions updated

models/programUsers.js

@@ -21,7 +21,11 @@ module.exports = {
         required: true
       },
       userRoleInformation: Object,
-      appInformation: Object
+      appInformation: Object,
+      consentShared: {
+        type: Boolean,
+        default: false
+      }
     },
     compoundIndex: [
         {

module/programUsers/helper.js

@@ -120,20 +120,21 @@ module.exports = class ProgramUsersHelper {
     }
 
     /**
-     * check if user joined a program or not
+     * check if user joined a program or not and consentShared
      * @method
-     * @name checkForUserJoinedProgram
+     * @name checkForUserJoinedProgramAndConsentShared
      * @param {String} programId
      * @param {String} userId 
-     * @returns {Boolean} - true/false.
+     * @returns {Object} result.
     */
 
-    static checkForUserJoinedProgram(
+    static checkForUserJoinedProgramAndConsentShared(
         programId, 
         userId
     ) {
         return new Promise(async (resolve, reject) => {
             try {
+                let result = {};
                 const query = { 
                     userId: userId,
                     programId: programId
@@ -142,10 +143,11 @@ module.exports = class ProgramUsersHelper {
                 //Check data present in programUsers collection.
                 let programUsers = await this.programUsersDocuments(
                     query,
-                    ["_id"]
+                    ["_id","consentShared"]
                 );
-                let joinedProgram = programUsers.length > 0 ? true :false
-                return resolve(joinedProgram);
+                result.joinProgram = programUsers.length > 0 ? true : false;
+                result.consentShared = programUsers.length > 0 ? programUsers[0].consentShared : false;
+                return resolve(result);
 
             } catch (error) {
                 return reject(error);

module/programs/helper.js

@@ -477,7 +477,6 @@ module.exports = class ProgramsHelper {
         });
 
       } catch (error) {
-        console.log("error :",error)
           return resolve({
             success : false,
             message : error.message,
@@ -531,7 +530,6 @@ module.exports = class ProgramsHelper {
         });
 
       } catch (error) {
-        console.log("error :",error)
         return resolve({
           success : false,
           message : error.message,
@@ -980,7 +978,7 @@ module.exports = class ProgramsHelper {
             "rootOrganisations"
           ]
         );
-        
+
         if ( !programData.length > 0 ) {
           throw ({
             status: httpStatusCode.bad_request.status,
@@ -996,7 +994,7 @@ module.exports = class ProgramsHelper {
             userId: userId,
             programId: programId
           },
-          ["_id"]
+          ["_id","consentShared"]
         );
         // if user not joined for program. we have add more key values to programUsersData
         if ( !programUsersDetails.length > 0 ) {
@@ -1019,7 +1017,7 @@ module.exports = class ProgramsHelper {
             programId: programId,
             userRoleInformation: data.userRoleInformation,
             userId: userId,
-            userProfile:userProfile.data,
+            userProfile: userProfile.data,
             resourcesStarted : false  
           }
           if( appName != "" ) {
@@ -1049,27 +1047,42 @@ module.exports = class ProgramsHelper {
               }
             }
             let consentResponse = await userService.setUserConsent(userToken, userConsentRequestBody)
-            console.log("consentResponse ",consentResponse)
 
             if(!consentResponse.success){
               throw {
                 message: constants.apiResponses.PROGRAM_JOIN_FAILED,
                 status: httpStatusCode.bad_request.status
               }
             }
+
           }
-          pushProgramUsersDetailsToKafka = true; 
+
+        }
+
+        // if requestForPIIConsent Is false and user not joined program till now then set pushProgramUsersDetailsToKafka = true; 
+        // if requestForPIIConsent == true and data.consentShared value is true which means user interacted with the consent popup set pushProgramUsersDetailsToKafka = true;
+        // if programUsersDetails[0].consentShared === true which means the data is already pushed to Kafka once
+        if((programData[0].hasOwnProperty('requestForPIIConsent') && programData[0].requestForPIIConsent === false && !programUsersDetails.length > 0) ||
+          ((programData[0].hasOwnProperty('requestForPIIConsent') && programData[0].requestForPIIConsent === true) && (data.hasOwnProperty('consentShared') && data.consentShared == true &&
+          (programUsersDetails.length > 0 && programUsersDetails[0].consentShared === false || !programUsersDetails.length > 0)))) {
+
+            pushProgramUsersDetailsToKafka = true; 
+
         }
 
         //create or update query
         const query = { 
           programId: programId,
           userId: userId
         };
-
+        //if a resource is started
         if ( data.isResource ) {
           programUsersData.resourcesStarted = true;
         }
+        //if user interacted with the consent-popup
+        if ( data.hasOwnProperty('consentShared') ) {
+          programUsersData.consentShared = data.consentShared;
+        }
         update['$set'] = programUsersData;
 
         // add record to programUsers collection
@@ -1081,16 +1094,16 @@ module.exports = class ProgramsHelper {
               status: httpStatusCode.bad_request.status
           }
         }
-        console.log("kafka push status :",pushProgramUsersDetailsToKafka)
+
         let joinProgramDetails = joinProgram.toObject();
-
+        
         if ( pushProgramUsersDetailsToKafka ) {
           joinProgramDetails.programName = programData[0].name;
           joinProgramDetails.programExternalId = programData[0].externalId;
           joinProgramDetails.requestForPIIConsent = programData[0].requestForPIIConsent;
-
           //  push programUsers details to kafka
           await kafkaProducersHelper.pushProgramUsersToKafka(joinProgramDetails);
+
         }
 
         return resolve({

module/solutions/helper.js

@@ -2015,8 +2015,10 @@ module.exports = class SolutionsHelper {
         }
 
         //Check data present in programUsers collection.
-        //checkForUserJoinedProgram will check for data and if its present return true else false.
-        templateOrQuestionDetails.result.programJoined = await programUsersHelper.checkForUserJoinedProgram(solutionData.programId,userId);
+        //checkForUserJoinedProgramAndConsentShared will returns an object which contain joinProgram and consentShared status
+        let programJoinStatus = await programUsersHelper.checkForUserJoinedProgramAndConsentShared(solutionData.programId,userId);
+        templateOrQuestionDetails.result.programJoined = programJoinStatus.joinProgram;
+        templateOrQuestionDetails.result.consentShared = programJoinStatus.consentShared;
 
         return resolve(templateOrQuestionDetails);
 

module/users/helper.js

@@ -594,8 +594,10 @@ module.exports = class UsersHelper {
           result.requestForPIIConsent = programData[0].requestForPIIConsent;
         }
         //Check data present in programUsers collection.
-        //checkForUserJoinedProgram will check for data and if its present return true else false.
-        result.programJoined = await programUsersHelper.checkForUserJoinedProgram(programId,userId);
+        //checkForUserJoinedProgramAndConsentShared will returns an object which contain joinProgram and consentShared status.
+        let programJoinStatus = await programUsersHelper.checkForUserJoinedProgramAndConsentShared(programId,userId);
+        result.programJoined = programJoinStatus.joinProgram;
+        result.consentShared = programJoinStatus.consentShared;
 
         return resolve({
           message: constants.apiResponses.PROGRAM_SOLUTIONS_FETCHED,