getRecommendedLevel dont show a level they have played recently

sspenst · Sep 30, 2023 · fbc29b7 · fbc29b7
1 parent 959a72c
commit fbc29b7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/pages/api/home/index.ts b/pages/api/home/index.ts
@@ -12,6 +12,7 @@ import { getLatestReviews } from '../latest-reviews';
 import { getLevelOfDay } from '../level-of-day';
 import { getLastLevelPlayed } from '../play-attempt';
 import { doQuery } from '../search';
+import { getPlayAttempts } from '../user/play-history';
 
 async function getTopLevelsThisMonth(reqUser: User) {
   const query = {
@@ -60,15 +61,22 @@ async function getRecentAverageDifficulty(reqUser: User, numResults = 1) {
 
 async function getRecommendedLevel(reqUser: User) {
   const avgDifficulty = await getRecentAverageDifficulty(reqUser, 10);
+  const levelsPlayedHour = await getPlayAttempts(reqUser, {
+    // query where datetime is greater than 1 hour ago so we don't recommend levels they have recently tried
+    datetime: new Date(Date.now() - 1 * 60 * 60 * 1000)
+  });
+
+  const uniqueLevelIdsFromPastHour = new Set(levelsPlayedHour.map(playAttempt => playAttempt.levelId._id.toString()));
 
   const query = {
     disableCount: 'true',
+    excludeLevelIds: [...uniqueLevelIdsFromPastHour].join(','),
     minSteps: '7',
     maxSteps: '2500',
     minDifficulty: String(avgDifficulty * 0.9), // 10% below average of last 10
     minRating: '0.55',
     maxRating: '1',
-    numResults: '10', // randomly select one of these
+    numResults: '20', // randomly select one of these
     sortBy: 'calcDifficultyEstimate',
     sortDir: 'asc',
     statFilter: StatFilter.HideWon,
@@ -82,6 +90,7 @@ async function getRecommendedLevel(reqUser: User) {
     // try a broader query without min and max difficulty for those rare users that have beaten so many levels to not have any recommended one
     const query = {
       disableCount: 'true',
+      excludeLevelIds: [...uniqueLevelIdsFromPastHour].join(','),
       minSteps: '7',
       maxSteps: '2500',
       minRating: '0.55',

diff --git a/pages/api/search/index.ts b/pages/api/search/index.ts
@@ -154,6 +154,12 @@ export async function doQuery(query: SearchQuery, reqUser?: User | null, project
     }
   }
 
+  if (query.excludeLevelIds) {
+    const excludeLevelIds = query.excludeLevelIds.split(',');
+
+    searchObj['_id'] = { $nin: excludeLevelIds.map((id) => new Types.ObjectId(id)) };
+  }
+
   if (query.minSteps && query.maxSteps) {
     searchObj['leastMoves'] = {
       $gte: parseInt(query.minSteps),

diff --git a/pages/search/index.tsx b/pages/search/index.tsx
@@ -7,6 +7,7 @@ import StatFilter from '@root/constants/statFilter';
 import isPro from '@root/helpers/isPro';
 import classNames from 'classnames';
 import { debounce } from 'debounce';
+import { Types } from 'mongoose';
 import { GetServerSidePropsContext, NextApiRequest } from 'next';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -38,6 +39,7 @@ export interface SearchQuery extends ParsedUrlQuery {
   blockFilter?: string;
   difficultyFilter?: string;
   disableCount?: string;
+  excludeLevelIds?: string;
   maxDifficulty?: string;
   maxDimension1?: string;
   maxDimension2?: string;