Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor adding link_tokens in import to separate methods

Browse Source 
[MAILPOET-2364]
This commit is contained in:
Rostislav Wolny
2019-09-17 16:05:20 +02:00
committed by Jack Kitterhing
parent d6d9885a1e
commit f27d764d13
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Subscribers/ImportExport/Import/Import.php
View File

@ -111,7 +111,8 @@ class Import {
// add, if required, missing required fields to new subscribers // add, if required, missing required fields to new subscribers
$new_subscribers = $this->addMissingRequiredFields($new_subscribers); $new_subscribers = $this->addMissingRequiredFields($new_subscribers);
$new_subscribers = $this->setSubscriptionStatusToSubscribed($new_subscribers); $new_subscribers = $this->setSubscriptionStatusToSubscribed($new_subscribers);
$new_subscribers = $this->setSourceAndLinkToken($new_subscribers); $new_subscribers = $this->setSource($new_subscribers);
$new_subscribers = $this->setLinkToken($new_subscribers);
$created_subscribers = $created_subscribers =
$this->createOrUpdateSubscribers( $this->createOrUpdateSubscribers(
'create', 'create',
@ -298,15 +299,20 @@ class Import {
return $subscribers_data; return $subscribers_data;
} }
private function setSourceAndLinkToken($subscribers_data) { private function setSource($subscribers_data) {
$subscribers_count = count($subscribers_data['data'][key($subscribers_data['data'])]); $subscribers_count = count($subscribers_data['data'][key($subscribers_data['data'])]);
$subscribers_data['fields'][] = 'source'; $subscribers_data['fields'][] = 'source';
$subscribers_data['fields'][] = 'link_token';
$subscribers_data['data']['source'] = array_fill( $subscribers_data['data']['source'] = array_fill(
0, 0,
$subscribers_count, $subscribers_count,
Source::IMPORTED Source::IMPORTED
); );
return $subscribers_data;
}
private function setLinkToken($subscribers_data) {
$subscribers_count = count($subscribers_data['data'][key($subscribers_data['data'])]);
$subscribers_data['fields'][] = 'link_token';
$subscribers_data['data']['link_token'] = array_map( $subscribers_data['data']['link_token'] = array_map(
function () { function () {
return Security::generateRandomString(Subscriber::LINK_TOKEN_LENGTH); return Security::generateRandomString(Subscriber::LINK_TOKEN_LENGTH);