@unchainedshop/api 4.0.0-rc.12 → 4.0.0-rc.13

package/src/mcp/tools/users/handlers/getUserReviews.ts

@@ -0,0 +1,22 @@
+import { Context } from '../../../../context.js';
+import { getNormalizedProductDetails } from '../../../utils/getNormalizedProductDetails.js';
+import { Params } from '../schemas.js';
+
+export default async function getUserReviews(context: Context, params: Params<'GET_REVIEWS'>) {
+  const { modules } = context;
+  const { userId, sort, limit = 10, offset = 0 } = params;
+
+  const reviews = await modules.products.reviews.findProductReviews({
+    authorId: userId,
+    offset,
+    limit,
+    sort,
+  } as any);
+  const normalizedReviews = await Promise.all(
+    reviews.map(async ({ productId, ...review }) => ({
+      ...(await getNormalizedProductDetails(productId, context)),
+      ...review,
+    })),
+  );
+  return { reviews: normalizedReviews };
+}

package/src/mcp/tools/users/handlers/getUserReviewsCount.ts

@@ -0,0 +1,15 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function getUserReviewsCount(
+  context: Context,
+  params: Params<'GET_REVIEWS_COUNT'>,
+) {
+  const { modules } = context;
+  const { userId } = params;
+  const count = await modules.products.reviews.count({
+    authorId: userId,
+  });
+
+  return { count };
+}

package/src/mcp/tools/users/handlers/index.ts

@@ -0,0 +1,49 @@
+import listUsers from './listUsers.js';
+import countUsers from './countUsers.js';
+import getUser from './getUser.js';
+import createUser from './createUser.js';
+import updateUser from './updateUser.js';
+import removeUser from './removeUser.js';
+import enrollUser from './enrollUser.js';
+import setUserTags from './setUserTags.js';
+import setUserUsername from './setUserUsername.js';
+import addUserEmail from './addUserEmail.js';
+import removeUserEmail from './removeUserEmail.js';
+import sendEnrollmentEmail from './sendEnrollmentEmail.js';
+import sendVerificationEmail from './sendVerificationEmail.js';
+import removeProductReviews from './removeProductReviews.js';
+import getUserOrders from './getUserOrders.js';
+import getUserEnrollments from './getUserEnrollments.js';
+import getUserQuotations from './getUserQuotations.js';
+import getUserBookmarks from './getUserBookmarks.js';
+import getUserPaymentCredentials from './getUserPaymentCredentials.js';
+import getUserAvatar from './getUserAvatar.js';
+import getUserReviews from './getUserReviews.js';
+import getUserReviewsCount from './getUserReviewsCount.js';
+import getCurrentUser from './getCurrentUser.js';
+
+export default {
+  LIST: listUsers,
+  COUNT: countUsers,
+  GET: getUser,
+  CREATE: createUser,
+  UPDATE: updateUser,
+  REMOVE: removeUser,
+  ENROLL: enrollUser,
+  SET_TAGS: setUserTags,
+  SET_USERNAME: setUserUsername,
+  ADD_EMAIL: addUserEmail,
+  REMOVE_EMAIL: removeUserEmail,
+  SEND_ENROLLMENT_EMAIL: sendEnrollmentEmail,
+  SEND_VERIFICATION_EMAIL: sendVerificationEmail,
+  REMOVE_PRODUCT_REVIEWS: removeProductReviews,
+  GET_ORDERS: getUserOrders,
+  GET_ENROLLMENTS: getUserEnrollments,
+  GET_QUOTATIONS: getUserQuotations,
+  GET_BOOKMARKS: getUserBookmarks,
+  GET_PAYMENT_CREDENTIALS: getUserPaymentCredentials,
+  GET_AVATAR: getUserAvatar,
+  GET_REVIEWS: getUserReviews,
+  GET_REVIEWS_COUNT: getUserReviewsCount,
+  GET_CURRENT_USER: getCurrentUser,
+};

package/src/mcp/tools/users/handlers/listUsers.ts

