From 9b78b60c5087e5ef913b25ef09aa9db91b7f89df Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 22 Apr 2022 09:31:57 +1200
Subject: [PATCH] [REF] [Import] Create user-job records for Memership imports

---
 CRM/Import/Form/DataSource.php      | 7 +++++++
 CRM/Member/Import/Form/MapField.php | 2 ++
 CRM/Member/Import/Form/Preview.php  | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php
index bf8c60984d..558104298a 100644
--- a/CRM/Import/Form/DataSource.php
+++ b/CRM/Import/Form/DataSource.php
@@ -157,6 +157,12 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
   protected function submitFileForMapping($parserClassName, $entity = NULL) {
     $this->controller->resetPage('MapField');
     CRM_Core_Session::singleton()->set('dateTypes', $this->getSubmittedValue('dateFormats'));
+    if (!$this->getUserJobID()) {
+      $this->createUserJob();
+    }
+    else {
+      $this->updateUserJobMetadata('submitted_values', $this->getSubmittedValues());
+    }
 
     $mapper = [];
 
@@ -165,6 +171,7 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
       $parser->setEntity($this->get($entity));
     }
     $parser->setMaxLinesToProcess(100);
+    $parser->setUserJobID($this->getUserJobID());
     $parser->run(
       $this->getSubmittedValue('uploadFile'),
       $this->getSubmittedValue('fieldSeparator'),
diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php
index d73c996e3f..63272188b3 100644
--- a/CRM/Member/Import/Form/MapField.php
+++ b/CRM/Member/Import/Form/MapField.php
@@ -391,6 +391,7 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
       $this->controller->resetPage($this->_name);
       return;
     }
+    $this->updateUserJobMetadata('submitted_values', $this->getSubmittedValues());
 
     $mapperKeys = [];
     $mapper = [];
@@ -468,6 +469,7 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
     }
 
     $parser = new CRM_Member_Import_Parser_Membership($mapperKeysMain, $mapperLocType, $mapperPhoneType);
+    $parser->setUserJobID($this->getUserJobID());
     $parser->run($this->getSubmittedValue('uploadFile'), $this->getSubmittedValue('fieldSeparator'), $mapper, $this->getSubmittedValue('skipColumnHeader'),
       CRM_Import_Parser::MODE_PREVIEW, $this->get('contactType')
     );
diff --git a/CRM/Member/Import/Form/Preview.php b/CRM/Member/Import/Form/Preview.php
index 7e84f5f52d..e1226987d4 100644
--- a/CRM/Member/Import/Form/Preview.php
+++ b/CRM/Member/Import/Form/Preview.php
@@ -100,7 +100,8 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview {
       }
     }
 
-    $parser = new CRM_Member_Import_Parser_Membership($mapperKeys, $mapperLocType, $mapperPhoneType);
+    $parser = new CRM_Member_Import_Parser_Membership($mapperKeys);
+    $parser->setUserJobID($this->getUserJobID());
 
     $mapFields = $this->get('fields');
 
-- 
2.25.1