fix(import): fix setting the default billing and shipping address

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 ### Steps to reproduce the behavior
 
-### Expected behavior
-
 ### Actual behavior
+
+### Expected behavior

src/customer-import.js

@@ -68,10 +68,10 @@ export default class CustomerImport {
       // user does not exist yet -> generate password for him
       customer.password = generatePassword()
       if (_.isNumber(this.config.defaultShippingAddress)) {
-        customer.defaultShippingAddressId = this.config.defaultShippingAddress
+        customer.defaultShippingAddress = this.config.defaultShippingAddress
       }
       if (_.isNumber(this.config.defaultBillingAddress)) {
-        customer.defaultBillingAddressId = this.config.defaultBillingAddress
+        customer.defaultBillingAddress = this.config.defaultBillingAddress
       }
       // TODO should this be configurable?
       // so that you choose whether you already have customer group id or name

src/schema.js

@@ -8,17 +8,44 @@ const schema = {
       items: {
         type: 'object',
         properties: {
+          firstName: { type: 'string' },
+          lastName: { type: 'string' },
           streetName: { type: 'string' },
           postalCode:  { type: 'string' },
+          company:  { type: 'string' },
           city: { type: 'string' },
           country: { type: 'string', minLength: 2, maxLength: 2 },
         }
       },
     },
+    firstName: { type: 'string' },
+    lastName: { type: 'string' },
+    middleName: { type: 'string' },
+    title: { type: 'string' },
+    anonymousCartId: { type: 'string' },
+    dateOfBirth: { type: 'string' },
+    externalId: { type: 'string' },
+    isEmailVerified: { type: 'boolean' },
     email: { type: 'string' },
     phone: { type: 'string' },
     customerGroup: { type: 'string' },
     vatId: { type: 'string' },
+    custom: {
+      type: 'object',
+      properties: {
+        type: {
+          type: 'object',
+          properties: {
+            key: {
+              type: 'string'
+            }
+          }
+        },
+        fields: {
+          type: 'object'
+        }
+      }
+    }
   },
   required: ['email'],
   additionalProperties: false,

tests/integration/customer-import.js

