From 93f27a7ee8e314c2aa133d254dd921c22f617404 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scott@Scotts-MacBook-Pro-2.local>
Date: Thu, 12 Sep 2024 16:19:22 -0700
Subject: [PATCH] improvement: make limit conditional

---
 .../src/services/identity-project/identity-project-dal.ts   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/services/identity-project/identity-project-dal.ts b/backend/src/services/identity-project/identity-project-dal.ts
index 3a73244a4..3e7ca7946 100644
--- a/backend/src/services/identity-project/identity-project-dal.ts
+++ b/backend/src/services/identity-project/identity-project-dal.ts
@@ -131,8 +131,6 @@ export const identityProjectDALFactory = (db: TDbClient) => {
           `${TableName.Identity}.id`
         )
         .where(`${TableName.IdentityProjectMembership}.projectId`, projectId)
-        .offset(filter.offset ?? 0)
-        .limit(filter.limit ?? 100)
         .orderBy(
           `${TableName.Identity}.${filter.orderBy ?? ProjectIdentityOrderBy.Name}`,
           filter.orderDirection ?? OrderByDirection.ASC
@@ -140,6 +138,10 @@ export const identityProjectDALFactory = (db: TDbClient) => {
         .select(selectAllTableCols(TableName.Identity))
         .as(TableName.Identity); // required for subqueries
 
+      if (filter.limit) {
+        void fetchIdentitySubquery.offset(filter.offset ?? 0).limit(filter.limit);
+      }
+
       const query = (tx || db.replicaNode())(TableName.IdentityProjectMembership)
         .where(`${TableName.IdentityProjectMembership}.projectId`, projectId)
         .join(TableName.Project, `${TableName.IdentityProjectMembership}.projectId`, `${TableName.Project}.id`)