Clean up repository statistics page

Author: UncleSamSwiss

express/backend/package-lock.json

@@ -18,10 +18,11 @@
 		"archiver": "^5.3.0",
 		"axios": "^0.22.0",
 		"cors": "^2.8.5",
-		"cron": "^1.8.2",
+		"cron": "^4.3.4",
 		"express": "^4.17.1",
 		"fs-extra": "^10.0.0",
 		"libsodium-wrappers": "^0.7.15",
+		"luxon": "~3.7.0",
 		"mkdirp": "^1.0.4",
 		"mongodb": "^4.1.3",
 		"node-cache": "^5.1.2",
@@ -38,6 +39,7 @@
 		"@types/express": "^4.17.13",
 		"@types/fs-extra": "^9.0.13",
 		"@types/libsodium-wrappers": "^0.7.14",
+		"@types/luxon": "^3.7.1",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mongodb": "^4.0.7",
 		"@types/node": "^16.10.3",

express/backend/package.json

@@ -88,10 +88,18 @@ router.get("/api/statistics", async function (req, res) {
 	const db = await dbConnect();
 	const repos = db.gitHubRepos();
 
+	const filters = Object.keys(req.query).filter(
+		(key) =>
+			key !== "stats" &&
+			typeof req.query[key] === "string" &&
+			availableFields.hasOwnProperty(key),
+	) as (keyof typeof availableFields)[];
+
 	const statsToInclude =
 		((req.query.stats as string)?.split(
 			",",
 		) as (keyof typeof availableFields)[]) ?? [];
+	statsToInclude.push(...filters);
 
 	const pipeline: Document[] = [
 		{
@@ -100,7 +108,7 @@ router.get("/api/statistics", async function (req, res) {
 			},
 		},
 	];
-	if (statsToInclude.includes("publishState")) {
+	if (statsToInclude.includes("publishState") || req.query.publishState) {
 		pipeline.push({
 			$lookup: {
 				as: "repo-adapters",
@@ -124,11 +132,25 @@ router.get("/api/statistics", async function (req, res) {
 		$project,
 	});
 
+	if (filters.length) {
+		const $match: Record<string, any> = {};
+		for (const field of filters) {
+			$match[field] = req.query[field];
+		}
+		pipeline.push({
+			$match,
+		});
+	}
+
 	const stream = repos.aggregate(pipeline).stream();
 
 	const stats = new Map<string, Map<string, number>>();
 	for await (const doc of stream) {
 		for (const [key, value] of Object.entries(doc)) {
+			if (req.query[key]) {
+				// skip stats that are used as filter
+				continue;
+			}
 			if (!stats.has(key)) {
 				stats.set(key, new Map<string, number>());
 			}