[NEW] Button to download admin server info

app/api/server/v1/stats.js

@@ -1,48 +1,30 @@
-import { Meteor } from 'meteor/meteor';
-
-import { hasPermission } from '../../../authorization';
-import { Statistics } from '../../../models';
 import { API } from '../api';
+import { getStatistics, getLastStatistics } from '../../../statistics/server';
 
 API.v1.addRoute('statistics', { authRequired: true }, {
 	get() {
-		let refresh = false;
-		if (typeof this.queryParams.refresh !== 'undefined' && this.queryParams.refresh === 'true') {
-			refresh = true;
-		}
-
-		let stats;
-		Meteor.runAsUser(this.userId, () => {
-			stats = Meteor.call('getStatistics', refresh);
-		});
-
-		return API.v1.success({
-			statistics: stats,
-		});
+		const { refresh } = this.requestParams();
+		return API.v1.success(Promise.await(getLastStatistics({
+			userId: this.userId,
+			refresh: refresh && refresh === 'true',
+		})));
 	},
 });
 
 API.v1.addRoute('statistics.list', { authRequired: true }, {
 	get() {
-		if (!hasPermission(this.userId, 'view-statistics')) {
-			return API.v1.unauthorized();
-		}
-
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		const statistics = Statistics.find(query, {
-			sort: sort || { name: 1 },
-			skip: offset,
-			limit: count,
-			fields,
-		}).fetch();
-
-		return API.v1.success({
-			statistics,
-			count: statistics.length,
-			offset,
-			total: Statistics.find(query).count(),
-		});
+		return API.v1.success(Promise.await(getStatistics({
+			userId: this.userId,
+			query,
+			pagination: {
+				offset,
+				count,
+				sort,
+				fields,
+			},
+		})));
 	},
 });

app/models/server/raw/Statistics.js

@@ -0,0 +1,14 @@
+import { BaseRaw } from './BaseRaw';
+
+export class StatisticsRaw extends BaseRaw {
+	async findLast() {
+		const options = {
+			sort: {
+				createdAt: -1,
+			},
+			limit: 1,
+		};
+		const records = await this.find({}, options).toArray();
+		return records && records[0];
+	}
+}

app/models/server/raw/index.js

@@ -44,6 +44,8 @@ import CustomUserStatusModel from '../models/CustomUserStatus';
 import { CustomUserStatusRaw } from './CustomUserStatus';
 import LivechatAgentActivityModel from '../models/LivechatAgentActivity';
 import { LivechatAgentActivityRaw } from './LivechatAgentActivity';
+import StatisticsModel from '../models/Statistics';
+import { StatisticsRaw } from './Statistics';
 
 export const Permissions = new PermissionsRaw(PermissionsModel.model.rawCollection());
 export const Roles = new RolesRaw(RolesModel.model.rawCollection());
@@ -68,3 +70,4 @@ export const OAuthApps = new OAuthAppsRaw(OAuthAppsModel.model.rawCollection());
 export const CustomSounds = new CustomSoundsRaw(CustomSoundsModel.model.rawCollection());
 export const CustomUserStatus = new CustomUserStatusRaw(CustomUserStatusModel.model.rawCollection());
 export const LivechatAgentActivity = new LivechatAgentActivityRaw(LivechatAgentActivityModel.model.rawCollection());
+export const Statistics = new StatisticsRaw(StatisticsModel.model.rawCollection());

app/statistics/server/functions/getLastStatistics.js

@@ -0,0 +1,14 @@
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { statistics } from '../lib/statistics';
+import { Statistics } from '../../../models/server/raw';
+
+export async function getLastStatistics({ userId, refresh }) {
+	if (!await hasPermissionAsync(userId, 'view-statistics')) {
+		throw new Error('error-not-allowed');
+	}
+
+	if (refresh) {
+		return statistics.save();
+	}
+	return Statistics.findLast();
+}

app/statistics/server/functions/getStatistics.js

@@ -0,0 +1,26 @@
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { Statistics } from '../../../models/server/raw';
+
+export async function getStatistics({ userId, query = {}, pagination: { offset, count, sort, fields } }) {
+	if (!await hasPermissionAsync(userId, 'view-statistics')) {
+		throw new Error('error-not-allowed');
+	}
+
+	const cursor = Statistics.find(query, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+		fields,
+	});
+
+	const total = await cursor.count();
+
+	const statistics = await cursor.toArray();
+
+	return {
+		statistics,
+		count: statistics.length,
+		offset,
+		total,
+	};
+}

app/statistics/server/index.js

@@ -1,6 +1,6 @@
-import './functions/get';
-import './functions/save';
 import './methods/getStatistics';
 import './startup/monitor';
 
-export { statistics } from './statisticsNamespace';
+export { statistics } from './lib/statistics';
+export { getLastStatistics } from './functions/getLastStatistics';
+export { getStatistics } from './functions/getStatistics';