Merge pull request #138 from letehaha/feat/extend-account-groups-endp…

…oint feat: Extend account groups retrieving endpoint
letehaha · Nov 15, 2024 · 4f807c4 · 4f807c4
2 parents c944f5c + ccd1c7e
commit 4f807c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/controllers/account-groups/get-groups.ts b/src/controllers/account-groups/get-groups.ts
@@ -8,9 +8,9 @@ import * as accountGroupService from '@services/account-groups';
 export const getAccountGroups = async (req, res: CustomResponse) => {
   try {
     const { id: userId } = req.user;
-    const { accountIds }: GetAccountGroupsParams['query'] = req.validated.query;
+    const { accountIds, hidden }: GetAccountGroupsParams['query'] = req.validated.query;
 
-    const groups = await accountGroupService.getAccountGroups({ userId, accountIds });
+    const groups = await accountGroupService.getAccountGroups({ userId, accountIds, hidden });
 
     return res.status(200).json({
       status: API_RESPONSE_STATUS.success,
@@ -22,7 +22,10 @@ export const getAccountGroups = async (req, res: CustomResponse) => {
 };
 
 export const getAccountGroupsSchema = z.object({
-  query: z.object({ accountIds: commaSeparatedRecordIds.optional() }),
+  query: z.object({
+    accountIds: commaSeparatedRecordIds.optional(),
+    hidden: z.coerce.boolean(),
+  }),
 });
 
 type GetAccountGroupsParams = z.infer<typeof getAccountGroupsSchema>;
diff --git a/src/services/account-groups/get-account-groups.ts b/src/services/account-groups/get-account-groups.ts
@@ -1,23 +1,35 @@
 import AccountGroup from '@models/accounts-groups/AccountGroups.model';
 import { withTransaction } from '../common';
-import { Op } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 import Accounts from '@models/Accounts.model';
 
 export const getAccountGroups = withTransaction(
   async ({
     userId,
     accountIds = [],
+    hidden = false,
   }: {
     userId: number;
     accountIds?: number[];
+    hidden?: boolean;
   }): Promise<AccountGroup[]> => {
+    const accountWhere: WhereOptions<Accounts> = {};
+
+    if (accountIds.length > 0) {
+      accountWhere.id = { [Op.in]: accountIds };
+    }
+
+    if (!hidden) {
+      accountWhere.isEnabled = true;
+    }
+
     return AccountGroup.findAll({
       where: { userId },
       include: [
         { model: AccountGroup, as: 'childGroups' },
         {
           model: Accounts,
-          where: accountIds.length > 0 ? { id: { [Op.in]: accountIds } } : undefined,
+          where: accountWhere,
           through: { attributes: [] },
           required: accountIds.length > 0,
         },