@@ -28,39 +28,36 @@ describe('customer import module', function () {
       }
       client = new SphereClient(options)
 
-      customerImport = new CustomerImport(
-        logger,
-        { sphereClientConfig: options }
-      )
-      done()
-    })
-  })
-
-  afterEach((done) => {
-    // remove all customers
-    const deleteAll = (service) => {
-      return client[service].process(({ body: { results } }) => {
-        return Promise.map(results, (customer) => {
-          return client[service].byId(customer.id)
-          .delete(customer.version)
+      // remove all customers
+      const deleteAll = (service) => {
+        return client[service].process(({ body: { results } }) => {
+          return Promise.map(results, (customer) => {
+            return client[service].byId(customer.id)
+            .delete(customer.version)
+          })
         })
+      }
+      deleteAll('customers')
+      .then(() => deleteAll('customerGroups'))
+      .then(() => deleteAll('types'))
+      .then(() => {
+        customerImport = new CustomerImport(
+          logger,
+          { sphereClientConfig: options }
+        )
+        done()
       })
-    }
-    deleteAll('customers')
-    .then(() => {
-      return deleteAll('customerGroups')
-    })
-    .then(() => {
-      done()
     })
-    .catch(done)
   })
 
   it('should import a complete customer', (done) => {
     const customer = {
       'customerNumber':'12341234',
+      'firstName': 'Max',
+      'lastName': 'Mustermann',
+      'externalId': '1-nc0r98nc1-390r8cn-1309rcn8',
+      'companyName':'Some random company',
       'addresses':[{
-        'companyName':'Some random company',
         'streetName':'Musterstraße 123',
         'postalCode':'11111',
         'city':'Stadt',
@@ -126,30 +123,119 @@ describe('customer import module', function () {
 
     const customer = {
       email: '[email protected]',
+      companyName: 'Some random company',
       addresses: [{
-        streetName: 'Ernst-Platz-Straße 45a',
-        postalCode: '80992',
-        city: 'München',
+        streetName: 'Musterstraße 123',
+        postalCode: '11111',
+        city: 'Stadt',
         country: 'DE'
       }]
     }
     customerImport.loadCustomerGroups()
+    .then(() => customerImport.importCustomer(customer))
     .then(() => {
-      customerImport.importCustomer(customer)
-      .then(() => {
-        const summary = JSON.parse(customerImport.summaryReport())
-        const actual = summary.errors.length
-        const expected = 0
+      const summary = JSON.parse(customerImport.summaryReport())
+      const actual = summary.errors.length
+      const expected = 0
 
-        expect(actual).to.equal(expected)
-        client.customers.where(`email="${customer.email}"`).fetch()
-        .then(({ body: { results: customers } }) => {
-          const actual = _.omit(customers[0].addresses[0], 'id')
-          const expected = customer.addresses[0]
+      expect(actual).to.equal(expected)
+      return client.customers.where(`email="${customer.email}"`).fetch()
+    })
+    .then(({ body: { results: customers } }) => {
+      const actual = _.omit(customers[0].addresses[0], 'id')
+      const expected = customer.addresses[0]
 
-          expect(actual).to.deep.equal(expected)
-          done()
-        })
+      expect(actual).to.deep.equal(expected)
+      done()
+    })
+    .catch(done)
+  })
+
+  it('should import a customer with a default shipping and billing address',
+  (done) => {
+
+    const customer = {
+      email: '[email protected]',
+      companyName: 'Some random company',
+      addresses: [{
+        streetName: 'Musterstraße 123',
+        postalCode: '11111',
+        city: 'Stadt',
+        country: 'DE'
+      }]
+    }
+    customerImport.config.defaultShippingAddress = 0
+    customerImport.config.defaultBillingAddress = 0
+    customerImport.loadCustomerGroups()
+    .then(() => customerImport.importCustomer(customer))
+    .then(() => {
+      const summary = JSON.parse(customerImport.summaryReport())
+      const actual = summary.errors.length
+      const expected = 0
+
+      expect(actual).to.equal(expected)
+      return client.customers.where(`email="${customer.email}"`).fetch()
+    })
+    .then(({ body: { results: customers } }) => {
+      const { id } = customers[0].addresses[0]
+
+      expect(id).to.equal(customers[0].defaultBillingAddressId)
+      expect(id).to.equal(customers[0].defaultShippingAddressId)
+      done()
+    })
+    .catch(done)
+  })
+
+  it('should import a customer with custom fields', (done) => {
+
+    let customer
+    client.types.create({
+      key: 'custom-customer',
+      name: { en: 'custom customer' },
+      resourceTypeIds: ['customer'],
+      fieldDefinitions: [
+        {
+          name: 'customField1',
+          type: { name: 'String' },
+          required: false,
+          label: { label: 'Custom field 1' },
+          inputHint: 'SingleLine'
+        },
+        {
+          name: 'customField2',
+          type: { name: 'Boolean' },
+          required: false,
+          label: { en: 'Custom field 2' },
+        }
+      ]
+    }).then(({ body: customType }) => {
+      customer = {
+        email: '[email protected]',
+        custom: {
+          type: {
+            key: customType.key
+          },
+          fields: {
+            customField1: 'customValue1',
+            customField2: true
+          }
+        }
+      }
+      return customerImport.importCustomer(customer)
+    })
+    .then(() => {
+      const summary = JSON.parse(customerImport.summaryReport())
+      const actual = summary.errors.length
+      const expected = 0
+
+      expect(actual).to.equal(expected)
+      client.customers.where(`email="${customer.email}"`).fetch()
+      .then(({ body: { results: customers } }) => {
+        const actual = customers[0].custom.fields
+        const expected = customer.custom.fields
+
+        expect(actual).to.deep.equal(expected)
+        done()
       })
     })
     .catch(done)

tests/unit/customer-import.js

@@ -212,11 +212,11 @@ describe('customer import module', () => {
         const savedCustomer = importer.client.customers.save.getCall(0).args[0]
         const actual = _.pick(
           savedCustomer,
-          ['defaultShippingAddressId', 'defaultBillingAddressId']
+          ['defaultShippingAddress', 'defaultBillingAddress']
         )
         const expected = {
-          defaultShippingAddressId: 0,
-          defaultBillingAddressId: 0
+          defaultShippingAddress: 0,
+          defaultBillingAddress: 0
         }
         expect(actual).to.deep.equal(expected)
         done()