refactor(core): Add property resolver for Product.optionGroups

packages/core/e2e/__snapshots__/import.e2e-spec.ts.snap

@@ -350,16 +350,16 @@ Array [
     "id": "T_4",
     "name": "Artists Smock",
     "optionGroups": Array [
-      Object {
-        "code": "artists-smock-colour",
-        "id": "T_4",
-        "name": "colour",
-      },
       Object {
         "code": "artists-smock-size",
         "id": "T_3",
         "name": "size",
       },
+      Object {
+        "code": "artists-smock-colour",
+        "id": "T_4",
+        "name": "colour",
+      },
     ],
     "slug": "artists-smock",
     "variants": Array [

packages/core/src/api/resolvers/entity/product-entity.resolver.ts

@@ -2,9 +2,11 @@ import { Parent, ResolveProperty, Resolver } from '@nestjs/graphql';
 
 import { Translated } from '../../../common/types/locale-types';
 import { Collection } from '../../../entity/collection/collection.entity';
+import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
 import { Product } from '../../../entity/product/product.entity';
 import { CollectionService } from '../../../service/services/collection.service';
+import { ProductOptionGroupService } from '../../../service/services/product-option-group.service';
 import { ProductVariantService } from '../../../service/services/product-variant.service';
 import { ApiType } from '../../common/get-api-type';
 import { RequestContext } from '../../common/request-context';
@@ -16,6 +18,7 @@ export class ProductEntityResolver {
     constructor(
         private productVariantService: ProductVariantService,
         private collectionService: CollectionService,
+        private productOptionGroupService: ProductOptionGroupService,
     ) {}
 
     @ResolveProperty()
@@ -36,4 +39,12 @@ export class ProductEntityResolver {
     ): Promise<Array<Translated<Collection>>> {
         return this.collectionService.getCollectionsByProductId(ctx, product.id, apiType === 'shop');
     }
+
+    @ResolveProperty()
+    async optionGroups(
+        @Ctx() ctx: RequestContext,
+        @Parent() product: Product,
+    ): Promise<Array<Translated<ProductOptionGroup>>> {
+        return this.productOptionGroupService.getOptionGroupsByProductId(ctx, product.id);
+    }
 }

packages/core/src/service/services/product-option-group.service.ts

@@ -41,6 +41,20 @@ export class ProductOptionGroupService {
             .then(group => group && translateDeep(group, ctx.languageCode, ['options']));
     }
 
+    getOptionGroupsByProductId(ctx: RequestContext, id: ID): Promise<Array<Translated<ProductOptionGroup>>> {
+        return this.connection.manager
+            .find(ProductOptionGroup, {
+                relations: ['options'],
+                where: {
+                    product: { id },
+                },
+                order: {
+                    id: 'ASC',
+                },
+            })
+            .then(groups => groups.map(group => translateDeep(group, ctx.languageCode, ['options'])));
+    }
+
     async create(ctx: RequestContext, input: CreateProductOptionGroupInput): Promise<Translated<ProductOptionGroup>> {
         const group = await this.translatableSaver.create({
             input,

packages/core/src/service/services/product.service.ts

@@ -37,7 +37,6 @@ export class ProductService {
     private readonly relations = [
         'featuredAsset',
         'assets',
-        'optionGroups',
         'channels',
         'facetValues',
         'facetValues.facet',
@@ -70,7 +69,6 @@ export class ProductService {
             .then(async ([products, totalItems]) => {
                 const items = products.map(product =>
                     translateDeep(product, ctx.languageCode, [
-                        'optionGroups',
                         'facetValues',
                         ['facetValues', 'facet'],
                     ]),
@@ -93,7 +91,6 @@ export class ProductService {
             return;
         }
         return translateDeep(product, ctx.languageCode, [
-            'optionGroups',
             'facetValues',
             ['facetValues', 'facet'],
         ]);