Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/utils/controllerHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,7 @@ const executeQuery = async (req, res, collection, queryBuilder, dataProcessor =
const query = await queryBuilder(params);
const snapshot = await query.get();

let data = [];
snapshot.forEach(doc => {
data.push(doc.data());
});
let data = snapshot.docs.map(doc => doc.data());

// Process data if processor provided
if (dataProcessor) {
Expand Down
23 changes: 6 additions & 17 deletions src/utils/reportService.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ export const queryTechnologies = async (params = {}) => {
}

const snapshot = await query.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));
const data = snapshot.docs.map(doc => doc.data());

if (isOnlyNames) {
return data.map(item => item.technology);
Expand Down Expand Up @@ -102,8 +101,7 @@ export const queryCategories = async (params = {}) => {
}

const snapshot = await query.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));
const data = snapshot.docs.map(doc => doc.data());

if (isOnlyNames) {
return data.map(item => item.category);
Expand Down Expand Up @@ -149,10 +147,7 @@ export const queryReport = async (reportType, params = {}) => {
}

const snapshot = await query.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));

return data;
return snapshot.docs.map(doc => doc.data());
};

export const queryCWVDistribution = async ({ technology, date, geo = 'ALL', rank = null }) => {
Expand Down Expand Up @@ -275,9 +270,7 @@ export const queryRanks = async () => {
.orderBy('mobile_origins', 'desc')
.select('rank')
.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));
return data;
return snapshot.docs.map(doc => doc.data());
};

export const queryGeos = async () => {
Expand All @@ -286,9 +279,7 @@ export const queryGeos = async () => {
.orderBy('mobile_origins', 'desc')
.select('geo')
.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));
return data;
return snapshot.docs.map(doc => doc.data());
};

export const queryVersions = async (params = {}) => {
Expand Down Expand Up @@ -317,7 +308,5 @@ export const queryVersions = async (params = {}) => {
}

const snapshot = await query.get();
const data = [];
snapshot.forEach(doc => data.push(doc.data()));
return data;
return snapshot.docs.map(doc => doc.data());
};