Fix silly mapping bug.

AstroDogeDX · Aug 16, 2023 · 1e3f24b · 1e3f24b
1 parent ffbdb38
commit 1e3f24b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/server/api_cvr_ws.js b/server/api_cvr_ws.js
@@ -294,7 +294,8 @@ function ConnectWebsocket(username, accessKey) {
                 if (Object.values(RESPONSE_TYPE).includes(responseType)) {
                     const processedData = preProcessEntities(responseType, data);
                     EventEmitter.emit(responseType, processedData, message);
-                    log.debug(`[ConnectWebsocket] [onMessage] {${socket.uniqueId}} Type: ${GetResponseTypeName(responseType)} (${responseType}), Msg: ${message}`, data, processedData);
+                    const logObj = { 'API Original Data': data, 'CVRX Processed Data': processedData };
+                    log.debug(`[ConnectWebsocket] [onMessage] {${socket.uniqueId}} Type: ${GetResponseTypeName(responseType)} (${responseType}), Msg: ${message}`, logObj);
                 }
                 else {
                     log.warn(`[ConnectWebsocket] [onMessage] {${socket.uniqueId}} Response type ${responseType} is not mapped! Msg: ${message}`, data);

diff --git a/server/utils.js b/server/utils.js
@@ -41,7 +41,15 @@ exports.MapEntity = (entity, mapping) => {
             const ourKey = mapping[apiKey];
             // If the mapping is an object, it means it's a nested mapping
             if (typeof ourKey === 'object' && ourKey !== null) {
-                entityToMap[ourKey.root] = exports.MapEntity(entityToMap[apiKey], ourKey.mapping);
+                const entityValue = entityToMap[apiKey];
+                // If it's an object and not null or is an array, use the object/array mapping
+                if (typeof entityValue === 'object' && entityValue !== null || Array.isArray(entityValue)) {
+                    entityToMap[ourKey.root] = exports.MapEntity(entityValue, ourKey.mapping);
+                }
+                // If it's a primitive or null just set the value
+                else {
+                    entityToMap[ourKey.root] = entityValue;
+                }
             }
             // Otherwise let's just fix the key
             else {