From 404d3f172669452f497c679fb3c2fa28e3351df5 Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Tue, 30 May 2023 10:18:47 +0200 Subject: [PATCH] refactor(api): stop returning sessionMeta (#50482) --- api-server/src/server/boot/user.js | 7 +------ api-server/src/server/models/donation.js | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/api-server/src/server/boot/user.js b/api-server/src/server/boot/user.js index 45d5c90fe94..1cab0d5fc0e 100644 --- a/api-server/src/server/boot/user.js +++ b/api-server/src/server/boot/user.js @@ -92,7 +92,7 @@ function deleteUserTokenResponse(req, res) { } function createReadSessionUser(app) { - const { Donation, UserToken } = app.models; + const { UserToken } = app.models; return async function getSessionUser(req, res, next) { const queryUser = req.user; @@ -118,14 +118,12 @@ function createReadSessionUser(app) { try { const [ - activeDonations, completedChallenges, partiallyCompletedChallenges, progressTimestamps, savedChallenges ] = await Promise.all( [ - Donation.getCurrentActiveDonationCount$(), queryUser.getCompletedChallenges$(), queryUser.getPartiallyCompletedChallenges$(), queryUser.getPoints$(), @@ -154,9 +152,6 @@ function createReadSessionUser(app) { userToken: encodedUserToken } }, - sessionMeta: { - activeDonations - }, result: user.username }; return res.json(response); diff --git a/api-server/src/server/models/donation.js b/api-server/src/server/models/donation.js index ae9bd7f6081..6282c9a8772 100644 --- a/api-server/src/server/models/donation.js +++ b/api-server/src/server/models/donation.js @@ -68,10 +68,4 @@ export default function initializeDonation(Donation) { ); return null; } - - function getCurrentActiveDonationCount$() { - return Observable.of(activeDonationCountCache.get()); - } - - Donation.getCurrentActiveDonationCount$ = getCurrentActiveDonationCount$; }