@@ -0,0 +1,29 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+import { getNormalizedUserDetails } from '../../../utils/getNormalizedUserDetails.js';
+
+export default async function listUsers(context: Context, params: Params<'LIST'>) {
+  const { modules } = context;
+  const {
+    limit = 20,
+    offset = 0,
+    includeGuests = false,
+    queryString,
+    sort,
+    emailVerified,
+    lastLogin,
+  } = params;
+
+  const users = await modules.users.findUsers({
+    includeGuests,
+    queryString,
+    emailVerified,
+    lastLogin,
+    limit,
+    offset,
+    sort,
+  } as any);
+  return {
+    users: await Promise.all(users.map(async ({ _id }) => getNormalizedUserDetails(_id, context))),
+  };
+}

package/src/mcp/tools/users/handlers/removeProductReviews.ts

@@ -0,0 +1,12 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function removeProductReviews(
+  context: Context,
+  params: Params<'REMOVE_PRODUCT_REVIEWS'>,
+) {
+  const { modules } = context;
+  const { userId } = params;
+  await modules.products.reviews.deleteMany({ authorId: userId });
+  return { success: true };
+}

package/src/mcp/tools/users/handlers/removeUser.ts

@@ -0,0 +1,17 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function removeUser(context: Context, params: Params<'REMOVE'>) {
+  const { modules } = context;
+  const { userId, removeUserReviews } = params;
+
+  if (!userId) {
+    throw new Error('userId is required');
+  }
+  if (removeUserReviews) {
+    await modules.products.reviews.deleteMany({ authorId: userId });
+  }
+  await modules.users.markDeleted(userId);
+  await modules.users.findUserById(userId);
+  return { success: true };
+}

package/src/mcp/tools/users/handlers/removeUserEmail.ts

@@ -0,0 +1,11 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function removeUserEmail(context: Context, params: Params<'REMOVE_EMAIL'>) {
+  const { modules } = context;
+  const { userId, email } = params;
+
+  await modules.users.removeEmail(userId, email);
+  await modules.users.findUserById(userId);
+  return { success: true };
+}

package/src/mcp/tools/users/handlers/sendEnrollmentEmail.ts

@@ -0,0 +1,15 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function sendEnrollmentEmail(
+  context: Context,
+  params: Params<'SEND_ENROLLMENT_EMAIL'>,
+) {
+  const { modules } = context;
+  const { email } = params;
+  const user = await modules.users.findUserByEmail(email);
+  if (user) {
+    await modules.users.sendResetPasswordEmail(user._id, email, true);
+  }
+  return { success: !!user };
+}

package/src/mcp/tools/users/handlers/sendVerificationEmail.ts

@@ -0,0 +1,19 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+
+export default async function sendVerificationEmail(
+  context: Context,
+  params: Params<'SEND_VERIFICATION_EMAIL'>,
+) {
+  const { modules } = context;
+  const { email } = params;
+  const targetEmail = email || context.user?.emails?.[0]?.address;
+  if (!targetEmail) {
+    throw new Error('No email provided or user has no email');
+  }
+  const user = await modules.users.findUserByEmail(targetEmail);
+  if (user) {
+    await modules.users.sendVerificationEmail(user._id, targetEmail);
+  }
+  return { success: !!user };
+}

package/src/mcp/tools/users/handlers/setUserTags.ts

@@ -0,0 +1,11 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+import { getNormalizedUserDetails } from '../../../utils/getNormalizedUserDetails.js';
+
+export default async function setUserTags(context: Context, params: Params<'SET_TAGS'>) {
+  const { modules } = context;
+  const { userId, tags } = params;
+
+  await modules.users.updateTags(userId, tags);
+  return { user: await getNormalizedUserDetails(userId, context) };
+}

package/src/mcp/tools/users/handlers/setUserUsername.ts

@@ -0,0 +1,11 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+import { getNormalizedUserDetails } from '../../../utils/getNormalizedUserDetails.js';
+
+export default async function setUserUsername(context: Context, params: Params<'SET_USERNAME'>) {
+  const { modules } = context;
+  const { userId, username } = params;
+
+  await modules.users.setUsername(userId, username);
+  return { user: await getNormalizedUserDetails(userId, context) };
+}

