@vendure/core 2.0.0-next.9 → 2.0.0

package/dist/service/services/tax-rate.service.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaxRateService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
-const cache_1 = require("../../cache");
+const request_context_1 = require("../../api/common/request-context");
 const errors_1 = require("../../common/error/errors");
+const self_refreshing_cache_1 = require("../../common/self-refreshing-cache");
 const utils_1 = require("../../common/utils");
+const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const customer_group_entity_1 = require("../../entity/customer-group/customer-group.entity");
 const tax_category_entity_1 = require("../../entity/tax-category/tax-category.entity");
@@ -25,7 +27,6 @@ const tax_rate_event_1 = require("../../event-bus/events/tax-rate-event");
 const tax_rate_modification_event_1 = require("../../event-bus/events/tax-rate-modification-event");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
-const activeTaxRatesKey = 'active-tax-rates';
 /**
  * @description
  * Contains methods relating to {@link TaxRate} entities.
@@ -33,11 +34,11 @@ const activeTaxRatesKey = 'active-tax-rates';
  * @docsCategory services
  */
 let TaxRateService = class TaxRateService {
-    constructor(connection, eventBus, listQueryBuilder, cacheService) {
+    constructor(connection, eventBus, listQueryBuilder, configService) {
         this.connection = connection;
         this.eventBus = eventBus;
         this.listQueryBuilder = listQueryBuilder;
-        this.cacheService = cacheService;
+        this.configService = configService;
         this.defaultTaxRate = new tax_rate_entity_1.TaxRate({
             value: 0,
             enabled: true,
@@ -45,6 +46,13 @@ let TaxRateService = class TaxRateService {
             id: '0',
         });
     }
+    /**
+     * When the app is bootstrapped, ensure the tax rate cache gets created
+     * @internal
+     */
+    async initTaxRates() {
+        await this.ensureCacheExists();
+    }
     findAll(ctx, options, relations) {
         return this.listQueryBuilder
             .build(tax_rate_entity_1.TaxRate, options, { relations: relations !== null && relations !== void 0 ? relations : ['category', 'zone', 'customerGroup'], ctx })
@@ -55,9 +63,13 @@ let TaxRateService = class TaxRateService {
         }));
     }
     findOne(ctx, taxRateId, relations) {
-        return this.connection.getRepository(ctx, tax_rate_entity_1.TaxRate).findOne(taxRateId, {
+        return this.connection
+            .getRepository(ctx, tax_rate_entity_1.TaxRate)
+            .findOne({
+            where: { id: taxRateId },
             relations: relations !== null && relations !== void 0 ? relations : ['category', 'zone', 'customerGroup'],
-        });
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     async create(ctx, input) {
         const taxRate = new tax_rate_entity_1.TaxRate(input);
@@ -98,9 +110,10 @@ let TaxRateService = class TaxRateService {
     }
     async delete(ctx, id) {
         const taxRate = await this.connection.getEntityOrThrow(ctx, tax_rate_entity_1.TaxRate, id);
+        const deletedTaxRate = new tax_rate_entity_1.TaxRate(taxRate);
         try {
             await this.connection.getRepository(ctx, tax_rate_entity_1.TaxRate).remove(taxRate);
-            this.eventBus.publish(new tax_rate_event_1.TaxRateEvent(ctx, taxRate, 'deleted', id));
+            this.eventBus.publish(new tax_rate_event_1.TaxRateEvent(ctx, deletedTaxRate, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
             };
@@ -122,10 +135,10 @@ let TaxRateService = class TaxRateService {
         return rate || this.defaultTaxRate;
     }
     async getActiveTaxRates(ctx) {
-        return this.cacheService.get(ctx, activeTaxRatesKey, () => this.findActiveTaxRates(ctx));
+        return this.activeTaxRates.value(ctx);
     }
     async updateActiveTaxRates(ctx) {
-        this.cacheService.set(ctx, activeTaxRatesKey, await this.findActiveTaxRates(ctx));
+        await this.activeTaxRates.refresh(ctx);
     }
     async findActiveTaxRates(ctx) {
         return await this.connection.getRepository(ctx, tax_rate_entity_1.TaxRate).find({
@@ -135,13 +148,26 @@ let TaxRateService = class TaxRateService {
             },
         });
     }
+    /**
+     * Ensures taxRate cache exists. If not, this method creates one.
+     */
+    async ensureCacheExists() {
+        if (this.activeTaxRates) {
+            return;
+        }
+        this.activeTaxRates = await (0, self_refreshing_cache_1.createSelfRefreshingCache)({
+            name: 'TaxRateService.activeTaxRates',
+            ttl: this.configService.entityOptions.taxRateCacheTtl,
+            refresh: { fn: ctx => this.findActiveTaxRates(ctx), defaultArgs: [request_context_1.RequestContext.empty()] },
+        });
+    }
 };
 TaxRateService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         event_bus_1.EventBus,
         list_query_builder_1.ListQueryBuilder,
-        cache_1.RequestContextCacheService])
+        config_service_1.ConfigService])
 ], TaxRateService);
 exports.TaxRateService = TaxRateService;
 //# sourceMappingURL=tax-rate.service.js.map

package/dist/service/services/tax-rate.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tax-rate.service.js","sourceRoot":"","sources":["../../../src/service/services/tax-rate.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tax-rate.service.js","sourceRoot":"","sources":["../../../src/service/services/tax-rate.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/user.service.d.ts

@@ -23,7 +23,7 @@ export declare class UserService {
     private verificationTokenGenerator;
     constructor(connection: TransactionalConnection, configService: ConfigService, roleService: RoleService, passwordCipher: PasswordCipher, verificationTokenGenerator: VerificationTokenGenerator);
     getUserById(ctx: RequestContext, userId: ID): Promise<User | undefined>;
-    getUserByEmailAddress(ctx: RequestContext, emailAddress: string): Promise<User | undefined>;
+    getUserByEmailAddress(ctx: RequestContext, emailAddress: string, userType?: 'administrator' | 'customer'): Promise<User | undefined>;
     /**
      * @description
      * Creates a new User with the special `customer` Role and using the {@link NativeAuthenticationStrategy}.
@@ -95,6 +95,6 @@ export declare class UserService {
      * @description
      * Updates the password for a User with the {@link NativeAuthenticationMethod}.
      */
-    updatePassword(ctx: RequestContext, userId: ID, currentPassword: string, newPassword: string): Promise<boolean | InvalidCredentialsError>;
+    updatePassword(ctx: RequestContext, userId: ID, currentPassword: string, newPassword: string): Promise<boolean | InvalidCredentialsError | PasswordValidationError>;
     private validatePassword;
 }

package/dist/service/services/user.service.js

@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
 const error_result_1 = require("../../common/error/error-result");
 const errors_1 = require("../../common/error/errors");
 const generated_graphql_shop_errors_1 = require("../../common/error/generated-graphql-shop-errors");
+const index_1 = require("../../common/index");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
@@ -36,18 +37,36 @@ let UserService = class UserService {
         this.verificationTokenGenerator = verificationTokenGenerator;
     }
     async getUserById(ctx, userId) {
-        return this.connection.getRepository(ctx, user_entity_1.User).findOne(userId, {
-            relations: ['roles', 'roles.channels', 'authenticationMethods'],
-        });
-    }
-    async getUserByEmailAddress(ctx, emailAddress) {
-        return this.connection.getRepository(ctx, user_entity_1.User).findOne({
-            where: {
-                identifier: emailAddress,
-                deletedAt: null,
+        return this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .findOne({
+            where: { id: userId },
+            relations: {
+                roles: {
+                    channels: true,
+                },
+                authenticationMethods: true,
             },
-            relations: ['roles', 'roles.channels', 'authenticationMethods'],
-        });
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
+    }
+    async getUserByEmailAddress(ctx, emailAddress, userType) {
+        var _a;
+        const entity = userType !== null && userType !== void 0 ? userType : (ctx.apiType === 'admin' ? 'administrator' : 'customer');
+        const table = `${(_a = this.configService.dbConnectionOptions.entityPrefix) !== null && _a !== void 0 ? _a : ''}${entity}`;
+        return this.connection
+            .getRepository(ctx, user_entity_1.User)
+            .createQueryBuilder('user')
+            .innerJoin(table, table, `${table}.userId = user.id`)
+            .leftJoinAndSelect('user.roles', 'roles')
+            .leftJoinAndSelect('roles.channels', 'channels')
+            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethods')
+            .where('LOWER(user.identifier) = :identifier', {
+            identifier: (0, index_1.normalizeEmailAddress)(emailAddress),
+        })
+            .andWhere('user.deletedAt IS NULL')
+            .getOne()
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
@@ -55,8 +74,8 @@ let UserService = class UserService {
      */
     async createCustomerUser(ctx, identifier, password) {
         const user = new user_entity_1.User();
-        user.identifier = identifier;
-        const customerRole = await this.roleService.getCustomerRole();
+        user.identifier = (0, index_1.normalizeEmailAddress)(identifier);
+        const customerRole = await this.roleService.getCustomerRole(ctx);
         user.roles = [customerRole];
         const addNativeAuthResult = await this.addNativeAuthenticationMethod(ctx, user, identifier, password);
         if ((0, error_result_1.isGraphQlErrorResult)(addNativeAuthResult)) {
@@ -98,7 +117,7 @@ let UserService = class UserService {
         else {
             authenticationMethod.passwordHash = '';
         }
-        authenticationMethod.identifier = identifier;
+        authenticationMethod.identifier = (0, index_1.normalizeEmailAddress)(identifier);
         authenticationMethod.user = user;
         await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(authenticationMethod);
         user.authenticationMethods = [...((_a = user.authenticationMethods) !== null && _a !== void 0 ? _a : []), authenticationMethod];
@@ -110,13 +129,13 @@ let UserService = class UserService {
      */
     async createAdminUser(ctx, identifier, password) {
         const user = new user_entity_1.User({
-            identifier,
+            identifier: (0, index_1.normalizeEmailAddress)(identifier),
             verified: true,
         });
         const authenticationMethod = await this.connection
             .getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod)
             .save(new native_authentication_method_entity_1.NativeAuthenticationMethod({
-            identifier,
+            identifier: (0, index_1.normalizeEmailAddress)(identifier),
             passwordHash: await this.passwordCipher.hash(password),
         }));
         user.authenticationMethods = [authenticationMethod];
@@ -149,8 +168,9 @@ let UserService = class UserService {
         const user = await this.connection
             .getRepository(ctx, user_entity_1.User)
             .createQueryBuilder('user')
-            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
-            .addSelect('authenticationMethod.passwordHash')
+            .leftJoinAndSelect('user.authenticationMethods', 'aums')
+            .leftJoin('user.authenticationMethods', 'authenticationMethod')
+            .addSelect('aums.passwordHash')
             .where('authenticationMethod.verificationToken = :verificationToken', { verificationToken })
             .getOne();
         if (user) {
@@ -194,7 +214,10 @@ let UserService = class UserService {
         if (!user) {
             return;
         }
-        const nativeAuthMethod = user.getNativeAuthenticationMethod();
+        const nativeAuthMethod = user.getNativeAuthenticationMethod(false);
+        if (!nativeAuthMethod) {
+            return undefined;
+        }
         nativeAuthMethod.passwordResetToken = this.verificationTokenGenerator.generateVerificationToken();
         await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
         return user;
@@ -210,7 +233,8 @@ let UserService = class UserService {
         const user = await this.connection
             .getRepository(ctx, user_entity_1.User)
             .createQueryBuilder('user')
-            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
+            .leftJoinAndSelect('user.authenticationMethods', 'aums')
+            .leftJoin('user.authenticationMethods', 'authenticationMethod')
             .where('authenticationMethod.passwordResetToken = :passwordResetToken', { passwordResetToken })
             .getOne();
         if (!user) {
@@ -225,6 +249,14 @@ let UserService = class UserService {
             nativeAuthMethod.passwordHash = await this.passwordCipher.hash(password);
             nativeAuthMethod.passwordResetToken = null;
             await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
+            if (user.verified === false && this.configService.authOptions.requireVerification) {
+                // This code path represents an edge-case in which the Customer creates an account,
+                // but prior to verifying their email address, they start the password reset flow.
+                // Since the password reset flow makes the exact same guarantee as the email verification
+                // flow (i.e. the person controls the specified email account), we can also consider it
+                // a verification.
+                user.verified = true;
+            }
             return this.connection.getRepository(ctx, user_entity_1.User).save(user);
         }
         else {
@@ -276,7 +308,8 @@ let UserService = class UserService {
         const user = await this.connection
             .getRepository(ctx, user_entity_1.User)
             .createQueryBuilder('user')
-            .leftJoinAndSelect('user.authenticationMethods', 'authenticationMethod')
+            .leftJoinAndSelect('user.authenticationMethods', 'aums')
+            .leftJoin('user.authenticationMethods', 'authenticationMethod')
             .where('authenticationMethod.identifierChangeToken = :identifierChangeToken', {
             identifierChangeToken: token,
         })
@@ -318,6 +351,11 @@ let UserService = class UserService {
         if (!user) {
             throw new errors_1.EntityNotFoundError('User', userId);
         }
+        const password = newPassword;
+        const passwordValidationResult = await this.validatePassword(ctx, password);
+        if (passwordValidationResult !== true) {
+            return passwordValidationResult;
+        }
         const nativeAuthMethod = user.getNativeAuthenticationMethod();
         const matches = await this.passwordCipher.check(currentPassword, nativeAuthMethod.passwordHash);
         if (!matches) {

package/dist/service/services/user.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/service/services/user.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/service/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAK5C,kEAAyF;AACzF,sDAAqF;AACrF,oGAW0D;AAC1D,8CAA2D;AAC3D,gEAA4D;AAC5D,wFAAoF;AACpF,gIAAoH;AACpH,+DAAqD;AACrD,gFAA4E;AAC5E,uHAAkH;AAElH,iDAA6C;AAE7C;;;;;GAKG;AAEI,IAAM,WAAW,GAAjB,MAAM,WAAW;IACpB,YACY,UAAmC,EACnC,aAA4B,EAC5B,WAAwB,EACxB,cAA8B,EAC9B,0BAAsD;QAJtD,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,+BAA0B,GAA1B,0BAA0B,CAA4B;IAC/D,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,GAAmB,EAAE,MAAU;QAC7C,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,OAAO,CAAC;YACL,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,SAAS,EAAE;gBACP,KAAK,EAAE;oBACH,QAAQ,EAAE,IAAI;iBACjB;gBACD,qBAAqB,EAAE,IAAI;aAC9B;SACJ,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,GAAmB,EACnB,YAAoB,EACpB,QAAuC;;QAEvC,MAAM,MAAM,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACpF,MAAM,KAAK,GAAG,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,YAAY,mCAAI,EAAE,GAAG,MAAM,EAAE,CAAC;QAEtF,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,mBAAmB,CAAC;aACpD,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC;aACxC,iBAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC;aAC/C,iBAAiB,CAAC,4BAA4B,EAAE,uBAAuB,CAAC;aACxE,KAAK,CAAC,sCAAsC,EAAE;YAC3C,UAAU,EAAE,IAAA,6BAAqB,EAAC,YAAY,CAAC;SAClD,CAAC;aACD,QAAQ,CAAC,wBAAwB,CAAC;aAClC,MAAM,EAAE;aACR,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CACpB,GAAmB,EACnB,UAAkB,EAClB,QAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,kBAAI,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,IAAA,6BAAqB,EAAC,UAAU,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtG,IAAI,IAAA,mCAAoB,EAAC,mBAAmB,CAAC,EAAE;YAC3C,OAAO,mBAAmB,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,6BAA6B,CAC/B,GAAmB,EACnB,IAAU,EACV,UAAkB,EAClB,QAAiB;;QAEjB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5E,IAAI,SAAS,EAAE;YACX,IACI,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAClC,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,EACH;gBACE,4EAA4E;gBAC5E,OAAO,IAAI,CAAC;aACf;SACJ;QACD,MAAM,oBAAoB,GAAG,IAAI,gEAA0B,EAAE,CAAC;QAC9D,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,mBAAmB,EAAE;YACpD,oBAAoB,CAAC,iBAAiB;gBAClC,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;YAChE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;SACzB;aAAM;YACH,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;QACD,IAAI,QAAQ,EAAE;YACV,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;gBACnC,OAAO,wBAAwB,CAAC;aACnC;YACD,oBAAoB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChF;aAAM;YACH,oBAAoB,CAAC,YAAY,GAAG,EAAE,CAAC;SAC1C;QACD,oBAAoB,CAAC,UAAU,GAAG,IAAA,6BAAqB,EAAC,UAAU,CAAC,CAAC;QACpE,oBAAoB,CAAC,IAAI,GAAG,IAAI,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChG,IAAI,CAAC,qBAAqB,GAAG,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,qBAAqB,mCAAI,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe,CAAC,GAAmB,EAAE,UAAkB,EAAE,QAAgB;QAC3E,MAAM,IAAI,GAAG,IAAI,kBAAI,CAAC;YAClB,UAAU,EAAE,IAAA,6BAAqB,EAAC,UAAU,CAAC;YAC7C,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7C,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CACD,IAAI,gEAA0B,CAAC;YAC3B,UAAU,EAAE,IAAA,6BAAqB,EAAC,UAAU,CAAC;YAC7C,YAAY,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;SACzD,CAAC,CACL,CAAC;QACN,IAAI,CAAC,qBAAqB,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,MAAU;QAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAI,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,IAAU;QACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QACjG,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,iBAAiB,CACnB,GAAmB,EACnB,iBAAyB,EACzB,QAAiB;QAEjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,MAAM,CAAC;aACvD,QAAQ,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aAC9D,SAAS,CAAC,mBAAmB,CAAC;aAC9B,KAAK,CAAC,6DAA6D,EAAE,EAAE,iBAAiB,EAAE,CAAC;aAC3F,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,EAAE;gBAC5E,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBAC9D,IAAI,CAAC,QAAQ,EAAE;oBACX,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;wBAChC,OAAO,IAAI,oDAAoB,EAAE,CAAC;qBACrC;iBACJ;qBAAM;oBACH,IAAI,CAAC,CAAC,gBAAgB,CAAC,YAAY,EAAE;wBACjC,OAAO,IAAI,uDAAuB,EAAE,CAAC;qBACxC;oBACD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;wBACnC,OAAO,wBAAwB,CAAC;qBACnC;oBACD,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5E;gBACD,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;gBAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9D;iBAAM;gBACH,OAAO,IAAI,6DAA6B,EAAE,CAAC;aAC9C;SACJ;aAAM;YACH,OAAO,IAAI,6DAA6B,EAAE,CAAC;SAC9C;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAmB,EAAE,YAAoB;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,gBAAgB,EAAE;YACnB,OAAO,SAAS,CAAC;SACpB;QACD,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QAClG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,oBAAoB,CACtB,GAAmB,EACnB,kBAA0B,EAC1B,QAAgB;QAIhB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,MAAM,CAAC;aACvD,QAAQ,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aAC9D,KAAK,CAAC,+DAA+D,EAAE,EAAE,kBAAkB,EAAE,CAAC;aAC9F,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,IAAI,8DAA8B,EAAE,CAAC;SAC/C;QACD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;YACnC,OAAO,wBAAwB,CAAC;SACnC;QACD,IAAI,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,EAAE;YAC7E,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAC9D,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzE,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC5F,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,mBAAmB,EAAE;gBAC/E,mFAAmF;gBACnF,kFAAkF;gBAClF,yFAAyF;gBACzF,uFAAuF;gBACvF,kBAAkB;gBAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;aACxB;YACD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9D;aAAM;YACH,OAAO,IAAI,8DAA8B,EAAE,CAAC;SAC/C;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,sBAAsB,CAAC,GAAmB,EAAE,MAAU,EAAE,aAAqB;QAC/E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACpD,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE;YACnB,4DAA4D;YAC5D,0BAA0B;YAC1B,OAAO;SACV;QACD,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;QAChC,gBAAgB,CAAC,UAAU,GAAG,aAAa,CAAC;QAC5C,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC9C,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC1C,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,wBAAwB,CAAC,GAAmB,EAAE,IAAU;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QACrG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,uBAAuB,CACzB,GAAmB,EACnB,KAAa;QAMb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,MAAM,CAAC;aACvD,QAAQ,CAAC,4BAA4B,EAAE,sBAAsB,CAAC;aAC9D,KAAK,CAAC,qEAAqE,EAAE;YAC1E,qBAAqB,EAAE,KAAK;SAC/B,CAAC;aACD,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,IAAI,iEAAiC,EAAE,CAAC;SAClD;QACD,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE;YACjE,OAAO,IAAI,iEAAiC,EAAE,CAAC;SAClD;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;QAC7D,IAAI,CAAC,iBAAiB,EAAE;YACpB,MAAM,IAAI,4BAAmB,CAAC,kCAAkC,CAAC,CAAC;SACrE;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC;QACpC,gBAAgB,CAAC,UAAU,GAAG,iBAAiB,CAAC;QAChD,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC9C,gBAAgB,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC1C,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,cAAc,CAChB,GAAmB,EACnB,MAAU,EACV,eAAuB,EACvB,WAAmB;QAEnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC7B,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,uBAAuB,CAAC;aACxE,SAAS,CAAC,oCAAoC,CAAC;aAC/C,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;aACtC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,4BAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjD;QACD,MAAM,QAAQ,GAAG,WAAW,CAAC;QAC7B,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5E,IAAI,wBAAwB,KAAK,IAAI,EAAE;YACnC,OAAO,wBAAwB,CAAC;SACnC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAChG,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,IAAI,uDAAuB,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;SACnE;QACD,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5E,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC;aAC9C,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC1B,GAAmB,EACnB,QAAgB;QAEhB,MAAM,wBAAwB,GAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,0BAA0B,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5F,IAAI,wBAAwB,KAAK,IAAI,EAAE;YACnC,MAAM,OAAO,GACT,OAAO,wBAAwB,KAAK,QAAQ;gBACxC,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,qBAAqB,CAAC;YAChC,OAAO,IAAI,uDAAuB,CAAC,EAAE,sBAAsB,EAAE,OAAO,EAAE,CAAC,CAAC;SAC3E;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ,CAAA;AAtZY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACpB,8BAAa;QACf,0BAAW;QACR,gCAAc;QACF,yDAA0B;GANzD,WAAW,CAsZvB;AAtZY,kCAAW"}

package/dist/service/services/zone.service.d.ts

@@ -1,11 +1,14 @@
 import { CreateZoneInput, DeletionResponse, MutationAddMembersToZoneArgs, MutationRemoveMembersFromZoneArgs, UpdateZoneInput } from '@vendure/common/lib/generated-types';
-import { ID } from '@vendure/common/lib/shared-types';
+import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { ListQueryOptions } from '../../common/index';
 import { SelfRefreshingCache } from '../../common/self-refreshing-cache';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Zone } from '../../entity/zone/zone.entity';
 import { EventBus } from '../../event-bus';
+import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
+import { TranslatorService } from '../helpers/translator/translator.service';
 /**
  * @description
  * Contains methods relating to {@link Zone} entities.
@@ -16,11 +19,13 @@ export declare class ZoneService {
     private connection;
     private configService;
     private eventBus;
+    private translator;
+    private listQueryBuilder;
     /**
      * We cache all Zones to avoid hitting the DB many times per request.
      */
     private zones;
-    constructor(connection: TransactionalConnection, configService: ConfigService, eventBus: EventBus);
+    constructor(connection: TransactionalConnection, configService: ConfigService, eventBus: EventBus, translator: TranslatorService, listQueryBuilder: ListQueryBuilder);
     /** @internal */
     initZones(): Promise<void>;
     /**
@@ -29,8 +34,9 @@ export declare class ZoneService {
      * @internal
      */
     createCache(): Promise<SelfRefreshingCache<Zone[], [RequestContext]>>;
-    findAll(ctx: RequestContext): Promise<Zone[]>;
+    findAll(ctx: RequestContext, options?: ListQueryOptions<Zone>): Promise<PaginatedList<Zone>>;
     findOne(ctx: RequestContext, zoneId: ID): Promise<Zone | undefined>;
+    getAllWithMembers(ctx: RequestContext): Promise<Zone[]>;
     create(ctx: RequestContext, input: CreateZoneInput): Promise<Zone>;
     update(ctx: RequestContext, input: UpdateZoneInput): Promise<Zone>;
     delete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;

package/dist/service/services/zone.service.js

@@ -13,19 +13,21 @@ exports.ZoneService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const unique_1 = require("@vendure/common/lib/unique");
+const typeorm_1 = require("typeorm");
 const request_context_1 = require("../../api/common/request-context");
 const self_refreshing_cache_1 = require("../../common/self-refreshing-cache");
 const utils_1 = require("../../common/utils");
 const config_service_1 = require("../../config/config.service");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const entity_1 = require("../../entity");
-const country_entity_1 = require("../../entity/country/country.entity");
+const country_entity_1 = require("../../entity/region/country.entity");
 const zone_entity_1 = require("../../entity/zone/zone.entity");
 const event_bus_1 = require("../../event-bus");
 const zone_event_1 = require("../../event-bus/events/zone-event");
 const zone_members_event_1 = require("../../event-bus/events/zone-members-event");
+const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
+const translator_service_1 = require("../helpers/translator/translator.service");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
 /**
  * @description
  * Contains methods relating to {@link Zone} entities.
@@ -33,10 +35,12 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
  * @docsCategory services
  */
 let ZoneService = class ZoneService {
-    constructor(connection, configService, eventBus) {
+    constructor(connection, configService, eventBus, translator, listQueryBuilder) {
         this.connection = connection;
         this.configService = configService;
         this.eventBus = eventBus;
+        this.translator = translator;
+        this.listQueryBuilder = listQueryBuilder;
     }
     /** @internal */
     async initZones() {
@@ -59,28 +63,45 @@ let ZoneService = class ZoneService {
             },
         });
     }
-    async findAll(ctx) {
-        return this.zones.memoize([ctx.languageCode], [ctx], (zones, languageCode) => {
-            return zones.map((zone, i) => {
+    async findAll(ctx, options) {
+        return this.listQueryBuilder
+            .build(zone_entity_1.Zone, options, { relations: ['members'], ctx })
+            .getManyAndCount()
+            .then(([items, totalItems]) => {
+            const translated = items.map((zone, i) => {
                 const cloneZone = Object.assign({}, zone);
-                cloneZone.members = zone.members.map(country => (0, translate_entity_1.translateDeep)(country, languageCode));
+                cloneZone.members = zone.members.map(country => this.translator.translate(country, ctx));
                 return cloneZone;
             });
+            return {
+                items: translated,
+                totalItems,
+            };
         });
     }
     findOne(ctx, zoneId) {
         return this.connection
             .getRepository(ctx, zone_entity_1.Zone)
-            .findOne(zoneId, {
+            .findOne({
+            where: { id: zoneId },
             relations: ['members'],
         })
             .then(zone => {
             if (zone) {
-                zone.members = zone.members.map(country => (0, translate_entity_1.translateDeep)(country, ctx.languageCode));
+                zone.members = zone.members.map(country => this.translator.translate(country, ctx));
                 return zone;
             }
         });
     }
+    async getAllWithMembers(ctx) {
+        return this.zones.memoize([], [ctx], zones => {
+            return zones.map((zone, i) => {
+                const cloneZone = Object.assign({}, zone);
+                cloneZone.members = zone.members.map(country => this.translator.translate(country, ctx));
+                return cloneZone;
+            });
+        });
+    }
     async create(ctx, input) {
         const zone = new zone_entity_1.Zone(input);
         if (input.memberIds) {
@@ -101,6 +122,7 @@ let ZoneService = class ZoneService {
     }
     async delete(ctx, id) {
         const zone = await this.connection.getEntityOrThrow(ctx, zone_entity_1.Zone, id);
+        const deletedZone = new zone_entity_1.Zone(zone);
         const channelsUsingZone = await this.connection
             .getRepository(ctx, entity_1.Channel)
             .createQueryBuilder('channel')
@@ -131,7 +153,7 @@ let ZoneService = class ZoneService {
         else {
             await this.connection.getRepository(ctx, zone_entity_1.Zone).remove(zone);
             await this.zones.refresh(ctx);
-            this.eventBus.publish(new zone_event_1.ZoneEvent(ctx, zone, 'deleted', id));
+            this.eventBus.publish(new zone_event_1.ZoneEvent(ctx, deletedZone, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
                 message: '',
@@ -161,7 +183,7 @@ let ZoneService = class ZoneService {
         return (0, utils_1.assertFound)(this.findOne(ctx, zone.id));
     }
     getCountriesFromIds(ctx, ids) {
-        return this.connection.getRepository(ctx, country_entity_1.Country).findByIds(ids);
+        return this.connection.getRepository(ctx, country_entity_1.Country).find({ where: { id: (0, typeorm_1.In)(ids) } });
     }
     /**
      * Ensures zones cache exists. If not, this method creates one.
@@ -177,7 +199,9 @@ ZoneService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_service_1.ConfigService,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService,
+        list_query_builder_1.ListQueryBuilder])
 ], ZoneService);
 exports.ZoneService = ZoneService;
 //# sourceMappingURL=zone.service.js.map

package/dist/service/services/zone.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"zone.service.js","sourceRoot":"","sources":["../../../src/service/services/zone.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zone.service.js","sourceRoot":"","sources":["../../../src/service/services/zone.service.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @description
+ * A constant which holds the current version of the Vendure core. You can use
+ * this when your code needs to know the version of Vendure which is running.
+ *
+ * @example
+ * ```TypeScript
+ * import { VENDURE_VERSION } from '\@vendure/core';
+ *
+ * console.log('Vendure version:', VENDURE_VERSION);
+ * ```
+ *
+ * @docsCategory common
+ * @since 2.0.0
+ */
+export declare const VENDURE_VERSION: string;

package/dist/version.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VENDURE_VERSION = void 0;
+/* eslint-disable @typescript-eslint/no-var-requires */
+/**
+ * @description
+ * A constant which holds the current version of the Vendure core. You can use
+ * this when your code needs to know the version of Vendure which is running.
+ *
+ * @example
+ * ```TypeScript
+ * import { VENDURE_VERSION } from '\@vendure/core';
+ *
+ * console.log('Vendure version:', VENDURE_VERSION);
+ * ```
+ *
+ * @docsCategory common
+ * @since 2.0.0
+ */
+exports.VENDURE_VERSION = require('../package.json').version;
+//# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD;;;;;;;;;;;;;;GAcG;AACU,QAAA,eAAe,GAAW,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC"}