Use eager loading for all entity translations

modules/core/entity/product-option-group/product-option-group.entity.ts

@@ -16,7 +16,7 @@ export class ProductOptionGroup implements Translatable {
 
     @UpdateDateColumn() updatedAt: string;
 
-    @OneToMany(type => ProductOptionGroupTranslation, translation => translation.base)
+    @OneToMany(type => ProductOptionGroupTranslation, translation => translation.base, { eager: true })
     translations: Translation<ProductOptionGroup>[];
 
     @OneToMany(type => ProductOption, product => product)

modules/core/entity/product-option/product-option.entity.ts

@@ -23,7 +23,7 @@ export class ProductOption implements Translatable {
 
     @UpdateDateColumn() updatedAt: string;
 
-    @OneToMany(type => ProductOptionTranslation, translation => translation.base)
+    @OneToMany(type => ProductOptionTranslation, translation => translation.base, { eager: true })
     translations: Translation<ProductOption>[];
 
     @ManyToOne(type => ProductOptionGroup)

modules/core/entity/product-variant/product-variant.entity.ts

@@ -30,7 +30,7 @@ export class ProductVariant implements Translatable {
 
     @UpdateDateColumn() updatedAt: string;
 
-    @OneToMany(type => ProductVariantTranslationEntity, translation => translation.base)
+    @OneToMany(type => ProductVariantTranslationEntity, translation => translation.base, { eager: true })
     translations: Translation<ProductVariant>[];
 
     @ManyToOne(type => Product, product => product.variants)

modules/core/repository/product-repository.ts

@@ -13,7 +13,9 @@ export class ProductRepository extends AbstractRepository<Product> {
      * specified language.
      */
     find(languageCode: LanguageCode): Promise<Product[]> {
-        return this.getProductQueryBuilder(languageCode).getMany();
+        return this.manager.find(Product, {
+            relations: ['variants', 'optionGroups', 'variants.options'],
+        });
     }
 
     /**
@@ -21,9 +23,9 @@ export class ProductRepository extends AbstractRepository<Product> {
      * specified language.
      */
     findOne(id: number, languageCode: LanguageCode): Promise<Product | undefined> {
-        return this.getProductQueryBuilder(languageCode)
-            .andWhere('product.id = :id', { id })
-            .getOne();
+        return this.manager.findOne(Product, id, {
+            relations: ['variants', 'optionGroups', 'variants.options'],
+        });
     }
 
     /**
@@ -81,33 +83,4 @@ export class ProductRepository extends AbstractRepository<Product> {
 
         return this.manager.save(product);
     }
-
-    private getProductQueryBuilder(languageCode: LanguageCode): SelectQueryBuilder<Product> {
-        return this.manager
-            .createQueryBuilder(Product, 'product')
-            .leftJoinAndSelect('product.variants', 'variant')
-            .leftJoinAndSelect('product.optionGroups', 'option_group')
-            .leftJoinAndSelect(
-                'product.translations',
-                'product_translation',
-                // 'product_translation.languageCode = :code',
-            )
-            .leftJoinAndSelect(
-                'variant.translations',
-                'product_variant_translation',
-                // 'product_variant_translation.languageCode = :code',
-            )
-            .leftJoinAndSelect(
-                'option_group.translations',
-                'option_group_translation',
-                // 'option_group_translation.languageCode = :code',
-            )
-            .leftJoinAndSelect('variant.options', 'variant_options')
-            .leftJoinAndSelect(
-                'variant_options.translations',
-                'variant_options_translation',
-                // 'variant_options_translation.languageCode = :code',
-            )
-            .setParameters({ code: languageCode });
-    }
 }