Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#561 Add in Upgrade routine to convert log_date smart group s… #15702

Merged
merged 2 commits into from
Nov 2, 2019
Merged

dev/core#561 Add in Upgrade routine to convert log_date smart group s… #15702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e0d21
dev/core#561 Add in Upgrade routine to convert log_date smart group s…
seamuslee001 Nov 1, 2019
3a431ea
Switch default handling so that we convert to created_date field by d…
seamuslee001 Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions CRM/Upgrade/Incremental/SmartGroups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public function datePickerConversion($fields) {
'relationship_start_date' => 'relation_start',
'relationship_end_date' => 'relation_end',
'event' => 'event',
'created_date' => 'log',
'modified_date' => 'log',
];

foreach ($fields as $field) {
Expand Down Expand Up @@ -254,4 +256,41 @@ protected function getSearchesWithField($field) {

}

/**
* Convert the log_date saved search date fields to their correct name
* default to switching to created_date as that is what the code did originally
*/
public function renameLogFields() {
$addedDate = TRUE;
foreach ($this->getSearchesWithField('log_date') as $savedSearch) {
$formValues = $savedSearch['form_values'];
foreach ($formValues as $index => $formValue) {
if (isset($formValue[0]) && $formValue[0] === 'log_date') {
if ($formValue[2] == 2) {
$addedDate = FALSE;
}
}
if (isset($formValue[0]) && ($formValue[0] === 'log_date_high' || $formValue[0] === 'log_date_low')) {
$isHigh = substr($index, -5, 5) === '_high';
if ($addedDate) {
$fieldName = 'created_date';
}
else {
$fieldName = 'modified_date';
}
if ($isHigh) {
$fieldName .= '_high';
}
else {
$fieldName .= '_low';
}
$formValues[$index][0] = $fieldName;
}
}
if ($formValues !== $savedSearch['form_values']) {
civicrm_api3('SavedSearch', 'create', ['id' => $savedSearch['id'], 'form_values' => $formValues]);
}
}
}

}
5 changes: 5 additions & 0 deletions CRM/Upgrade/Incremental/php/FiveTwenty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ public function upgrade_5_20_alpha1($rev) {
['old' => 'event_end_date_high', 'new' => 'event_high'],
],
]);
$this->addTask('Convert Log date searches to their final names either created date or modified date', 'updateSmartGroups', [
'renameLogFields' => [],
]);
$this->addTask('Update smart groups where jcalendar fields have been converted to datepicker', 'updateSmartGroups', [
'datepickerConversion' => [
'birth_date',
Expand All @@ -134,6 +137,8 @@ public function upgrade_5_20_alpha1($rev) {
'relationship_end_date',
'event',
'relation_active_period_date',
'created_date',
'modified_date',
],
]);
$this->addTask('Clean up unused table "civicrm_persistent"', 'dropTableIfEmpty', 'civicrm_persistent');
Expand Down
95 changes: 95 additions & 0 deletions tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,101 @@ public function testMultipleEventSmartGroupDateConversions() {
}
}

/**
* Test Log Date conversion
*/
public function testLogDateConversion() {
// Create two sets of searches one set for added by and one for modified by
// Each set contains a relative search on this.month and a specific date search low
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date', '=', 1],
['log_date_low', '=', '20191001000000'],
['log_date_high', '=', '20191031235959'],
'relative_dates' => [
'log' => 'this.month',
],
],
]);
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date', '=', 1],
['log_date_low', '=', '20191001000000'],
],
]);
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date', '=', 2],
['log_date_low', '=', '20191001000000'],
['log_date_high', '=', '20191031235959'],
'relative_dates' => [
'log' => 'this.month',
],
],
]);
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date', '=', 2],
['log_date_low', '=', '20191001000000'],
],
]);
// On the original search form you didn't need to select the log_date radio
// If it wasn't selected it defaulted to created_date filtering.
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date_low', '=', '20191001000000'],
['log_date_high', '=', '20191031235959'],
'relative_dates' => [
'log' => 'this.month',
],
],
]);
$this->callAPISuccess('SavedSearch', 'create', [
'form_values' => [
['log_date_low', '=', '20191001000000'],
],
]);
$smartGroupConversionObject = new CRM_Upgrade_Incremental_SmartGroups();
$smartGroupConversionObject->renameLogFields();
$smartGroupConversionObject->updateGroups([
'datepickerConversion' => [
'created_date',
'modified_date',
],
]);
$savedSearhes = $this->callAPISuccess('SavedSearch', 'get', []);
$expectedResults = [
1 => [
0 => ['log_date', '=', 1],
'relative_dates' => [],
3 => ['created_date_relative', '=', 'this.month'],
],
2 => [
0 => ['log_date', '=', 1],
1 => ['created_date_low', '=', '2019-10-01 00:00:00'],
2 => ['created_date_relative', '=', 0],
],
3 => [
0 => ['log_date', '=', 2],
'relative_dates' => [],
3 => ['modified_date_relative', '=', 'this.month'],
],
4 => [
0 => ['log_date', '=', 2],
1 => ['modified_date_low', '=', '2019-10-01 00:00:00'],
2 => ['modified_date_relative', '=', 0],
],
5 => [
'relative_dates' => [],
2 => ['created_date_relative', '=', 'this.month'],
],
6 => [
0 => ['created_date_low', '=', '2019-10-01 00:00:00'],
1 => ['created_date_relative', '=', 0],
],
];
}

/**
* Test converting relationship fields
*/
Expand Down