From a75fbc067f06fc09c919df5781b1c7a0c3f3a028 Mon Sep 17 00:00:00 2001
From: sairajzero <sairaj0630@gmail.com>
Date: Sun, 6 Feb 2022 01:34:09 +0530
Subject: [PATCH] Bug fix

---
 src/database.js | 2 +-
 src/main.js     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/database.js b/src/database.js
index 17ba48d..1a6603c 100644
--- a/src/database.js
+++ b/src/database.js
@@ -149,7 +149,7 @@ function Database(user, password, dbname, host = 'localhost') {
                 result.lastTx = Object.fromEntries(tmp.LastTxs.map(a => [a.ID, a.N]));
                 result.sn_config = Object.fromEntries(tmp.Configs.map(a => [a.NAME, a.VAL]));
                 result.appList = Object.fromEntries(tmp.Applications.map(a => [a.APP_NAME, a.ADMIN_ID]));
-                result.appSubAdmins = Object.fromEntries(tmp.Applications.map(a => [a.APP_NAME, a.SUB_ADMINS.split(",")]));
+                result.appSubAdmins = Object.fromEntries(tmp.Applications.map(a => [a.APP_NAME, a.SUB_ADMINS ? a.SUB_ADMINS.split(",") : []]));
                 result.supernodes = Object.fromEntries(tmp.SuperNodes.map(a => [a.FLO_ID, {
                     pubKey: a.PUB_KEY,
                     uri: a.URI
diff --git a/src/main.js b/src/main.js
index fef91f1..e9fd93a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -170,13 +170,13 @@ function readAppSubAdminListFromAPI(base) {
     for (let app in base.appList) {
         promises.push(new Promise((resolve, reject) => {
             floBlockchainAPI.readData(base.appList[app], {
-                ignoreOld: base.lastTx[`${app}_${base.appList[app]}`],
+                ignoreOld: base.lastTx[`${app}_${base.appList[app]}`] || 0,
                 sentOnly: true,
                 pattern: app
             }).then(result => {
                 let subAdmins = new Set(base.appSubAdmins[app]);
                 result.data.reverse().forEach(data => {
-                    let content = JSON.parse(result.data[i])[app];
+                    let content = JSON.parse(data)[app];
                     if (Array.isArray(content.removeSubAdmin))
                         content.removeSubAdmin.forEach(sa => subAdmins.delete(sa));
                     if (Array.isArray(content.addSubAdmin))
@@ -198,8 +198,8 @@ function readAppSubAdminListFromAPI(base) {
         Promise.allSettled(promises).then(results => {
             if (results.reduce((a, r) => r.status === "rejected" ? ++a : a, 0)) {
                 let error = Object.fromEntries(results.filter(r => r.status === "rejected").map(r => r.reason));
-                console.error(JSON.stringify(error));
-                reject(`subAdmin List for APPS(${Object.keys(error)} might not have loaded correctly`);
+                console.debug(error);
+                reject(`subAdmin List for APPS(${Object.keys(error)}) might not have loaded correctly`);
             } else
                 resolve("Loaded subAdmin List for all APPs successfully");
         });