@modular-rest/server 1.6.3 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-rest/server",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
   "main": "src/index.js",
   "scripts": {

package/src/helper/data_insertion.js

@@ -1,21 +1,31 @@
-const DataProvider = require('../services/data_provider/service');
+const DataProvider = require("../services/data_provider/service");
 
 function createPermissions() {
-  let model = DataProvider.getCollection('cms', 'permission');
-  
-  return new Promise(async (done, reject) => {
+  let model = DataProvider.getCollection("cms", "permission");
 
+  return new Promise(async (done, reject) => {
     // create customer permission
-    let isAnonymousExisted = await model.countDocuments({ title: 'anonymous' }).exec().catch(reject);
-    let isCoustomerExisted = await model.countDocuments({ title: 'customer' }).exec().catch(reject);
-    let isAdministratorExisted = await model.countDocuments({ title: 'administrator' }).exec().catch(reject);
+    let isAnonymousExisted = await model
+      .countDocuments({ title: "anonymous" })
+      .exec()
+      .catch(reject);
+    let isCoustomerExisted = await model
+      .countDocuments({ title: "customer" })
+      .exec()
+      .catch(reject);
+    let isAdministratorExisted = await model
+      .countDocuments({ title: "administrator" })
+      .exec()
+      .catch(reject);
 
     if (!isAnonymousExisted) {
       await new model({
         anonymous_access: true,
         isAnonymous: true,
-        title: 'anonymous',
-      }).save().catch(reject);
+        title: "anonymous",
+      })
+        .save()
+        .catch(reject);
     }
 
     if (!isCoustomerExisted) {
@@ -25,8 +35,10 @@ function createPermissions() {
         upload_file_access: true,
         remove_file_access: true,
         isDefault: true,
-        title: 'customer',
-      }).save().catch(reject);
+        title: "customer",
+      })
+        .save()
+        .catch(reject);
     }
 
     if (!isAdministratorExisted) {
@@ -36,50 +48,61 @@ function createPermissions() {
         anonymous_access: true,
         upload_file_access: true,
         remove_file_access: true,
-        title: 'administrator',
-      }).save().catch(reject);
+        title: "administrator",
+      })
+        .save()
+        .catch(reject);
     }
 
     done();
   });
-
 }
 
-function createAdminUser({ email, password }) {
-  let permissionModel = DataProvider.getCollection('cms', 'permission');
-  let authModel = DataProvider.getCollection('cms', 'auth');
+async function createAdminUser({ email, password }) {
+  let permissionModel = DataProvider.getCollection("cms", "permission");
+  let authModel = DataProvider.getCollection("cms", "auth");
 
-  return new Promise(async (done, reject) => {
-    let isAnonymousExisted = await authModel.countDocuments({ type: 'anonymous' }).exec().catch(reject);
-    let isAdministratorExisted = await authModel.countDocuments({ type: 'user', email: email }).exec().catch(reject);
+  try {
+    let isAnonymousExisted = await authModel
+      .countDocuments({ type: "anonymous" })
+      .exec();
 
-    let anonymousPermission = await permissionModel.findOne({ title: 'anonymous' }).exec().catch(reject);
-    let administratorPermission = await permissionModel.findOne({ title: 'administrator' }).exec().catch(reject);
+    let isAdministratorExisted = await authModel
+      .countDocuments({ type: "user", email: email })
+      .exec();
 
-    if (!isAnonymousExisted) {
+    let anonymousPermission = await permissionModel
+      .findOne({ title: "anonymous" })
+      .exec();
+
+    let administratorPermission = await permissionModel
+      .findOne({ title: "administrator" })
+      .exec();
+
+    if (isAnonymousExisted == 0) {
       await new authModel({
         permission: anonymousPermission._id,
-        email: '',
-        phone: '',
-        password: '',
-        type: 'anonymous',
-      }).save().catch(reject);
+        email: "",
+        phone: "",
+        password: "",
+        type: "anonymous",
+      }).save();
     }
 
-    if (!isAdministratorExisted) {
+    if (isAdministratorExisted == 0) {
       await new authModel({
         permission: administratorPermission._id,
         email: email,
         password: password,
-        type: 'user'
-      }).save().catch(reject);
+        type: "user",
+      }).save();
     }
-
-    done();
-  });
+  } catch (e) {
+    return Promise.reject(e);
+  }
 }
 
 module.exports = {
   createPermissions,
   createAdminUser,
-};
+};

package/src/helper/presetup_services.js

@@ -22,8 +22,19 @@ module.exports.setup = async ({ keypair, adminUser, uploadDirectory }) => {
    * Insert permissions and admin user
    * for the first time
    */
-  await DataInsertion.createPermissions();
-  await DataInsertion.createAdminUser(adminUser);
+  await DataInsertion.createPermissions().catch((err) => {
+    console.log(
+      "Error while creating permissions, it seems data is already inserted.",
+      err
+    );
+  });
+
+  await DataInsertion.createAdminUser(adminUser).catch((err) => {
+    console.log(
+      "Error while creating admin user, it seems data is already inserted.",
+      err
+    );
+  });
 
   /**
    * File Service