From de24df9728105140218db58cc3c9ad5b14db6812 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Mon, 19 Dec 2016 14:45:12 +0100
Subject: [PATCH] Working on issue #558 - Zendesk ticket owner won't get
 imported.

---
 lib/import/zendesk/ticket.rb       | 1 +
 spec/import/zendesk/ticket_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/lib/import/zendesk/ticket.rb b/lib/import/zendesk/ticket.rb
index bbebfe2e7..5e36420ef 100644
--- a/lib/import/zendesk/ticket.rb
+++ b/lib/import/zendesk/ticket.rb
@@ -40,6 +40,7 @@ module Import
         {
           id:                       ticket.id,
           title:                    ticket.subject,
+          owner_id:                 Import::Zendesk::UserFactory.local_id( ticket.assignee ) || 1,
           note:                     ticket.description,
           group_id:                 Import::Zendesk::GroupFactory.local_id( ticket.group_id ) || 1,
           customer_id:              local_user_id,
diff --git a/spec/import/zendesk/ticket_spec.rb b/spec/import/zendesk/ticket_spec.rb
index 94604708d..1a62722f7 100644
--- a/spec/import/zendesk/ticket_spec.rb
+++ b/spec/import/zendesk/ticket_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe Import::Zendesk::Ticket do
       id:                1337,
       subject:           'The ticket title',
       description:       'An example ticket',
+      assignee:          69,
       requester_id:      42,
       group_id:          909,
       organization_id:   101,
@@ -29,6 +30,7 @@ RSpec.describe Import::Zendesk::Ticket do
       title:                    ticket.subject,
       note:                     ticket.description,
       group_id:                 3,
+      owner_id:                 101,
       customer_id:              local_user_id,
       organization_id:          89,
       state:                    13,
@@ -43,6 +45,7 @@ RSpec.describe Import::Zendesk::Ticket do
     }
 
     expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.requester_id ).and_return(local_user_id)
+    expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.assignee ).and_return(expected_structure[:owner_id])
 
     expect(Import::Zendesk::GroupFactory).to receive(:local_id).with( ticket.group_id ).and_return(expected_structure[:group_id])
     expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( ticket.organization_id ).and_return(expected_structure[:organization_id])
@@ -70,6 +73,7 @@ RSpec.describe Import::Zendesk::Ticket do
       id:                1337,
       subject:           'The ticket title',
       description:       'An example ticket',
+      assignee:          69,
       requester_id:      42,
       group_id:          909,
       organization_id:   101,
@@ -88,6 +92,7 @@ RSpec.describe Import::Zendesk::Ticket do
       title:                    ticket.subject,
       note:                     ticket.description,
       group_id:                 3,
+      owner_id:                 101,
       customer_id:              local_user_id,
       organization_id:          89,
       state:                    13,
@@ -102,6 +107,7 @@ RSpec.describe Import::Zendesk::Ticket do
     }
 
     expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.requester_id ).and_return(local_user_id)
+    expect(Import::Zendesk::UserFactory).to receive(:local_id).with( ticket.assignee ).and_return(expected_structure[:owner_id])
 
     expect(Import::Zendesk::GroupFactory).to receive(:local_id).with( ticket.group_id ).and_return(expected_structure[:group_id])
     expect(Import::Zendesk::OrganizationFactory).to receive(:local_id).with( ticket.organization_id ).and_return(expected_structure[:organization_id])