package/src/mcp/tools/users/handlers/updateUser.ts

@@ -0,0 +1,11 @@
+import { Context } from '../../../../context.js';
+import { Params } from '../schemas.js';
+import { getNormalizedUserDetails } from '../../../utils/getNormalizedUserDetails.js';
+
+export default async function updateUser(context: Context, params: Params<'UPDATE'>) {
+  const { modules } = context;
+  const { userId, profile, meta } = params;
+
+  await modules.users.updateProfile(userId, { profile, meta } as any);
+  return { user: await getNormalizedUserDetails(userId, context) };
+}

package/src/mcp/tools/users/index.ts

@@ -0,0 +1,12 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { Context } from '../../../context.js';
+import { usersManagement, UsersManagementSchema } from './usersManagement.js';
+
+export const registerUsersTools = (server: McpServer, context: Context) => {
+  server.tool(
+    'users_management',
+    'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.',
+    UsersManagementSchema,
+    async (params) => usersManagement(context, params),
+  );
+};

package/src/mcp/tools/users/schemas.ts

@@ -0,0 +1,280 @@
+import { z } from 'zod';
+import {
+  PaginationSchema,
+  SortingSchema,
+  SearchSchema,
+  DateRangeSchema,
+} from '../../utils/sharedSchemas.js';
+
+export const UserProfileSchema = z.object({
+  displayName: z.string().optional().describe("User's display name shown in the interface"),
+  birthday: z.string().optional().describe("User's birthday in ISO date format (YYYY-MM-DD)"),
+  phoneMobile: z.string().optional().describe("User's mobile phone number"),
+  address: z
+    .object({
+      firstName: z.string().optional().describe('First name for billing/shipping address'),
+      lastName: z.string().optional().describe('Last name for billing/shipping address'),
+      addressLine: z.string().optional().describe('Primary address line (street address)'),
+      addressLine2: z.string().optional().describe('Secondary address line (apartment, suite, etc.)'),
+      postalCode: z.string().optional().describe('Postal/ZIP code'),
+      city: z.string().optional().describe('City name'),
+      regionCode: z.string().optional().describe('Region/state code (e.g. "CA", "TX")'),
+      countryCode: z.string().optional().describe('ISO country code (e.g. "US", "DE", "CH")'),
+    })
+    .optional()
+    .describe("User's address information for billing and shipping"),
+});
+
+export const actionValidators = {
+  LIST: z.object({
+    ...PaginationSchema,
+    ...SortingSchema,
+    ...SearchSchema,
+    includeGuests: z.boolean().optional().describe('Include guest users in results'),
+    emailVerified: z.boolean().optional().describe('Filter by email verification status'),
+    lastLogin: z
+      .object({
+        start: z.string().optional(),
+        end: z.string().optional(),
+      })
+      .optional()
+      .describe('Filter by last login date range'),
+  }),
+
+  COUNT: z.object({
+    ...SearchSchema,
+    includeGuests: z.boolean().optional().describe('Include guest users in count'),
+    emailVerified: z.boolean().optional().describe('Filter by email verification status'),
+    lastLogin: z
+      .object({
+        start: z.string().optional(),
+        end: z.string().optional(),
+      })
+      .optional()
+      .describe('Filter by last login date range'),
+  }),
+
+  GET: z.object({
+    userId: z.string().describe('User ID to retrieve'),
+  }),
+
+  CREATE: z.object({
+    username: z.string().optional().describe('Username for the new user'),
+    email: z.string().optional().describe('Email address for the new user'),
+    password: z.string().optional().describe('Password for the new user'),
+    profile: UserProfileSchema.optional().describe('User profile information'),
+  }),
+
+  UPDATE: z.object({
+    userId: z.string().describe('User ID to update'),
+    profile: UserProfileSchema.optional().describe('Profile updates'),
+    meta: z.any().optional().describe('Additional metadata'),
+  }),
+
+  REMOVE: z.object({
+    userId: z.string().describe('User ID to remove'),
+    removeUserReviews: z.boolean().optional().default(false).describe('Also remove user reviews'),
+  }),
+
+  ENROLL: z.object({
+    email: z.string().describe('Email address for enrollment'),
+    profile: UserProfileSchema.describe('Profile information for new user'),
+    password: z
+      .string()
+      .optional()
+      .describe('Optional password (if not provided, enrollment email sent)'),
+  }),
+
+  SET_TAGS: z.object({
+    userId: z.string().describe('User ID to update'),
+    tags: z.array(z.string()).describe('Array of tags to assign'),
+  }),
+
+  SET_USERNAME: z.object({
+    userId: z.string().describe('User ID to update'),
+    username: z.string().describe('New username to set'),
+  }),
+
+  ADD_EMAIL: z.object({
+    userId: z.string().optional().describe('User ID (optional, defaults to current user)'),
+    email: z.string().describe('Email address to add'),
+  }),
+
+  REMOVE_EMAIL: z.object({
+    userId: z.string().optional().describe('User ID (optional, defaults to current user)'),
+    email: z.string().describe('Email address to remove'),
+  }),
+
+  SEND_ENROLLMENT_EMAIL: z.object({
+    email: z.string().describe('Email address to send enrollment to'),
+  }),
+
+  SEND_VERIFICATION_EMAIL: z.object({
+    email: z.string().optional().describe('Email address to verify (optional)'),
+  }),
+
+  REMOVE_PRODUCT_REVIEWS: z.object({
+    userId: z.string().describe('User ID whose reviews to remove'),
+  }),
+
+  GET_ORDERS: z.object({
+    userId: z.string().describe('User ID to get orders for'),
+    ...PaginationSchema,
+    ...SortingSchema,
+    ...SearchSchema,
+    includeCarts: z.boolean().optional().default(false).describe('Include cart orders'),
+    status: z.array(z.string()).optional().describe('Filter by order status'),
+  }),
+
+  GET_ENROLLMENTS: z.object({
+    userId: z.string().describe('User ID to get enrollments for'),
+    ...PaginationSchema,
+    ...SortingSchema,
+    ...SearchSchema,
+    status: z.array(z.string()).optional().describe('Filter by enrollment status'),
+  }),
+
+  GET_QUOTATIONS: z.object({
+    userId: z.string().describe('User ID to get quotations for'),
+    ...PaginationSchema,
+    ...SortingSchema,
+    ...SearchSchema,
+  }),
+
+  GET_BOOKMARKS: z.object({
+    userId: z.string().describe('User ID to get bookmarks for'),
+  }),
+  GET_CURRENT_USER: z.object({}),
+
+  GET_PAYMENT_CREDENTIALS: z.object({
+    userId: z.string().describe('User ID to get payment credentials for'),
+  }),
+
+  GET_AVATAR: z.object({
+    userId: z.string().describe('User ID to get avatar for'),
+  }),
+
+  GET_REVIEWS: z.object({
+    userId: z.string().describe('User ID to get reviews for'),
+    ...PaginationSchema,
+    ...SortingSchema,
+  }),
+
+  GET_REVIEWS_COUNT: z.object({
+    userId: z.string().describe('User ID to count reviews for'),
+  }),
+} as const;
+
+export const UsersManagementSchema = {
+  action: z
+    .enum([
+      'LIST',
+      'COUNT',
+      'GET',
+      'CREATE',
+      'UPDATE',
+      'REMOVE',
+      'ENROLL',
+      'SET_TAGS',
+      'SET_USERNAME',
+      'ADD_EMAIL',
+      'REMOVE_EMAIL',
+      'SEND_ENROLLMENT_EMAIL',
+      'SEND_VERIFICATION_EMAIL',
+      'REMOVE_PRODUCT_REVIEWS',
+      'GET_ORDERS',
+      'GET_ENROLLMENTS',
+      'GET_QUOTATIONS',
+      'GET_BOOKMARKS',
+      'GET_PAYMENT_CREDENTIALS',
+      'GET_AVATAR',
+      'GET_REVIEWS',
+      'GET_REVIEWS_COUNT',
+      'GET_CURRENT_USER',
+    ])
+    .describe(
+      'User management action to perform. LIST: list users with filters and pagination. COUNT: count users matching criteria. GET: retrieve single user by ID. CREATE: create new user account. UPDATE: update user profile/metadata. REMOVE: mark user as deleted. ENROLL: create user and send enrollment email. SET_TAGS: assign tags to user. SET_USERNAME: set user username. ADD_EMAIL/REMOVE_EMAIL: manage user email addresses. SEND_ENROLLMENT_EMAIL/SEND_VERIFICATION_EMAIL: trigger email workflows. REMOVE_PRODUCT_REVIEWS: delete all reviews by user. GET_ORDERS/GET_ENROLLMENTS/GET_QUOTATIONS/GET_BOOKMARKS/GET_PAYMENT_CREDENTIALS/GET_AVATAR/GET_REVIEWS/GET_REVIEWS_COUNT/GET_CURRENT_USER: retrieve user-related data with optional filtering and pagination.',
+    ),
+  userId: z
+    .string()
+    .optional()
+    .describe(
+      'Required for: GET, UPDATE, REMOVE, SET_TAGS, SET_USERNAME, GET_ORDERS, GET_ENROLLMENTS, GET_QUOTATIONS, GET_BOOKMARKS, GET_PAYMENT_CREDENTIALS, GET_AVATAR, GET_REVIEWS, GET_REVIEWS_COUNT, REMOVE_PRODUCT_REVIEWS. Optional for: ADD_EMAIL, REMOVE_EMAIL (defaults to current user if not provided)',
+    ),
+
+  username: z
+    .string()
+    .optional()
+    .describe(
+      'Used for: CREATE (optional username for new user), SET_USERNAME (new username to assign)',
+    ),
+  email: z
+    .string()
+    .optional()
+    .describe(
+      'Used for: CREATE (optional email for new user), ENROLL (required email for enrollment), ADD_EMAIL/REMOVE_EMAIL (email address to add/remove), SEND_ENROLLMENT_EMAIL/SEND_VERIFICATION_EMAIL (target email address)',
+    ),
+  password: z
+    .string()
+    .optional()
+    .describe(
+      'Used for: CREATE (optional password for new user), ENROLL (optional password - if not provided, enrollment email is sent)',
+    ),
+  profile: UserProfileSchema.optional().describe(
+    'Used for: CREATE (optional profile data for new user), UPDATE (profile updates to apply), ENROLL (required profile data for new user including displayName, birthday, phoneMobile, address)',
+  ),
+  // meta: z.any().optional().describe('Used for: UPDATE (additional metadata to store with user profile)'),
+  tags: z
+    .array(z.string())
+    .optional()
+    .describe('Used for: SET_TAGS (array of tag names to assign to user for categorization/filtering)'),
+  removeUserReviews: z
+    .boolean()
+    .optional()
+    .describe(
+      'Used for: REMOVE (if true, also delete all product reviews authored by the user when removing the user account)',
+    ),
+  ...PaginationSchema,
+  ...SortingSchema,
+  ...SearchSchema,
+  ...DateRangeSchema,
+  includeGuests: z
+    .boolean()
+    .optional()
+    .describe(
+      'Used for: LIST, COUNT (if true, include guest/anonymous users in results, default: false)',
+    ),
+  emailVerified: z
+    .boolean()
+    .optional()
+    .describe(
+      'Used for: LIST, COUNT (filter users by email verification status - true: only verified emails, false: only unverified emails, undefined: all users)',
+    ),
+  lastLogin: z
+    .object({
+      start: z.string().optional().describe('ISO date string for earliest last login date'),
+      end: z.string().optional().describe('ISO date string for latest last login date'),
+    })
+    .optional()
+    .describe('Used for: LIST, COUNT (filter users by their last login date range)'),
+
+  includeCarts: z
+    .boolean()
+    .optional()
+    .describe(
+      'Used for: GET_ORDERS (if true, include cart/open orders in results along with completed orders, default: false)',
+    ),
+  status: z
+    .array(z.string())
+    .optional()
+    .describe(
+      'Used for: GET_ORDERS (filter by order status like ["PENDING", "CONFIRMED"]), GET_ENROLLMENTS (filter by enrollment status like ["ACTIVE", "PAUSED"])',
+    ),
+};
+
+export const UsersManagementZodSchema = z.object(UsersManagementSchema);
+export type UsersManagementParams = z.infer<typeof UsersManagementZodSchema>;
+
+export type ActionName = keyof typeof actionValidators;
+export type Params<T extends ActionName> = z.infer<(typeof actionValidators)[T]>;
+export type Handler<T extends ActionName> = (usersModule: any, params: Params<T>) => Promise<unknown>;

