Feat/explore v2 (#185)

* feat(explore): check for tweets already in redis

* fix(explore): fill if user has no cats

Author: shady-2004

src/explore/explore.service.spec.ts

@@ -30,6 +30,17 @@ describe('ExploreService', () => {
         find: jest.fn(),
     };
 
+    const mock_category_query_builder = {
+        where: jest.fn().mockReturnThis(),
+        andWhere: jest.fn().mockReturnThis(),
+        orderBy: jest.fn().mockReturnThis(),
+        limit: jest.fn().mockReturnThis(),
+        getMany: jest.fn().mockResolvedValue([]),
+    };
+
+    // Ensure category repository supports createQueryBuilder in tests
+    mock_category_repository['createQueryBuilder'] = jest.fn(() => mock_category_query_builder);
+
     const mock_user_interests_repository = {
         createQueryBuilder: jest.fn(),
     };
@@ -414,12 +425,17 @@ describe('ExploreService', () => {
 
             mock_user_interests_repository.createQueryBuilder.mockReturnValue(mock_query_builder);
             mock_category_repository.find.mockResolvedValue(mock_default_cats);
+            // ensure createQueryBuilder fallback returns same defaults in case service uses it
+            mock_category_query_builder.getMany.mockResolvedValue(mock_default_cats);
             mock_redis_service.zrevrangeMultiple.mockResolvedValue(mock_tweet_ids);
             mock_tweets_service.getTweetsByIds.mockResolvedValue(mock_tweets);
 
             const result = await service.getForYouPosts('user-456');
 
-            expect(mock_category_repository.find).toHaveBeenCalled();
+            expect(
+                mock_category_repository.find.mock.calls.length > 0 ||
+                    mock_category_query_builder.getMany.mock.calls.length > 0
+            ).toBeTruthy();
             expect(result).toHaveLength(2);
         });
 
@@ -428,12 +444,17 @@ describe('ExploreService', () => {
             const mock_tweet_ids = [['tweet-1']];
 
             mock_category_repository.find.mockResolvedValue(mock_default_cats);
+            // ensure query builder fallback also returns defaults
+            mock_category_query_builder.getMany.mockResolvedValue(mock_default_cats);
             mock_redis_service.zrevrangeMultiple.mockResolvedValue(mock_tweet_ids);
             mock_tweets_service.getTweetsByIds.mockResolvedValue([{ tweet_id: 'tweet-1' }]);
 
             const result = await service.getForYouPosts();
 
-            expect(mock_category_repository.find).toHaveBeenCalled();
+            expect(
+                mock_category_repository.find.mock.calls.length > 0 ||
+                    mock_category_query_builder.getMany.mock.calls.length > 0
+            ).toBeTruthy();
         });
 
         it('should return empty array when no tweets found', async () => {

src/explore/explore.service.ts

@@ -21,7 +21,7 @@ export class ExploreService {
         private readonly who_to_follow_service: WhoToFollowService
     ) {}
 
-    private readonly DEFAULT_CATEGORIES = [21, 20, 3, 4, 5];
+    private readonly DEFAULT_CATEGORIES = [2, 3, 5, 4, 15];
 
     async getExploreData(current_user_id?: string) {
         // This method would fetch all explore data in one go
@@ -119,12 +119,23 @@ export class ExploreService {
         console.log('Time taken to fetch user interests:', time_after - time_before, 'ms');
 
         const categories = user_interests.map((interest) => interest.category);
-        if (categories.length === 0) {
-            // If no user interests, use default categories
-            const default_cats = await this.category_repository.find({
-                where: { id: In(this.DEFAULT_CATEGORIES) },
-            });
-            categories.push(...default_cats);
+
+        if (categories.length < 5) {
+            // Fill remaining slots with default categories
+            const existing_ids = categories.map((cat) => cat.id);
+            const needed = 5 - categories.length;
+            const qb = this.category_repository
+                .createQueryBuilder('c')
+                .where('c.id IN (:...ids)', { ids: this.DEFAULT_CATEGORIES })
+                .orderBy('c.id', 'ASC')
+                .limit(needed);
+
+            if (existing_ids.length > 0) {
+                qb.andWhere('c.id NOT IN (:...existing_ids)', { existing_ids });
+            }
+
+            const filler_cats = await qb.getMany();
+            categories.push(...filler_cats);
         }
         const keys = categories.map((cat) => `explore:category:${cat.id}`);
         const results = await this.redis_service.zrevrangeMultiple(keys, 0, 4);

src/tweets/tweets.repository.ts

@@ -56,8 +56,6 @@ export class TweetsRepository extends Repository<Tweet> {
 
         const tweets = await query.getMany();
 
-        console.log(tweets);
-
         return plainToInstance(TweetResponseDTO, tweets, {
             excludeExtraneousValues: true,
         });