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

CRM-20892 Create Opportunistic locking mechanism in the CiviMail API… #10965

Merged
merged 3 commits into from
Oct 5, 2017
Merged

CRM-20892 Create Opportunistic locking mechanism in the CiviMail API… #10965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fc6d71
CRM-20892 Create Oppotunitistic locking mechanism in the CiviMail API…
seamuslee001 Sep 11, 2017
1f87b2a
Add test of new locking mechanism and minor fixes to api files
seamuslee001 Sep 11, 2017
c26f9b8
Move code out of the else and add in test of the lock mechanism as pe…
seamuslee001 Sep 14, 2017
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
8 changes: 3 additions & 5 deletions api/v3/Mailing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,9 @@ function civicrm_api3_mailing_create($params) {
if (!$timestampCheck) {
throw new API_Exception("Mailing has not been saved, Content maybe out of date, please refresh the page and try again");
}
else {
$safeParams['_evil_bao_validator_'] = 'CRM_Mailing_BAO_Mailing::checkSendable';
$result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $safeParams);
return _civicrm_api3_mailing_get_formatResult($result);
}
$safeParams['_evil_bao_validator_'] = 'CRM_Mailing_BAO_Mailing::checkSendable';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was that one Tim or me?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure but it was there before

$result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $safeParams);
return _civicrm_api3_mailing_get_formatResult($result);
}

/**
Expand Down
14 changes: 14 additions & 0 deletions tests/phpunit/api/v3/MailingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,4 +879,18 @@ public function testTrackableURLWithUnicodeSign() {
$this->assertContains($unicodeURL, $url);
}

/**
* CRM-20892 : Test if Mail.create API throws error on update,
* if modified_date less then the date when the mail was last updated/created
*/
public function testModifiedDateMismatchOnMailingUpdate() {
$mail = $this->callAPISuccess('mailing', 'create', $this->_params + array('modified_date' => 'now'));
try {
$this->callAPISuccess('mailing', 'create', $this->_params + array('id' => $mail['id'], 'modified_date' => '2 seconds ago'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'modified_date' => '2 seconds ago' ==> clever :)

}
catch (Exception $e) {
$this->assertRegExp("/Failure in api call for mailing create: Mailing has not been saved, Content maybe out of date, please refresh the page and try again/", $e->getMessage());
}
}

}