Skip to content

Commit

Permalink
Reduce db traffic
Browse files Browse the repository at this point in the history
  • Loading branch information
@flack
flack committed Oct 5, 2019
1 parent 1da0e91 commit f6e48a9
Show file tree
Hide file tree
Showing 25 changed files with 173 additions and 168 deletions.
17 changes: 5 additions & 12 deletions test/org/openpsa/directmarketing/__helper/campaign.php
View file
Expand Up @@ -13,17 +13,10 @@
*/ */
class openpsa_test_campaign_helper class openpsa_test_campaign_helper
{ {
private $_testcase;

private $_campaign; private $_campaign;
private $_member; private $_member;
private $_message; private $_message;


public function __construct(openpsa_testcase $testcase)
{
$this->_testcase = $testcase;
}

public function get_campaign($type = org_openpsa_directmarketing_campaign_dba::TYPE_NORMAL) public function get_campaign($type = org_openpsa_directmarketing_campaign_dba::TYPE_NORMAL)
{ {
if (!$this->_campaign) { if (!$this->_campaign) {
Expand All @@ -33,7 +26,7 @@ public function get_campaign($type = org_openpsa_directmarketing_campaign_dba::T
'node' => $topic->id, 'node' => $topic->id,
'orgOpenpsaObtype' => $type 'orgOpenpsaObtype' => $type
]; ];
$this->_campaign = $this->_testcase->create_object(org_openpsa_directmarketing_campaign_dba::class, $attributes); $this->_campaign = openpsa_testcase::create_class_object(org_openpsa_directmarketing_campaign_dba::class, $attributes);
} }


return $this->_campaign; return $this->_campaign;
Expand All @@ -47,7 +40,7 @@ public function get_member(midcom_db_person $person)
'campaign' => $campaign->id, 'campaign' => $campaign->id,
'person' => $person->id 'person' => $person->id
]; ];
$this->_member = $this->_testcase->create_object(org_openpsa_directmarketing_campaign_member_dba::class, $parameters); $this->_member = openpsa_testcase::create_class_object(org_openpsa_directmarketing_campaign_member_dba::class, $parameters);
} }
return $this->_member; return $this->_member;
} }
Expand All @@ -61,7 +54,7 @@ public function get_log(org_openpsa_directmarketing_campaign_message_dba $messag
'token' => __CLASS__ . __FUNCTION__, 'token' => __CLASS__ . __FUNCTION__,
'target' => 'http://openpsa2.org' 'target' => 'http://openpsa2.org'
]; ];
return $this->_testcase->create_object(org_openpsa_directmarketing_link_log_dba::class, $parameters); return openpsa_testcase::create_class_object(org_openpsa_directmarketing_link_log_dba::class, $parameters);
} }


public function get_receipt(org_openpsa_directmarketing_campaign_message_dba $message, midcom_db_person $person) public function get_receipt(org_openpsa_directmarketing_campaign_message_dba $message, midcom_db_person $person)
Expand All @@ -73,7 +66,7 @@ public function get_receipt(org_openpsa_directmarketing_campaign_message_dba $me
'token' => __CLASS__ . __FUNCTION__, 'token' => __CLASS__ . __FUNCTION__,
'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT 'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT
]; ];
return $this->_testcase->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, $parameters); return openpsa_testcase::create_class_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, $parameters);
} }


