From 05f433c05a8686f5fa76541c052722f4ecae989e Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <me@adhisimon.org>
Date: Thu, 5 Dec 2019 12:31:23 +0700
Subject: [PATCH] More simplification on smstatus/modems service
---
lib/apiserver/routers/smstools.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/apiserver/routers/smstools.js b/lib/apiserver/routers/smstools.js
index f20cbc1..2f05e97 100644
--- a/lib/apiserver/routers/smstools.js
+++ b/lib/apiserver/routers/smstools.js
@@ -36,17 +36,17 @@ async function pageModems(req, res) {
for (const [key, value] of Object.entries(smstoolsConfigData.modems || {})) {
const regularRunResultFile = config.smstools_regular_run_result_file || '/var/spool/sms/regular_run/<MODEMNAME>';
+ const data = JSON.parse(JSON.stringify(value || {}));
+
// eslint-disable-next-line no-await-in-loop
const { imsi, imei, cops } = (await modemInfo.get(key, regularRunResultFile)) || {};
+ data.imsi = imsi;
+ data.imei = imei;
+ data.cops = cops;
modems.push({
name: key,
- data: value,
- status: {
- imsi,
- imei,
- cops,
- },
+ data,
});
}
--
1.9.0