feat: reptile feedback and resolved type failure

backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts

@@ -50,7 +50,6 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient) => {
       .select(tx.ref("approverGroupId").withSchema(TableName.AccessApprovalPolicyApprover))
       .select(tx.ref("sequence").withSchema(TableName.AccessApprovalPolicyApprover).as("approverSequence"))
       .select(tx.ref("approvalsRequired").withSchema(TableName.AccessApprovalPolicyApprover))
-      .select(tx.ref("approverGroupId").withSchema(TableName.AccessApprovalPolicyApprover))
       .select(tx.ref("bypasserUserId").withSchema(TableName.AccessApprovalPolicyBypasser))
       .select(tx.ref("bypasserGroupId").withSchema(TableName.AccessApprovalPolicyBypasser))
       .select(tx.ref("name").withSchema(TableName.Environment).as("envName"))

backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts

@@ -132,7 +132,7 @@ export const accessApprovalPolicyServiceFactory = ({
 
       approverUserIds = approverUserIds.concat(
         userApproverNames.map((el) => ({
-          id: approverUsersInDBGroupByUsername[el.username]?.[0].username,
+          id: approverUsersInDBGroupByUsername[el.username]?.[0].id,
           sequence: el.sequence
         }))
       );
@@ -427,7 +427,7 @@ export const accessApprovalPolicyServiceFactory = ({
 
           approverUserIds = approverUserIds.concat(
             userApproverNames.map((el) => ({
-              id: approverUsersInDBGroupByUsername[el.username]?.[0].username,
+              id: approverUsersInDBGroupByUsername[el.username]?.[0].id,
               sequence: el.sequence
             }))
           );

backend/src/ee/services/license/license-fns.ts

@@ -36,12 +36,12 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   oidcSSO: false,
   scim: false,
   ldap: false,
-  groups: true,
+  groups: false,
   status: null,
   trial_end: null,
   has_used_trial: true,
-  secretApproval: true,
-  secretRotation: true,
+  secretApproval: false,
+  secretRotation: false,
   caCrl: false,
   instanceUserManagement: false,
   externalKms: false,