public function get_message() public function get_message()
Expand All @@ -83,7 +76,7 @@ public function get_message()
$parameters = [ $parameters = [
'campaign' => $campaign->id, 'campaign' => $campaign->id,
]; ];
$this->_message = $this->_testcase->create_object(org_openpsa_directmarketing_campaign_message_dba::class, $parameters); $this->_message = openpsa_testcase::create_class_object(org_openpsa_directmarketing_campaign_message_dba::class, $parameters);
} }
return $this->_message; return $this->_message;
} }
Expand Down
2 changes: 1 addition & 1 deletion test/org/openpsa/directmarketing/campaign/messageTest.php
View file
Expand Up @@ -15,7 +15,7 @@ class org_openpsa_directmarketing_campaign_messageTest extends openpsa_testcase
{ {
public function testCRUD() public function testCRUD()
{ {
$helper = new openpsa_test_campaign_helper($this); $helper = new openpsa_test_campaign_helper;
$campaign = $helper->get_campaign(); $campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');
Expand Down
12 changes: 8 additions & 4 deletions test/org/openpsa/directmarketing/handler/campaign/adminTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_campaign_adminTest extends openpsa_tes
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_edit() public function testHandler_edit()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -35,8 +40,7 @@ public function testHandler_edit()


public function testHandler_delete() public function testHandler_delete()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down
2 changes: 1 addition & 1 deletion test/org/openpsa/directmarketing/handler/campaign/campaignTest.php
View file
Expand Up @@ -22,7 +22,7 @@ public static function setUpBeforeClass()


public function testHandler_view() public function testHandler_view()
{ {
$helper = new openpsa_test_campaign_helper($this); $helper = new openpsa_test_campaign_helper;
$campaign = $helper->get_campaign(); $campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');
Expand Down
12 changes: 8 additions & 4 deletions test/org/openpsa/directmarketing/handler/campaign/rulesTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_campaign_rulesTest extends openpsa_tes
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_edit_query() public function testHandler_edit_query()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign(org_openpsa_directmarketing_campaign_dba::TYPE_SMART);
$campaign = $helper->get_campaign(org_openpsa_directmarketing_campaign_dba::TYPE_SMART);


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -40,8 +45,7 @@ public function testHandler_edit_query()


public function testHandler_query() public function testHandler_query()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign(org_openpsa_directmarketing_campaign_dba::TYPE_SMART);
$campaign = $helper->get_campaign(org_openpsa_directmarketing_campaign_dba::TYPE_SMART);


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down
2 changes: 1 addition & 1 deletion test/org/openpsa/directmarketing/handler/exportTest.php
View file
Expand Up @@ -22,7 +22,7 @@ public static function setUpBeforeClass()


public function testHandler_csv() public function testHandler_csv()
{ {
$helper = new openpsa_test_campaign_helper($this); $helper = new openpsa_test_campaign_helper;
$campaign = $helper->get_campaign(); $campaign = $helper->get_campaign();
$helper->get_member(self::$_person); $helper->get_member(self::$_person);


Expand Down
18 changes: 10 additions & 8 deletions test/org/openpsa/directmarketing/handler/importTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_importTest extends openpsa_testcase
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_index() public function testHandler_index()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -35,8 +40,7 @@ public function testHandler_index()


public function testHandler_simpleemails() public function testHandler_simpleemails()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down Expand Up @@ -69,8 +73,7 @@ public function testHandler_simpleemails()


public function testHandler_csv_select() public function testHandler_csv_select()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -81,8 +84,7 @@ public function testHandler_csv_select()


public function testHandler_vcards() public function testHandler_vcards()
{ {
$helper = new openpsa_test_campaign_helper($this); $campaign = self::$helper->get_campaign();
$campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down
19 changes: 11 additions & 8 deletions test/org/openpsa/directmarketing/handler/loggerTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_loggerTest extends openpsa_testcase
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_bounce() public function testHandler_bounce()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();
$token = uniqid(); $token = uniqid();
$this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [ $this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [
'token' => $token, 'token' => $token,
Expand All @@ -42,10 +47,9 @@ public function testHandler_bounce()


public function testHandler_link() public function testHandler_link()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();
$token = uniqid(); $token = uniqid();
$receipt = $this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [ $this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [
'token' => $token, 'token' => $token,
'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT, 'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT,
'message' => $message->id 'message' => $message->id
Expand Down Expand Up @@ -74,10 +78,9 @@ public function testHandler_link()


public function testHandler_redirect() public function testHandler_redirect()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();
$token = 'a' . uniqid(); $token = 'a' . uniqid();
$receipt = $this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [ $this->create_object(org_openpsa_directmarketing_campaign_messagereceipt_dba::class, [
'token' => $token, 'token' => $token,
'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT, 'orgOpenpsaObtype' => org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT,
'message' => $message->id 'message' => $message->id
Expand Down
15 changes: 9 additions & 6 deletions test/org/openpsa/directmarketing/handler/message/adminTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_message_adminTest extends openpsa_test
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_edit() public function testHandler_edit()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -35,8 +40,7 @@ public function testHandler_edit()


public function testHandler_copy() public function testHandler_copy()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -48,8 +52,7 @@ public function testHandler_copy()


public function testHandler_delete() public function testHandler_delete()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down
12 changes: 8 additions & 4 deletions test/org/openpsa/directmarketing/handler/message/composeTest.php
View file
Expand Up @@ -15,15 +15,20 @@ class org_openpsa_directmarketing_handler_message_composeTest extends openpsa_te
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_compose() public function testHandler_compose()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -35,8 +40,7 @@ public function testHandler_compose()


public function testHandler_compose4person() public function testHandler_compose4person()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down
2 changes: 1 addition & 1 deletion test/org/openpsa/directmarketing/handler/message/createTest.php
View file
Expand Up @@ -22,7 +22,7 @@ public static function setUpBeforeClass()


public function testHandler_create() public function testHandler_create()
{ {
$helper = new openpsa_test_campaign_helper($this); $helper = new openpsa_test_campaign_helper;
$campaign = $helper->get_campaign(); $campaign = $helper->get_campaign();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');
Expand Down
2 changes: 1 addition & 1 deletion test/org/openpsa/directmarketing/handler/message/listTest.php
View file
Expand Up @@ -22,7 +22,7 @@ public static function setUpBeforeClass()


public function testHandler_list() public function testHandler_list()
{ {
$helper = new openpsa_test_campaign_helper($this); $helper = new openpsa_test_campaign_helper;
$campaign = $helper->get_campaign(); $campaign = $helper->get_campaign();
$helper->get_message(); $helper->get_message();


Expand Down
16 changes: 10 additions & 6 deletions test/org/openpsa/directmarketing/handler/message/reportTest.php
View file
Expand Up @@ -15,17 +15,22 @@ class org_openpsa_directmarketing_handler_message_reportTest extends openpsa_tes
{ {
protected static $_person; protected static $_person;


/**
* @var openpsa_test_campaign_helper
*/
private static $helper;

public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
self::$_person = self::create_user(true); self::$_person = self::create_user(true);
self::$helper = new openpsa_test_campaign_helper;
} }


public function testHandler_report() public function testHandler_report()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message(); self::$helper->get_log($message, self::$_person);
$helper->get_log($message, self::$_person); self::$helper->get_receipt($message, self::$_person);
$helper->get_receipt($message, self::$_person);


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand All @@ -36,8 +41,7 @@ public function testHandler_report()


public function testHandler_status() public function testHandler_status()
{ {
$helper = new openpsa_test_campaign_helper($this); $message = self::$helper->get_message();
$message = $helper->get_message();


midcom::get()->auth->request_sudo('org.openpsa.directmarketing'); midcom::get()->auth->request_sudo('org.openpsa.directmarketing');


Expand Down

0 comments on commit f6e48a9

Please sign in to comment.