Address merge conflicts

2026-10-14 16:40:30 +00:00 · 2024-04-04 10:01:19 -07:00
parent e1d9f779b2 b5af5646ee
commit 51819e57d1
227 changed files with 6225 additions and 1804 deletions
@@ -25,6 +25,11 @@ export const identityProjectDALFactory = (db: TDbClient) => {
          `${TableName.IdentityProjectMembershipRole}.customRoleId`,
          `${TableName.ProjectRoles}.id`
        )
+        .leftJoin(
+          TableName.IdentityProjectAdditionalPrivilege,
+          `${TableName.IdentityProjectMembership}.id`,
+          `${TableName.IdentityProjectAdditionalPrivilege}.projectMembershipId`
+        )
        .select(
          db.ref("id").withSchema(TableName.IdentityProjectMembership),
          db.ref("createdAt").withSchema(TableName.IdentityProjectMembership),