Merge pull request #806 from Meshmulla/main

Refactor: Add Repository Methods and Remove Direct Access to SubscriptionIndexRepository.repo

Author: aji70

CHANGELOG.md

@@ -280,4 +280,4 @@
 
 ### Performance Improvements
 
-* Optimize creator profile page performance ([877e30f](https://github.com/MyFanss/MyFans/commit/877e30f6f87fcef42d889e4a79afba5a7aceba82)), closes [#415](https://github.com/MyFanss/MyFans/issues/415)
+* Optimize creator profile page performance ([877e30f](https://github.com/Meshmulla/MyFans/commit/877e30f6f87fcef42d889e4a79afba5a7aceba82)), closes [#415](https://github.com/Meshmulla/MyFans/issues/415)

backend/src/subscriptions/repositories/subscription-index.repository.ts

@@ -143,5 +143,29 @@ export class SubscriptionIndexRepository {
       order: { indexedAt: 'DESC' },
     });
   }
+
+  async findWithCursor(
+    fan: string,
+    status: SubscriptionStatus | undefined,
+    sort: string | undefined,
+    cursorId: string | undefined,
+    limit: number,
+  ): Promise<SubscriptionIndexEntity[]> {
+    const qb = this.repo
+      .createQueryBuilder('sub')
+      .where('sub.fan = :fan', { fan })
+      .orderBy(sort === 'created' ? 'sub.createdAt' : 'sub.expiryUnix', 'DESC')
+      .take(limit + 1);
+
+    if (status) {
+      qb.andWhere('sub.status = :status', { status });
+    }
+
+    if (cursorId) {
+      qb.andWhere('sub.id > :cursorId', { cursorId });
+    }
+
+    return qb.getMany();
+  }
 }
 

backend/src/subscriptions/subscriptions.service.spec.ts

@@ -106,6 +106,15 @@ describe('SubscriptionsService', () => {
         }
       }),
       findAllForReconciler: jest.fn(async () => currentSubs),
+      findWithCursor: jest.fn(async (fan, status, sort, cursorId, limit) => {
+        let filtered = currentSubs.filter(
+          (sub) => sub.fan === fan && (status ? sub.status === status : true),
+        );
+        if (cursorId) {
+          filtered = filtered.filter((sub) => sub.id > cursorId);
+        }
+        return filtered.slice(0, limit + 1);
+      }),
     } as unknown as jest.Mocked<SubscriptionIndexRepository>;
 
     const module: TestingModule = await Test.createTestingModule({
@@ -154,8 +163,38 @@ describe('SubscriptionsService', () => {
     );
 
     expect(result.data).toHaveLength(1);
-    expect(result.total).toBe(1);
-    expect(repo.findAndCountForFan).toHaveBeenCalled();
+    expect(repo.findWithCursor).toHaveBeenCalledWith(
+      'GFANADDRESS333333333333333333333333333333333333333333333333',
+      undefined,
+      undefined,
+      undefined,
+      20,
+    );
+  });
+
+  it('passes status and cursor to findWithCursor', async () => {
+    await service.addSubscription(
+      'GFANADDRESS666666666666666666666666666666666666666666666666',
+      'GAAAAAAAAAAAAAAA',
+      1,
+      Math.floor(Date.now() / 1000) + 60,
+    );
+
+    await service.listSubscriptions(
+      'GFANADDRESS666666666666666666666666666666666666666666666666',
+      SubscriptionStatus.ACTIVE,
+      'created',
+      'some-cursor',
+      10,
+    );
+
+    expect(repo.findWithCursor).toHaveBeenCalledWith(
+      'GFANADDRESS666666666666666666666666666666666666666666666666',
+      SubscriptionStatus.ACTIVE,
+      'created',
+      'some-cursor',
+      10,
+    );
   });
 
   it('publishes a renewal event when confirming an existing subscription', async () => {

backend/src/subscriptions/subscriptions.service.ts

@@ -398,26 +398,7 @@ export class SubscriptionsService {
     cursor?: string,
     limit: number = 20,
   ) {
-    const where: any = { fan };
-
-    if (status) {
-      where.status = status;
-    }
-
-    const queryBuilder = this.indexRepo.repo
-      .createQueryBuilder('sub')
-      .where('sub.fan = :fan', { fan })
-      .orderBy(sort === 'created' ? 'sub.createdAt' : 'sub.expiryUnix', 'DESC')
-      .take(limit + 1);
-
-    if (cursor) {
-      const cursorId = parseInt(cursor, 10);
-      if (!isNaN(cursorId)) {
-        queryBuilder.andWhere('sub.id > :cursorId', { cursorId });
-      }
-    }
-
-    const results = await queryBuilder.getMany();
+    const results = await this.indexRepo.findWithCursor(fan, status, sort, cursor, limit);
     const hasMore = results.length > limit;
     if (hasMore) {
       results.pop();