From 77619212d6c1368e40d6c6823c2178424da3f6cc Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@zammad.com>
Date: Wed, 26 May 2021 17:15:58 +0200
Subject: [PATCH] Follow up - 8790e389be671d447fe0383cff6ad6b73dcaec0d - Fixes
 issue #865 - Freshdesk import - Import last login date as such and not as
 image source.

---
 .../unit/import/freshdesk/agent/mapping.rb     | 18 +++++++++---------
 .../sequence/import/freshdesk/agent_spec.rb    | 11 ++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/sequencer/unit/import/freshdesk/agent/mapping.rb b/lib/sequencer/unit/import/freshdesk/agent/mapping.rb
index cd85147f4..216c58e1a 100644
--- a/lib/sequencer/unit/import/freshdesk/agent/mapping.rb
+++ b/lib/sequencer/unit/import/freshdesk/agent/mapping.rb
@@ -14,15 +14,15 @@ class Sequencer
 
               provide_mapped do
                 {
-                  login:        contact['email'],
-                  firstname:    contact['name'],
-                  email:        contact['email'],
-                  phone:        contact['phone'],
-                  active:       contact['active'],
-                  group_ids:    group_ids,
-                  password:     password,
-                  image_source: contact['last_login_at'],
-                  role_ids:     ::Role.where(name: role_names).pluck(:id),
+                  login:      contact['email'],
+                  firstname:  contact['name'],
+                  email:      contact['email'],
+                  phone:      contact['phone'],
+                  active:     contact['active'],
+                  group_ids:  group_ids,
+                  password:   password,
+                  last_login: contact['last_login_at'],
+                  role_ids:   ::Role.where(name: role_names).pluck(:id),
                 }
               end
             end
diff --git a/spec/lib/sequencer/sequence/import/freshdesk/agent_spec.rb b/spec/lib/sequencer/sequence/import/freshdesk/agent_spec.rb
index 11059654a..52c3bcd44 100644
--- a/spec/lib/sequencer/sequence/import/freshdesk/agent_spec.rb
+++ b/spec/lib/sequencer/sequence/import/freshdesk/agent_spec.rb
@@ -60,11 +60,12 @@ RSpec.describe ::Sequencer::Sequence::Import::Freshdesk::Agent, sequencer: :sequ
     it 'imports user correctly' do # rubocop:disable RSpec/MultipleExpectations, RSpec/ExampleLength
       expect { process(process_payload) }.to change(User, :count).by(1)
       expect(User.last).to have_attributes(
-        firstname: 'John',
-        lastname:  'Doe',
-        login:     'freshdesk@example.com',
-        email:     'freshdesk@example.com',
-        active:    true,
+        firstname:  'John',
+        lastname:   'Doe',
+        login:      'freshdesk@example.com',
+        email:      'freshdesk@example.com',
+        active:     true,
+        last_login: DateTime.parse('2021-05-10T07:52:58Z'),
       )
     end