shikshalokam · aman-tunerlabs · Jun 8, 2021 · Jun 8, 2021 · Jun 8, 2021 · Jun 11, 2021
diff --git a/.env.sample b/.env.sample
@@ -41,3 +41,9 @@ ELASTICSEARCH_HOST_URL = "http://127.0.0.1:9200"
 ELASTICSEARCH_ENTITIES_INDEX = "entities"                                       // Elastic search index name for storing entities
 
 USER_SERVICE_URL = "http://user-service:3000"                                   // Base url of the sunbird enviornment
+
+# Replica set name required for mongodb replicaSets 
+REPLICA_SET_NAME = "rs0"
+
+# Replica set read preference
+REPLICA_SET_READ_PREFERENCE = "primary"
diff --git a/config/db/mongodb.js b/config/db/mongodb.js
@@ -26,24 +26,33 @@ var databaseConfiguration = function () {
   mongoose.set('useCreateIndex', true);
   mongoose.set('useFindAndModify', false);
   mongoose.set('useUnifiedTopology', true);
+
+  let options = {useNewUrlParser: true};
+
+  if (process.env.REPLICA_SET_NAME && process.env.REPLICA_SET_NAME !== "") {
+    options["replset"] = {rs_name: process.env.REPLICA_SET_NAME };
+
+    if (process.env.REPLICA_SET_READ_PREFERENCE && process.env.REPLICA_SET_READ_PREFERENCE !== "") {
+      options["replset"]["readPreference"] = process.env.readPreference;
+    }
+  }
 
   var db = mongoose.createConnection(
     process.env.MONGODB_URL,
-    {
-      useNewUrlParser: true
-    }
+    options
   );
 
   db.on("error", console.error.bind(console, "connection error:"));
   db.once("open", function () {
     console.log("Connected to database!");
   });
 
+  let schema = {};
   var createModel = function (opts) {
     if (typeof opts.schema.__proto__.instanceOfSchema === "undefined") {
-      var schema = mongoose.Schema(opts.schema, opts.options);
+      schema = mongoose.Schema(opts.schema, opts.options);
     } else {
-      var schema = opts.schema;
+      schema = opts.schema;
     }
 
     schema.plugin(mongooseTimeStamp, {
@@ -66,8 +75,7 @@ var databaseConfiguration = function () {
       }
     }
 
-    var model = db.model(opts.name, schema, opts.name);
-    return model;
+    return db.model(opts.name, schema, opts.name);
   };
 
   return {

diff --git a/controllers/v1/cloud-services/aws.js b/controllers/v1/cloud-services/aws.js
@@ -28,8 +28,6 @@ module.exports = class Aws {
      * @apiSuccess {String} result Data
      */
 
-    constructor() { }
-
     static get name() {
         return "aws";
     }

diff --git a/controllers/v1/cloud-services/azure.js b/controllers/v1/cloud-services/azure.js
@@ -28,8 +28,6 @@ module.exports = class Azure {
      * @apiSuccess {String} result Data
      */
 
-    constructor() { }
-
     static get name() {
         return "azure";
     }

diff --git a/controllers/v1/cloud-services/files.js b/controllers/v1/cloud-services/files.js
@@ -28,8 +28,6 @@ module.exports = class Files {
      * @apiSuccess {String} result Data
      */
 
-    constructor() { }
-
     static get name() {
         return "files";
     }

diff --git a/controllers/v1/cloud-services/gcp.js b/controllers/v1/cloud-services/gcp.js
@@ -28,8 +28,6 @@ module.exports = class Gcp {
      * @apiSuccess {String} result Data
      */
 
-    constructor() { }
-
     static get name() {
         return "gcp";
     }

diff --git a/generics/constants/api-responses.js b/generics/constants/api-responses.js
@@ -25,7 +25,6 @@ module.exports = {
   "QR_CODE_INCORRECT" : "Some code is incorrect",
   "QR_CODE_NOT_FOUND" : "No qr code found",
   "QR_CODE_FETCHED" : "Qr code information fetched successfully",
-  "QR_CODE_EXISTS" : "Qr code already exists",
   "QR_CODE_DATA_NOT_FOUND" : "Data for qr code not found",
   "SUNBIRD_SERVICE_DOWN" : "Could not connect to bodh service",
   "DIAL_CODE_NOT_PUBLISHED" : "Dial code is not published",
@@ -97,7 +96,6 @@ module.exports = {
   "SOLUTION_UPDATED" : "Solution updated successfully",
   "USER_ROLES_FETCHED" : "Successfully fetched user roles",
   "STATE_NOT_FOUND" : "State could not found",
-  "SUB_ENTITY_NOT_FOUND" : "Could not found sub entity",
   "USER_ROLES_NOT_FOUND" : "Could not found user roles",
   "ENTITIES_MAPPING_FORM_FETCHED" : "Entities mapping form fetched successfully",
   "USER_DATA_EXISTS" : "User data exists",
@@ -130,7 +128,6 @@ module.exports = {
   "ERROR_CREATING_PROGRAM" : "Error creating program",
   "PROGRAM_NOT_FOUND" : "Program not found" ,
   "PROGRAM_EXIST" : "Program exist",
-  "PROGRAM_DESCRIPTION" : "Program description",
   "USER_TARGETED_PROGRAMS_FETCHED" : "Users programs fetched successfully",
   "USER_TARGETED_SOLUTIONS_FETCHED" : "Users solutions fetched successfully",
   "ROLE_REQUIRED_IN_SCOPE" : "Required role in scope",

diff --git a/generics/constants/common.js b/generics/constants/common.js
@@ -20,7 +20,6 @@ module.exports = {
   "ALL_APP_VERSION" : "allAppVersion",
   "ACTIVE" : "active",
   "IN_ACTIVE" : "inactive",
-  "BODH_DIAL_CODE_LIVE_STATUS" : "Live",
   "GOA_STATE" : "Goa",
   "UNNATI_APP_NAME" : "unnati",
   "PROFILE_UPDATE_NOTIFICATION_MESSAGE":"Please update your details.Help us make your experience better.",

diff --git a/generics/helpers/elastic-search.js b/generics/helpers/elastic-search.js
@@ -743,10 +743,7 @@ var getLanguageData = function (languageId = "") {
 
       if (languageId == "") throw new Error("Invalid language id.");
 
-      const languageDocument = await getData(languageId, {
-        index: COMMON_LANGUAGE_INDEX,
-        type: COMMON_LANGUGAE_TYPE
-      });
+      const languageDocument = await getData(languageId);
 
       return resolve(languageDocument);
 

diff --git a/models/programs.js b/models/programs.js
@@ -15,7 +15,6 @@ module.exports = {
       createdFor: [String],
       imageCompression: {},
       components: ["json"],
-      components: ["json"],
       isAPrivateProgram : {
         default : false,
         type : Boolean

diff --git a/models/solutions.js b/models/solutions.js
@@ -35,11 +35,9 @@ module.exports = {
       registry: Array,
       frameworkId: "ObjectId",
       frameworkExternalId: String,
-      parentSolutionId: "ObjectId",
       noOfRatingLevels: Number,
       isRubricDriven: { type : Boolean, default: false },
       enableQuestionReadOut: { type : Boolean, default: false },
-      isReusable: Boolean,
       roles: Object,
       observationMetaFormKey: String,
       updatedBy: String,

diff --git a/module/entityTypes/helper.js b/module/entityTypes/helper.js
@@ -38,7 +38,7 @@ module.exports = class EntityTypesHelper {
                     });
                 }
 
-                if( skipFields !== "none" ) {
+                if( skipFields != "none" ) {
                   skipFields.forEach(field=>{
                     projection[field] = 0;
                   })

diff --git a/module/files/helper.js b/module/files/helper.js
@@ -171,7 +171,7 @@ module.exports = class FilesHelper {
 
         let cloudStorage = process.env.CLOUD_STORAGE
 
-        if (storageName !== '') {
+        if (storageName != '') {
           cloudStorage = storageName
         }
 

diff --git a/module/forms/helper.js b/module/forms/helper.js
@@ -24,7 +24,7 @@ module.exports = class FormHelper {
                     });
                 }
 
-                if( skipFields !== "none" ) {
+                if( skipFields != "none" ) {
                     skipFields.forEach(field=>{
                         projection[field] = 0;
                     })

diff --git a/module/programs/helper.js b/module/programs/helper.js
@@ -45,7 +45,7 @@ module.exports = class ProgramsHelper {
                 });
             }
 
-            if( skipFields !== "none" ) {
+            if( skipFields != "none" ) {
               skipFields.forEach(field=>{
                 projection[field] = 0;
               })

diff --git a/module/solutions/helper.js b/module/solutions/helper.js
@@ -48,7 +48,7 @@ module.exports = class SolutionsHelper {
                 });
             }
 
-            if( skipFields !== "none" ) {
+            if( skipFields != "none" ) {
               skipFields.forEach(field=>{
                 projection[field] = 0;
               })

diff --git a/module/static-links/helper.js b/module/static-links/helper.js
@@ -39,7 +39,7 @@ module.exports = class StaticLinksHelper {
                     });
                 }
 
-                if (skipFields !== "none") {
+                if (skipFields != "none") {
                     skipFields.forEach(field => {
                         projection[field] = 0;
                     })

diff --git a/module/user-profile/helper.js b/module/user-profile/helper.js
@@ -23,7 +23,7 @@ module.exports = class UserProfileHelper {
         return new Promise(async (resolve, reject) => {
             try {
 
-                if( queryParameter === "all" ) {
+                if( queryParameter == "all" ) {
                     queryParameter = {};
                 };
 

diff --git a/module/user-profile/validator/v1.js b/module/user-profile/validator/v1.js
@@ -3,8 +3,8 @@ module.exports = (req) => {
     let userProfileValidator = {
 
         getForm : function() {
-            req.checkHeaders('appname').exists().withMessage("required app name in headers"),
-            req.checkHeaders('os').exists().withMessage('required os in headers')
+            req.checkHeaders('appname').exists().withMessage("required app name in headers");
+            req.checkHeaders('os').exists().withMessage('required os in headers');
         },
         save: function () {
             req.checkBody('data').exists().withMessage("Required meta information data");

diff --git a/module/user-roles/helper.js b/module/user-roles/helper.js
@@ -40,7 +40,7 @@ module.exports = class UserRolesHelper {
                 });
             }
 
-            if( skipFields !== "none" ) {
+            if( skipFields != "none" ) {
               skipFields.forEach(field=>{
                 projection[field] = 0;
               })

diff --git a/routes/index.js b/routes/index.js
@@ -81,7 +81,6 @@ module.exports = function (app) {
             message: result.message,
             status: result.status ? result.status : httpStatusCode["ok"].status,
             result: result.data,
-            result: result.result,
             additionalDetails: result.additionalDetails,
             pagination: result.pagination,
             totalCount: result.totalCount,