package/src/mcp/tools/users/usersManagement.ts

@@ -0,0 +1,34 @@
+import { Context } from '../../../context.js';
+import { log } from '@unchainedshop/logger';
+import {
+  actionValidators,
+  UsersManagementSchema,
+  UsersManagementZodSchema,
+  UsersManagementParams,
+  ActionName,
+} from './schemas.js';
+import actionHandlers from './handlers/index.js';
+import { createMcpResponse, createMcpErrorResponse } from '../../utils/sharedSchemas.js';
+
+export { UsersManagementSchema, UsersManagementZodSchema, UsersManagementParams };
+
+export async function usersManagement(context: Context, params: UsersManagementParams) {
+  const { action, ...actionParams } = params;
+  log('MCP handler usersManagement ', { userId: context.userId, params });
+
+  try {
+    if (!(action in actionHandlers)) {
+      throw new Error(`Unknown action: ${action}`);
+    }
+
+    const parsedParams = actionValidators[action as ActionName].parse(actionParams);
+    const data = await actionHandlers[action as ActionName](context, parsedParams as never);
+
+    return createMcpResponse({
+      action,
+      data,
+    });
+  } catch (error) {
+    return createMcpErrorResponse(action, error);
+  }
+}

package/src/mcp/utils/getNormalizedAssortmentDetails.ts

