issue-700-backend: refactoring of the code

models/logs.js

@@ -158,87 +158,82 @@ const fetchLastAddedCacheLog = async (id) => {
 };
 
 const fetchAllLogs = async (query) => {
- try {
- let { type, prev, next, page, size = SIZE, format } = query;
- size = parseInt(size);
- page = parseInt(page);
-
- try {
- let requestQuery = logsModel;
+ let { type, prev, next, page, size = SIZE, format } = query;
+ size = parseInt(size);
+ page = parseInt(page);
 
- if (type) {
- const logType = type.split(",");
- if (logType.length >= 1) requestQuery = requestQuery.where("type", "in", logType);
- }
+ try {
+ let requestQuery = logsModel;
 
- requestQuery = requestQuery.orderBy("timestamp", "desc");
- let requestQueryDoc = requestQuery;
+ if (type) {
+ const logType = type.split(",");
+ if (logType.length >= 1) requestQuery = requestQuery.where("type", "in", logType);
+ }
 
- if (prev) {
- requestQueryDoc = requestQueryDoc.limitToLast(size);
- } else {
- requestQueryDoc = requestQueryDoc.limit(size);
- }
+ requestQuery = requestQuery.orderBy("timestamp", "desc");
+ let requestQueryDoc = requestQuery;
 
- if (page) {
- const startAfter = (page - 1) * size;
- requestQueryDoc = requestQueryDoc.offset(startAfter);
- } else if (next) {
- const doc = await logsModel.doc(next).get();
- requestQueryDoc = requestQueryDoc.startAt(doc);
- } else if (prev) {
- const doc = await logsModel.doc(prev).get();
- requestQueryDoc = requestQueryDoc.endAt(doc);
- }
+ if (prev) {
+ requestQueryDoc = requestQueryDoc.limitToLast(size);
+ } else {
+ requestQueryDoc = requestQueryDoc.limit(size);
+ }
 
- const snapshot = await requestQueryDoc.get();
- let nextDoc, prevDoc;
- if (!snapshot.empty) {
- const first = snapshot.docs[0];
- prevDoc = await requestQuery.endBefore(first).limitToLast(1).get();
+ if (page) {
+ const startAfter = (page - 1) * size;
+ requestQueryDoc = requestQueryDoc.offset(startAfter);
+ } else if (next) {
+ const doc = await logsModel.doc(next).get();
+ requestQueryDoc = requestQueryDoc.startAt(doc);
+ } else if (prev) {
+ const doc = await logsModel.doc(prev).get();
+ requestQueryDoc = requestQueryDoc.endAt(doc);
+ }
 
- const last = snapshot.docs[snapshot.docs.length - 1];
- nextDoc = await requestQuery.startAfter(last).limit(1).get();
- }
- const allLogs = [];
- if (!snapshot.empty) {
- snapshot.forEach((doc) => {
- allLogs.push({ ...doc.data() });
- });
- }
- const userList = await getUsersListFromLogs(allLogs);
- const usersMap = mapify(userList, "id");
+ const snapshot = await requestQueryDoc.get();
+ let nextDoc, prevDoc;
+ if (!snapshot.empty) {
+ const first = snapshot.docs[0];
+ prevDoc = await requestQuery.endBefore(first).limitToLast(1).get();
 
- if (allLogs.length === 0) {
- return null;
- }
- if (format === "feed") {
- let logsData = [];
- logsData = allLogs.map((data) => {
- if (!Object.keys(formatLogsForFeed(data, usersMap)).length) return null;
- return { ...formatLogsForFeed(data, usersMap), type: data.type, timestamp: convertTimestamp(data.timestamp) };
- });
- return {
- allLogs: logsData.filter((log) => log),
- prev: prevDoc.empty ? null : prevDoc.docs[0].id,
- next: nextDoc.empty ? null : nextDoc.docs[0].id,
- page: page ? page + 1 : null,
- };
- }
+ const last = snapshot.docs[snapshot.docs.length - 1];
+ nextDoc = await requestQuery.startAfter(last).limit(1).get();
+ }
+ const allLogs = [];
+ if (!snapshot.empty) {
+ snapshot.forEach((doc) => {
+ allLogs.push({ ...doc.data() });
+ });
+ }
+ const userList = await getUsersListFromLogs(allLogs);
+ const usersMap = mapify(userList, "id");
 
+ if (allLogs.length === 0) {
+ return null;
+ }
+ if (format === "feed") {
+ let logsData = [];
+ logsData = allLogs.map((data) => {
+ if (!Object.keys(formatLogsForFeed(data, usersMap)).length) return null;
+ return { ...formatLogsForFeed(data, usersMap), type: data.type, timestamp: convertTimestamp(data.timestamp) };
+ });
  return {
- allLogs: allLogs.filter((log) => log),
+ allLogs: logsData.filter((log) => log),
  prev: prevDoc.empty ? null : prevDoc.docs[0].id,
  next: nextDoc.empty ? null : nextDoc.docs[0].id,
  page: page ? page + 1 : null,
  };
- } catch (error) {
- logger.error(ERROR_WHILE_FETCHING_LOGS, error);
- throw error;
  }
- } catch (err) {
- logger.error("Error in fetching all logs", err);
- throw err;
+
+ return {
+ allLogs: allLogs.filter((log) => log),
+ prev: prevDoc.empty ? null : prevDoc.docs[0].id,
+ next: nextDoc.empty ? null : nextDoc.docs[0].id,
+ page: page ? page + 1 : null,
+ };
+ } catch (error) {
+ logger.error(ERROR_WHILE_FETCHING_LOGS, error);
+ throw error;
  }
 };
 

utils/logs.js

@@ -4,13 +4,13 @@ const usersService = require("../services/dataAccessLayer");
 const { EXTENSION_REQUEST_STATUS } = require("../constants/extensionRequests");
 
 async function getUsersListFromLogs(allLogs) {
- const userIds = [];
+ const userIds = new Set();
  for (const log of allLogs) {
  if (!userIds.includes(log.meta.userId || log.meta.createdBy)) {
- userIds.push(log.meta.userId || log.meta.createdBy);
+ userIds.add(log.meta.userId || log.meta.createdBy);
  }
  }
- return await usersService.fetchUsersForKeyValues(admin.firestore.FieldPath.documentId(), userIds);
+ return await usersService.fetchUsersForKeyValues(admin.firestore.FieldPath.documentId(), Array.from(userIds));
 }
 
 function formatLogsForFeed(logs, usersMap) {
@@ -104,7 +104,12 @@ function formatProfileDiffLogs(logsSnapshot, usersMap, type) {
 }
 
 function mapify(array, key) {
- return array.map((o) => ({ key: o[key], val: o })).reduce((m, { key, val }) => Object.assign(m, { [key]: val }), {});
+ const mappifiedObj = {};
+ array.forEach((element) => {
+ // eslint-disable-next-line security/detect-object-injection
+ mappifiedObj[element[key]] = element;
+ });
+ return mappifiedObj;
 }
 
 function convertTimestamp(timestamp) {