@vendure/core 2.0.0-next.9 → 2.0.0

package/dist/service/services/country.service.js

@@ -16,13 +16,13 @@ const errors_1 = require("../../common/error/errors");
 const utils_1 = require("../../common/utils");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const entity_1 = require("../../entity");
-const country_translation_entity_1 = require("../../entity/country/country-translation.entity");
-const country_entity_1 = require("../../entity/country/country.entity");
+const country_entity_1 = require("../../entity/region/country.entity");
+const region_translation_entity_1 = require("../../entity/region/region-translation.entity");
 const event_bus_1 = require("../../event-bus");
 const country_event_1 = require("../../event-bus/events/country-event");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
+const translator_service_1 = require("../helpers/translator/translator.service");
 /**
  * @description
  * Contains methods relating to {@link Country} entities.
@@ -30,18 +30,19 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
  * @docsCategory services
  */
 let CountryService = class CountryService {
-    constructor(connection, listQueryBuilder, translatableSaver, eventBus) {
+    constructor(connection, listQueryBuilder, translatableSaver, eventBus, translator) {
         this.connection = connection;
         this.listQueryBuilder = listQueryBuilder;
         this.translatableSaver = translatableSaver;
         this.eventBus = eventBus;
+        this.translator = translator;
     }
     findAll(ctx, options, relations = []) {
         return this.listQueryBuilder
             .build(country_entity_1.Country, options, { ctx, relations })
             .getManyAndCount()
             .then(([countries, totalItems]) => {
-            const items = countries.map(country => (0, translate_entity_1.translateDeep)(country, ctx.languageCode));
+            const items = countries.map(country => this.translator.translate(country, ctx));
             return {
                 items,
                 totalItems,
@@ -51,8 +52,8 @@ let CountryService = class CountryService {
     findOne(ctx, countryId, relations = []) {
         return this.connection
             .getRepository(ctx, country_entity_1.Country)
-            .findOne(countryId, { relations })
-            .then(country => country && (0, translate_entity_1.translateDeep)(country, ctx.languageCode));
+            .findOne({ where: { id: countryId }, relations })
+            .then(country => { var _a; return (_a = (country && this.translator.translate(country, ctx))) !== null && _a !== void 0 ? _a : undefined; });
     }
     /**
      * @description
@@ -62,7 +63,7 @@ let CountryService = class CountryService {
         return this.connection
             .getRepository(ctx, country_entity_1.Country)
             .find({ where: { enabled: true } })
-            .then(items => items.map(country => (0, translate_entity_1.translateDeep)(country, ctx.languageCode)));
+            .then(items => items.map(country => this.translator.translate(country, ctx)));
     }
     /**
      * @description
@@ -77,14 +78,14 @@ let CountryService = class CountryService {
         if (!country) {
             throw new errors_1.UserInputError('error.country-code-not-valid', { countryCode });
         }
-        return (0, translate_entity_1.translateDeep)(country, ctx.languageCode);
+        return this.translator.translate(country, ctx);
     }
     async create(ctx, input) {
         const country = await this.translatableSaver.create({
             ctx,
             input,
             entityType: country_entity_1.Country,
-            translationType: country_translation_entity_1.CountryTranslation,
+            translationType: region_translation_entity_1.RegionTranslation,
         });
         this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'created', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, country.id));
@@ -94,7 +95,7 @@ let CountryService = class CountryService {
             ctx,
             input,
             entityType: country_entity_1.Country,
-            translationType: country_translation_entity_1.CountryTranslation,
+            translationType: region_translation_entity_1.RegionTranslation,
         });
         this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'updated', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, country.id));
@@ -113,8 +114,9 @@ let CountryService = class CountryService {
             };
         }
         else {
+            const deletedCountry = new country_entity_1.Country(country);
             await this.connection.getRepository(ctx, country_entity_1.Country).remove(country);
-            this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'deleted', id));
+            this.eventBus.publish(new country_event_1.CountryEvent(ctx, deletedCountry, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
                 message: '',
@@ -127,7 +129,8 @@ CountryService = __decorate([
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         list_query_builder_1.ListQueryBuilder,
         translatable_saver_1.TranslatableSaver,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService])
 ], CountryService);
 exports.CountryService = CountryService;
 //# sourceMappingURL=country.service.js.map

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

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

package/dist/service/services/customer-group.service.d.ts

@@ -3,8 +3,8 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
 import { RelationPaths } from '../../api/index';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { CustomerGroup } from '../../entity/customer-group/customer-group.entity';
 import { Customer } from '../../entity/customer/customer.entity';
+import { CustomerGroup } from '../../entity/customer-group/customer-group.entity';
 import { EventBus } from '../../event-bus/event-bus';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';

package/dist/service/services/customer-group.service.js

@@ -15,10 +15,10 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
 const errors_1 = require("../../common/error/errors");
 const utils_1 = require("../../common/utils");
 const transactional_connection_1 = require("../../connection/transactional-connection");
-const customer_group_entity_1 = require("../../entity/customer-group/customer-group.entity");
 const customer_entity_1 = require("../../entity/customer/customer.entity");
+const customer_group_entity_1 = require("../../entity/customer-group/customer-group.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
-const customer_group_entity_event_1 = require("../../event-bus/events/customer-group-entity-event");
+const customer_group_change_event_1 = require("../../event-bus/events/customer-group-change-event");
 const customer_group_event_1 = require("../../event-bus/events/customer-group-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
@@ -45,7 +45,10 @@ let CustomerGroupService = class CustomerGroupService {
             .then(([items, totalItems]) => ({ items, totalItems }));
     }
     findOne(ctx, customerGroupId, relations = []) {
-        return this.connection.getRepository(ctx, customer_group_entity_1.CustomerGroup).findOne(customerGroupId, { relations });
+        return this.connection
+            .getRepository(ctx, customer_group_entity_1.CustomerGroup)
+            .findOne({ where: { id: customerGroupId }, relations })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
@@ -57,6 +60,7 @@ let CustomerGroupService = class CustomerGroupService {
             .leftJoin('customer.groups', 'group')
             .leftJoin('customer.channels', 'channel')
             .andWhere('group.id = :groupId', { groupId: customerGroupId })
+            .andWhere('customer.deletedAt IS NULL', { groupId: customerGroupId })
             .andWhere('channel.id =:channelId', { channelId: ctx.channelId })
             .getManyAndCount()
             .then(([items, totalItems]) => ({ items, totalItems }));
@@ -81,7 +85,7 @@ let CustomerGroupService = class CustomerGroupService {
         }
         const savedCustomerGroup = await (0, utils_1.assertFound)(this.findOne(ctx, newCustomerGroup.id));
         await this.customFieldRelationService.updateRelations(ctx, customer_group_entity_1.CustomerGroup, input, savedCustomerGroup);
-        this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, savedCustomerGroup, 'created', input));
+        this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, savedCustomerGroup, 'created', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, savedCustomerGroup.id));
     }
     async update(ctx, input) {
@@ -89,14 +93,15 @@ let CustomerGroupService = class CustomerGroupService {
         const updatedCustomerGroup = (0, patch_entity_1.patchEntity)(customerGroup, input);
         await this.connection.getRepository(ctx, customer_group_entity_1.CustomerGroup).save(updatedCustomerGroup, { reload: false });
         await this.customFieldRelationService.updateRelations(ctx, customer_group_entity_1.CustomerGroup, input, updatedCustomerGroup);
-        this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, customerGroup, 'updated', input));
+        this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, customerGroup, 'updated', input));
         return (0, utils_1.assertFound)(this.findOne(ctx, customerGroup.id));
     }
     async delete(ctx, id) {
         const group = await this.connection.getEntityOrThrow(ctx, customer_group_entity_1.CustomerGroup, id);
         try {
+            const deletedGroup = new customer_group_entity_1.CustomerGroup(group);
             await this.connection.getRepository(ctx, customer_group_entity_1.CustomerGroup).remove(group);
-            this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, group, 'deleted', id));
+            this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, deletedGroup, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
             };
@@ -125,8 +130,7 @@ let CustomerGroupService = class CustomerGroupService {
             }
         }
         await this.connection.getRepository(ctx, customer_entity_1.Customer).save(customers, { reload: false });
-        this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, customers, group, 'assigned'));
-        this.eventBus.publish(new customer_group_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'assigned'));
+        this.eventBus.publish(new customer_group_change_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'assigned'));
         return (0, utils_1.assertFound)(this.findOne(ctx, group.id));
     }
     async removeCustomersFromGroup(ctx, input) {
@@ -147,8 +151,7 @@ let CustomerGroupService = class CustomerGroupService {
             });
         }
         await this.connection.getRepository(ctx, customer_entity_1.Customer).save(customers, { reload: false });
-        this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, customers, group, 'removed'));
-        this.eventBus.publish(new customer_group_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'removed'));
+        this.eventBus.publish(new customer_group_change_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'removed'));
         return (0, utils_1.assertFound)(this.findOne(ctx, group.id));
     }
     getCustomersFromIds(ctx, ids) {

package/dist/service/services/customer-group.service.js.map

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

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

@@ -9,13 +9,15 @@ import { ListQueryOptions } from '../../common/types/common-types';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Address } from '../../entity/address/address.entity';
-import { CustomerGroup } from '../../entity/customer-group/customer-group.entity';
 import { Customer } from '../../entity/customer/customer.entity';
+import { CustomerGroup } from '../../entity/customer-group/customer-group.entity';
 import { HistoryEntry } from '../../entity/history-entry/history-entry.entity';
+import { Order } from '../../entity/order/order.entity';
 import { User } from '../../entity/user/user.entity';
 import { EventBus } from '../../event-bus/event-bus';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
+import { TranslatorService } from '../helpers/translator/translator.service';
 import { ChannelService } from './channel.service';
 import { CountryService } from './country.service';
 import { HistoryService } from './history.service';
@@ -36,7 +38,8 @@ export declare class CustomerService {
     private historyService;
     private channelService;
     private customFieldRelationService;
-    constructor(connection: TransactionalConnection, configService: ConfigService, userService: UserService, countryService: CountryService, listQueryBuilder: ListQueryBuilder, eventBus: EventBus, historyService: HistoryService, channelService: ChannelService, customFieldRelationService: CustomFieldRelationService);
+    private translator;
+    constructor(connection: TransactionalConnection, configService: ConfigService, userService: UserService, countryService: CountryService, listQueryBuilder: ListQueryBuilder, eventBus: EventBus, historyService: HistoryService, channelService: ChannelService, customFieldRelationService: CustomFieldRelationService, translator: TranslatorService);
     findAll(ctx: RequestContext, options: ListQueryOptions<Customer> | undefined, relations?: RelationPaths<Customer>): Promise<PaginatedList<Customer>>;
     findOne(ctx: RequestContext, id: ID, relations?: RelationPaths<Customer>): Promise<Customer | undefined>;
     /**
@@ -133,6 +136,14 @@ export declare class CustomerService {
     updateAddress(ctx: RequestContext, input: UpdateAddressInput): Promise<Address>;
     deleteAddress(ctx: RequestContext, id: ID): Promise<boolean>;
     softDelete(ctx: RequestContext, customerId: ID): Promise<DeletionResponse>;
+    /**
+     * @description
+     * If the Customer associated with the given Order does not yet have any Addresses,
+     * this method will create new Address(es) based on the Order's shipping & billing
+     * addresses.
+     */
+    createAddressesForNewCustomer(ctx: RequestContext, order: Order): Promise<void>;
+    private addressesAreEqual;
     addNoteToCustomer(ctx: RequestContext, input: AddNoteToCustomerInput): Promise<Customer>;
     updateCustomerNote(ctx: RequestContext, input: UpdateCustomerNoteInput): Promise<HistoryEntry>;
     deleteCustomerNote(ctx: RequestContext, id: ID): Promise<DeletionResponse>;

package/dist/service/services/customer.service.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomerService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const typeorm_1 = require("typeorm");
 const error_result_1 = require("../../common/error/error-result");
 const errors_1 = require("../../common/error/errors");
 const generated_graphql_admin_errors_1 = require("../../common/error/generated-graphql-admin-errors");
@@ -36,9 +37,9 @@ const password_reset_event_1 = require("../../event-bus/events/password-reset-ev
 const password_reset_verified_event_1 = require("../../event-bus/events/password-reset-verified-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
+const translator_service_1 = require("../helpers/translator/translator.service");
 const address_to_line_1 = require("../helpers/utils/address-to-line");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
 const channel_service_1 = require("./channel.service");
 const country_service_1 = require("./country.service");
 const history_service_1 = require("./history.service");
@@ -50,7 +51,7 @@ const user_service_1 = require("./user.service");
  * @docsCategory services
  */
 let CustomerService = class CustomerService {
-    constructor(connection, configService, userService, countryService, listQueryBuilder, eventBus, historyService, channelService, customFieldRelationService) {
+    constructor(connection, configService, userService, countryService, listQueryBuilder, eventBus, historyService, channelService, customFieldRelationService, translator) {
         this.connection = connection;
         this.configService = configService;
         this.userService = userService;
@@ -60,20 +61,21 @@ let CustomerService = class CustomerService {
         this.historyService = historyService;
         this.channelService = channelService;
         this.customFieldRelationService = customFieldRelationService;
+        this.translator = translator;
     }
     findAll(ctx, options, relations = []) {
-        var _a, _b;
+        var _a;
         const customPropertyMap = {};
-        const hasPostalCodeFilter = !!((_b = (_a = options) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.postalCode);
+        const hasPostalCodeFilter = !!((_a = options === null || options === void 0 ? void 0 : options.filter) === null || _a === void 0 ? void 0 : _a.postalCode);
         if (hasPostalCodeFilter) {
             relations.push('addresses');
-            customPropertyMap.postalCode = 'address.postalCode';
+            customPropertyMap.postalCode = 'addresses.postalCode';
         }
         return this.listQueryBuilder
             .build(customer_entity_1.Customer, options, {
             relations,
             channelId: ctx.channelId,
-            where: { deletedAt: null },
+            where: { deletedAt: (0, typeorm_1.IsNull)() },
             ctx,
             customPropertyMap,
         })
@@ -81,10 +83,12 @@ let CustomerService = class CustomerService {
             .then(([items, totalItems]) => ({ items, totalItems }));
     }
     findOne(ctx, id, relations = []) {
-        return this.connection.findOneInChannel(ctx, customer_entity_1.Customer, id, ctx.channelId, {
+        return this.connection
+            .findOneInChannel(ctx, customer_entity_1.Customer, id, ctx.channelId, {
             relations,
-            where: { deletedAt: null },
-        });
+            where: { deletedAt: (0, typeorm_1.IsNull)() },
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
@@ -103,7 +107,7 @@ let CustomerService = class CustomerService {
         if (filterOnChannel) {
             query = query.andWhere('channel.id = :channelId', { channelId: ctx.channelId });
         }
-        return query.getOne();
+        return query.getOne().then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
@@ -119,7 +123,7 @@ let CustomerService = class CustomerService {
             .getMany()
             .then(addresses => {
             addresses.forEach(address => {
-                address.country = (0, translate_entity_1.translateDeep)(address.country, ctx.languageCode);
+                address.country = this.translator.translate(address.country, ctx);
             });
             return addresses;
         });
@@ -132,7 +136,7 @@ let CustomerService = class CustomerService {
         const customerWithGroups = await this.connection.findOneInChannel(ctx, customer_entity_1.Customer, customerId, ctx === null || ctx === void 0 ? void 0 : ctx.channelId, {
             relations: ['groups'],
             where: {
-                deletedAt: null,
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
         });
         if (customerWithGroups) {
@@ -172,20 +176,15 @@ let CustomerService = class CustomerService {
             relations: ['channels'],
             where: {
                 emailAddress: input.emailAddress,
-                deletedAt: null,
-            },
-        });
-        const existingUser = await this.connection.getRepository(ctx, user_entity_1.User).findOne({
-            where: {
-                identifier: input.emailAddress,
-                deletedAt: null,
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
         });
+        const existingUser = await this.userService.getUserByEmailAddress(ctx, input.emailAddress, 'customer');
         if (existingCustomer && existingUser) {
             // Customer already exists, bring to this Channel
             const updatedCustomer = (0, patch_entity_1.patchEntity)(existingCustomer, input);
             updatedCustomer.channels.push(ctx.channel);
-            return this.connection.getRepository(customer_entity_1.Customer).save(updatedCustomer);
+            return this.connection.getRepository(ctx, customer_entity_1.Customer).save(updatedCustomer);
         }
         else if (existingCustomer || existingUser) {
             // Not sure when this situation would occur
@@ -257,7 +256,7 @@ let CustomerService = class CustomerService {
                     return new generated_graphql_admin_errors_1.EmailAddressConflictError();
                 }
                 if (customer.user) {
-                    const existingUserWithEmailAddress = await this.userService.getUserByEmailAddress(ctx, input.emailAddress);
+                    const existingUserWithEmailAddress = await this.userService.getUserByEmailAddress(ctx, input.emailAddress, 'customer');
                     if (existingUserWithEmailAddress &&
                         !(0, utils_1.idsAreEqual)(customer.user.id, existingUserWithEmailAddress.id)) {
                         return new generated_graphql_admin_errors_1.EmailAddressConflictError();
@@ -537,7 +536,7 @@ let CustomerService = class CustomerService {
             relations: ['channels'],
             where: {
                 emailAddress: input.emailAddress,
-                deletedAt: null,
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
         });
         if (existing) {
@@ -561,7 +560,7 @@ let CustomerService = class CustomerService {
      */
     async createAddress(ctx, customerId, input) {
         const customer = await this.connection.getEntityOrThrow(ctx, customer_entity_1.Customer, customerId, {
-            where: { deletedAt: null },
+            where: { deletedAt: (0, typeorm_1.IsNull)() },
             relations: ['addresses'],
             channelId: ctx.channelId,
         });
@@ -594,7 +593,7 @@ let CustomerService = class CustomerService {
             address.country = await this.countryService.findOneByCode(ctx, input.countryCode);
         }
         else {
-            address.country = (0, translate_entity_1.translateDeep)(address.country, ctx.languageCode);
+            address.country = this.translator.translate(address.country, ctx);
         }
         let updatedAddress = (0, patch_entity_1.patchEntity)(address, input);
         updatedAddress = await this.connection.getRepository(ctx, address_entity_1.Address).save(updatedAddress);
@@ -621,7 +620,7 @@ let CustomerService = class CustomerService {
         if (!customer) {
             throw new errors_1.EntityNotFoundError('Address', id);
         }
-        address.country = (0, translate_entity_1.translateDeep)(address.country, ctx.languageCode);
+        address.country = this.translator.translate(address.country, ctx);
         await this.reassignDefaultsForDeletedAddress(ctx, address);
         await this.historyService.createHistoryEntryForCustomer({
             customerId: address.customer.id,
@@ -631,9 +630,10 @@ let CustomerService = class CustomerService {
                 address: (0, address_to_line_1.addressToLine)(address),
             },
         });
+        const deletedAddress = new address_entity_1.Address(address);
         await this.connection.getRepository(ctx, address_entity_1.Address).remove(address);
         address.customer = customer;
-        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, address, 'deleted', id));
+        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, deletedAddress, 'deleted', id));
         return true;
     }
     async softDelete(ctx, customerId) {
@@ -643,13 +643,46 @@ let CustomerService = class CustomerService {
         await this.connection
             .getRepository(ctx, customer_entity_1.Customer)
             .update({ id: customerId }, { deletedAt: new Date() });
-        // tslint:disable-next-line:no-non-null-assertion
-        await this.userService.softDelete(ctx, customer.user.id);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (customer.user) {
+            await this.userService.softDelete(ctx, customer.user.id);
+        }
         this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'deleted', customerId));
         return {
             result: generated_types_1.DeletionResult.DELETED,
         };
     }
+    /**
+     * @description
+     * If the Customer associated with the given Order does not yet have any Addresses,
+     * this method will create new Address(es) based on the Order's shipping & billing
+     * addresses.
+     */
+    async createAddressesForNewCustomer(ctx, order) {
+        var _a;
+        if (!order.customer) {
+            return;
+        }
+        const addresses = await this.findAddressesByCustomerId(ctx, order.customer.id);
+        // If the Customer has no addresses yet, use the shipping/billing address data
+        // to populate the initial default Address.
+        if (addresses.length === 0 && ((_a = order.shippingAddress) === null || _a === void 0 ? void 0 : _a.country)) {
+            const shippingAddress = order.shippingAddress;
+            const billingAddress = order.billingAddress;
+            const hasSeparateBillingAddress = (billingAddress === null || billingAddress === void 0 ? void 0 : billingAddress.streetLine1) && !this.addressesAreEqual(shippingAddress, billingAddress);
+            if (shippingAddress.streetLine1) {
+                await this.createAddress(ctx, order.customer.id, Object.assign(Object.assign({}, shippingAddress), { company: shippingAddress.company || '', streetLine1: shippingAddress.streetLine1 || '', streetLine2: shippingAddress.streetLine2 || '', countryCode: shippingAddress.countryCode || '', defaultBillingAddress: !hasSeparateBillingAddress, defaultShippingAddress: true }));
+            }
+            if (hasSeparateBillingAddress) {
+                await this.createAddress(ctx, order.customer.id, Object.assign(Object.assign({}, billingAddress), { company: billingAddress.company || '', streetLine1: billingAddress.streetLine1 || '', streetLine2: billingAddress.streetLine2 || '', countryCode: billingAddress.countryCode || '', defaultBillingAddress: true, defaultShippingAddress: false }));
+            }
+        }
+    }
+    addressesAreEqual(address1, address2) {
+        return (address1.streetLine1 === address2.streetLine1 &&
+            address1.streetLine2 === address2.streetLine2 &&
+            address1.postalCode === address2.postalCode);
+    }
     async addNoteToCustomer(ctx, input) {
         const customer = await this.connection.getEntityOrThrow(ctx, customer_entity_1.Customer, input.id, {
             channelId: ctx.channelId,
@@ -689,7 +722,7 @@ let CustomerService = class CustomerService {
     async enforceSingleDefaultAddress(ctx, addressId, input) {
         const result = await this.connection
             .getRepository(ctx, address_entity_1.Address)
-            .findOne(addressId, { relations: ['customer', 'customer.addresses'] });
+            .findOne({ where: { id: addressId }, relations: ['customer', 'customer.addresses'] });
         if (result) {
             const customerAddressIds = result.customer.addresses
                 .map(a => a.id)
@@ -719,7 +752,7 @@ let CustomerService = class CustomerService {
         }
         const result = await this.connection
             .getRepository(ctx, address_entity_1.Address)
-            .findOne(addressToDelete.id, { relations: ['customer', 'customer.addresses'] });
+            .findOne({ where: { id: addressToDelete.id }, relations: ['customer', 'customer.addresses'] });
         if (result) {
             const customerAddresses = result.customer.addresses;
             if (1 < customerAddresses.length) {
@@ -747,7 +780,8 @@ CustomerService = __decorate([
         event_bus_1.EventBus,
         history_service_1.HistoryService,
         channel_service_1.ChannelService,
-        custom_field_relation_service_1.CustomFieldRelationService])
+        custom_field_relation_service_1.CustomFieldRelationService,
+        translator_service_1.TranslatorService])
 ], CustomerService);
 exports.CustomerService = CustomerService;
 //# sourceMappingURL=customer.service.js.map