@@ -1,4 +1,6 @@
 import { Context } from '../../context.js';
+import { getNormalizedFilterDetails } from './getNormalizedFilterDetails.js';
+import { getNormalizedProductDetails } from './getNormalizedProductDetails.js';
 import normalizeMediaUrl from './normalizeMediaUrl.js';
 
 export async function getNormalizedAssortmentDetails(
@@ -15,6 +17,17 @@ export async function getNormalizedAssortmentDetails(
     locale,
   });
 
+  const assortmentFilters = await modules.assortments.filters.findFilters(
+    { assortmentId: assortment._id },
+    { sort: { sortKey: 1 } },
+  );
+  const filters_normalized = await Promise.all(
+    assortmentFilters?.map(async ({ filterId, ...rest }) => ({
+      ...(await getNormalizedFilterDetails(filterId, context)),
+      ...rest,
+    })) || [],
+  );
+
   const assortmentMedias = await modules.assortments.media.findAssortmentMedias({
     assortmentId: normalizedAssortmentId,
   });
@@ -22,6 +35,28 @@ export async function getNormalizedAssortmentDetails(
     parentAssortmentId: assortment._id,
   });
 
+  const assortmentLinks = await loaders.assortmentLinksLoader.load({
+    assortmentId: assortment._id,
+  });
+  const links = await Promise.all(
+    assortmentLinks
+      .filter((a) => a.childAssortmentId !== assortment._id)
+      ?.map(async (link) => ({
+        ...(await getNormalizedAssortmentDetails({ assortmentId: link?.childAssortmentId }, context)),
+        ...link,
+      })) || [],
+  );
+  const assortmentProducts = await modules.assortments.products.findAssortmentProducts(
+    { assortmentId: assortment._id },
+    { sort: { sortKey: 1 } },
+  );
+
+  const products = await Promise.all(
+    assortmentProducts?.map(async ({ productId, ...rest }) => ({
+      ...(await getNormalizedProductDetails(productId, context)),
+      ...rest,
+    })) || [],
+  );
   const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
 
   const childrenCount = await modules.assortments.count({
@@ -36,5 +71,8 @@ export async function getNormalizedAssortmentDetails(
     texts,
     media,
     childrenCount,
+    filters: filters_normalized,
+    links,
+    products,
   };
 }