| ' + notification.branch + ' | ';
+ row += '' + notification.comparison + ' | ';
+ row += '' + notification.value + ' | ';
+ row += createActionLink('Edit notification', 'editAggregateMetricNotification', '/public/images/icons/edit.png', 'Edit');
+ row += createActionLink('Edit users', 'editAggregateMetricNotificationUsers', '/public/images/icons/email_error.png', 'Users');
+ row += createActionLink('Remove notification', 'removeAggregateMetricNotification', '/public/images/icons/close.png', 'Delete');
+ row += ' |
';
+ $('#aggregateMetricNotificationsTable tbody').append(row);
+ }
+
+ /** Remove highlight from active notification row. */
+ function unhighlightActiveAlertRow() {
+ $('#aggregateMetricNotificationsTable tbody tr').each(function (ind, elem) {
+ $(this).removeClass('activeRow');
+ });
+ $('#aggregateMetricNotificationEdit').hide();
+ $('#aggregateMetricNotificationUsers').hide();
+ $('#aggregateMetricNotificationCancel').show();
+ }
+
+ /**
+ * Highlight the alert row which houses the current action in the Notifications table,
+ * sets the activeNotification closure variable to the alert in the row.
+ * @param element actionLink the anchor element that was clicked.
+ */
+ function activateAlertRow(actionLink) {
+ unhighlightActiveAlertRow();
+ $('#aggregateMetricNotificationValidationError').text('');
+ actionLink.closest('tr').addClass('activeRow');
+ $('#aggregateMetricNotificationCancel').hide();
+ var notificationId = actionLink.data('aggregate_metric_notification_id');
+ activeNotification = activeSpecNotifications[notificationId];
+ }
+
+ /**
+ * Validates the current notification input fields, whether for an edited
+ * notification or a new one.
+ * @return bool indicating whether validation succeeded.
+ */
+ function validateNotification() {
+ var branch = $('#aggregateMetricNotificationBranch').val();
+ if (branch === null || branch === '') {
+ $('#aggregateMetricNotificationValidationError').text('branch cannot be empty');
+ return false;
+ }
+ var comparison = $('#aggregateMetricNotificationComparison').val();
+ if (comparison === null || comparison === '') {
+ $('#aggregateMetricNotificationValidationError').text('comparison cannot be empty');
+ return false;
+ }
+ var value = $('#aggregateMetricNotificationValue').val();
+ if (value === null || value === '' || !$.isNumeric(value)) {
+ $('#aggregateMetricNotificationValidationError').text('value must be numeric');
+ return false;
+ }
+ $('#aggregateMetricNotificationValidationError').text('');
+ return true;
+ }
+
+ /**
+ * Deactivate the current notification and hide any notification details panels.
+ */
+ function hideNotificationDetailPanel() {
+ $('.editAlert').hide();
+ $('.createAlert').hide();
+ $('#aggregateMetricNotificationSaveLoading').hide();
+ $('div#aggregateMetricNotificationSaveState input').prop('disabled', false);
+ unhighlightActiveAlertRow();
+ $('#aggregateMetricNotificationEdit').hide();
+ $('#aggregateMetricNotificationCancel').show();
+ }
+
+ // Notification panel handlers
+ // Notifications and Alerts are considered equivalent, "Alert" is shorter
+
+ /**
+ * Handler for edit notification users action, activates the notification
+ * and loads any users tied to the notification to display them in the
+ * users table.
+ * The handler is tied to a static parent as the links can be
+ * dynamically generated through creation of new alerts.
+ */
+ $('#aggregateMetricNotificationsTable').on('click', 'a.editAggregateMetricNotificationUsers', function() {
+ activateAlertRow($(this));
+ $('#aggregateMetricNotificationUsers').show();
+ $('#aggregateMetricSpecAlertedUsers').find('tr:gt(0)').remove();
+ for(var userInd = 0; userInd < activeNotification.users.length; userInd += 1) {
+ var user = activeNotification.users[userInd];
+ addToAlertedUsersTable(user.firstname +' '+user.lastname, user.user_id);
+ }
+ addClassesToTableRows('aggregateMetricSpecAlertedUsers');
+ });
+
+ /**
+ * Handler for edit notification action, activates the notification
+ * and loads the notification into fields such that it can be edited.
+ * The handler is tied to a static parent as the links can be
+ * dynamically generated through creation of new alerts.
+ */
+ $('#aggregateMetricNotificationsTable').on('click', 'a.editAggregateMetricNotification', function() {
+ activateAlertRow($(this));
+ $('#aggregateMetricNotificationEdit').show();
+ $('#aggregateMetricNotificationBranch').val(activeNotification.notification.branch);
+ $('#aggregateMetricNotificationValue').val(activeNotification.notification.value);
+ $('#aggregateMetricNotificationComparison').val(activeNotification.notification.comparison);
+ $('#aggregateMetricNotificationCreate').hide();
+ $('#aggregateMetricNotificationUpdate').show();
+ $('.editAlert').show();
+ $('.createAlert').hide();
+ });
+
+ /**
+ * Handler for Remove notification action, delete the notification and
+ * any associated alerted users.
+ * The handler is tied to a static parent as the links can be
+ * dynamically generated through creation of new alerts.
+ */
+ $('#aggregateMetricNotificationsTable').on('click', 'a.removeAggregateMetricNotification', function() {
+ hideNotificationDetailPanel();
+ var row = $(this).closest('tr');
+ activateAlertRow($(this));
+ var notificationId = $(this).data('aggregate_metric_notification_id');
+ $('#aggregateMetricNotificationRemoveLoading').show();
+ aggregatemetricnotificationRest('DELETE', notificationId, {}, function (retVal) {
+ row.remove();
+ $('#aggregateMetricNotificationRemoveLoading').hide();
+ delete activeSpecNotifications[notificationId];
+ unhighlightActiveAlertRow();
+ addClassesToTableRows('aggregateMetricNotificationsTable');
+ });
+ });
+
+ /**
+ * Handler for adding a new notification to the active Spec.
+ */
+ $('#addAggregateMetricNotification').click(function () {
+ unhighlightActiveAlertRow();
+ $('#aggregateMetricNotificationUpdate').hide();
+ $('#aggregateMetricNotificationBranch').val('');
+ $('#aggregateMetricNotificationComparison').val('');
+ $('#aggregateMetricNotificationValue').val('');
+ $('#aggregateMetricNotificationCreate').show();
+ $('#aggregateMetricNotificationEdit').show();
+ $('div#aggregateMetricNotificationSaveState input').prop('disabled', false);
+ $('#aggregateMetricNotificationValidationError').text('');
+ $('#aggregateMetricNotificationSaveState').show();
+ $('#aggregateMetricNotificationCancel').hide();
+ $('.editAlert').hide();
+ $('.createAlert').show();
+ });
+
+ // Notification panel button handlers
+
+ /**
+ * Handler for Cancel button:
+ * hide any notification detail panel and de-activate any notification row.
+ */
+ $('#aggregateMetricNotificationCancel').click(function () {
+ $('#aggregateMetricUserAlerts').hide();
+ unhighlightActiveAlertRow();
+ unhighlightActiveRow();
+ hideNotificationDetailPanel();
+ });
+
+ /**
+ * Update the active notification with the input fields.
+ */
+ $('input#aggregateMetricNotificationUpdate').click(function () {
+ if (validateNotification()) {
+ $('div#aggregateMetricNotificationSaveState input').prop('disabled', true);
+ $('#aggregateMetricNotificationSaveLoading').show();
+ var notificationUpdates = {
+ branch: $('#aggregateMetricNotificationBranch').val(),
+ comparison: $('#aggregateMetricNotificationComparison').val(),
+ value: $('#aggregateMetricNotificationValue').val()
+ };
+ var notificationId = activeNotification.notification.aggregate_metric_notification_id;
+ aggregatemetricnotificationRest('PUT', notificationId, notificationUpdates, function (retVal) {
+ activeSpecNotifications[notificationId].notification = retVal;
+ $('#aggregateMetricNotificationsTable td#amnBranch'+notificationId).html(retVal.branch);
+ $('#aggregateMetricNotificationsTable td#amnValue'+notificationId).html(retVal.value);
+ $('#aggregateMetricNotificationsTable td#amnComparison'+notificationId).html(retVal.comparison);
+ hideNotificationDetailPanel();
+ });
+ }
+ });
+
+ /**
+ * Cancel editing or creating a notification.
+ */
+ $('#aggregateMetricNotificationSaveCancel').click(function () {
+ hideNotificationDetailPanel();
+ });
+
+ /**
+ * Create a new notification with the input fields tied to the active Spec.
+ */
+ $('input#aggregateMetricNotificationCreate').click(function () {
+ if (validateNotification()) {
+ $('div#aggregateMetricNotificationSaveState input').prop('disabled', true);
+ var notificationProperties = {
+ aggregate_metric_spec_id: $('#aggregateMetricSpecEditId').val(),
+ branch: $('#aggregateMetricNotificationBranch').val(),
+ comparison: $('#aggregateMetricNotificationComparison').val(),
+ value: $('#aggregateMetricNotificationValue').val()
+ };
+ $('#aggregateMetricNotificationSaveLoading').show();
+ aggregatemetricnotificationRest('POST', null, notificationProperties, function (retVal) {
+ hideNotificationDetailPanel();
+ addToNotificationTable(retVal);
+ activeSpecNotifications[retVal.aggregate_metric_notification_id] = {
+ notification: retVal,
+ users: []
+ };
+ addClassesToTableRows('aggregateMetricNotificationsTable');
+ });
+ }
+ });
+
//:~ Alerted Users panel
/**
@@ -476,13 +714,13 @@ $(document).ready(function () {
function addToAlertedUsersTable(userName, userId) {
function createActionLink(qtip, actionClass, imgPath, label) {
- var actionLink = ' | ' + userName + ' | ';
- row += createActionLink('Remove user from alerts', 'removeAlertedUser', '/public/images/icons/close.png', 'Remove alerts');
+ row += createActionLink('Remove user from alerts', 'removeAlertedUser', '/public/images/icons/close.png', 'Remove alert');
row += ' |
';
$('#aggregateMetricSpecAlertedUsers tbody').append(row);
}
@@ -497,12 +735,10 @@ $(document).ready(function () {
$('#aggregateMetricSpecAlertedUsers').on('click', 'a.removeAlertedUser', function() {
var row = $(this).closest('tr');
row.addClass('activeRow');
- var aggregateMetricSpecId = $('#aggregateMetricSpecEditId').val();
$('#aggregateMetricSpecAlertsLoading').show();
var userId = $(this).data('user_id');
-
var jsonMethod = 'midas.tracker.aggregatemetricspecnotifieduser.delete';
- var args = 'aggregateMetricSpecId=' + aggregateMetricSpecId + '&userId=' + userId;
+ var args = 'aggregateMetricNotificationId=' + activeNotification.notification.aggregate_metric_notification_id + '&userId=' + userId;
callAjaxWebApi(jsonMethod, 'POST', args, function (retVal) {
if (retVal.data && retVal.data.user_id == userId) {
row.remove();
@@ -516,6 +752,7 @@ $(document).ready(function () {
});
// Live search for users
+
$.widget('custom.catcomplete', $.ui.autocomplete, {
_renderMenu: function (ul, items) {
'use strict';
@@ -570,12 +807,11 @@ $(document).ready(function () {
$('#aggregateMetricSpecAlertsLoading').show();
var userId = ui.item.userid;
var userName = ui.item.value;
- var aggregateMetricSpecId = $('#aggregateMetricSpecEditId').val();
-
var jsonMethod = 'midas.tracker.aggregatemetricspecnotifieduser.create';
- var args = 'aggregateMetricSpecId=' + aggregateMetricSpecId + '&userId=' + userId;
+ var args = 'aggregateMetricNotificationId=' + activeNotification.notification.aggregate_metric_notification_id + '&userId=' + userId;
callAjaxWebApi(jsonMethod, 'POST', args, function (retVal) {
if (retVal.data && retVal.data.user_id == userId) {
+ activeNotification.users.push(retVal.data);
addToAlertedUsersTable(userName, userId);
addClassesToTableRows('aggregateMetricSpecAlertedUsers');
$('#addAlertUserSearchValue').val('init');
@@ -606,8 +842,7 @@ $(document).ready(function () {
/** Handler for Alerts Users Done button, hide the alerts panel. */
$('input#aggregateMetricSpecUserAlertsDone').click(function () {
- $('div#aggregateMetricUserAlerts').hide();
- unhighlightActiveRow();
+ hideNotificationDetailPanel();
});
// Initialize the dialog now that it is loaded.
diff --git a/modules/tracker/public/scss/producer/producer.aggregatemetric.scss b/modules/tracker/public/scss/producer/producer.aggregatemetric.scss
index da5fafc90..dcb6ed6fd 100644
--- a/modules/tracker/public/scss/producer/producer.aggregatemetric.scss
+++ b/modules/tracker/public/scss/producer/producer.aggregatemetric.scss
@@ -1,232 +1,129 @@
// Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.
-a {
- &.aggregateMetricSpecAction {
- color: #56758b;
-
- &:hover {
- background-color: #E5E5E5;
- cursor: pointer;
- }
- }
-
- &.alertedUsersAction {
- color: #56758b;
-
- &:hover {
- background-color: #E5E5E5;
- cursor: pointer;
- }
- }
-}
-
-div {
- &#addAggregateMetricSpec {
- margin-top: 10px;
- }
-
- &#aggregateMetricSpecList {
- margin-top: 10px;
- }
-
- &.aggregateMetricSpecCreate {
- border-top: 2px solid darkblue !important;
- }
+div#aggregateMetricSpecManage {
+ table {
+ width: 100%;
- &.aggregateMetricSpecEdit {
- border-top: 2px solid darkblue !important;
- }
+ &.actionTable {
+ table-layout: fixed;
+ border: 2px solid #ddd;
+ margin-top: 15px;
+ margin-bottom: 15px;
- &#aggregateMetricSpecEditWarning {
- padding-top: 10px;
- padding-bottom: 10px;
- color: orange;
- }
+ tr.activeRow {
+ border: 2px solid darkblue;
+ background-color: #c0d1fe !important;
+ }
- &#aggregateMetricUserAlerts {
- border-top: 2px solid darkblue;
- color: #555;
- font-size: 13px;
- margin-top: 15px;
- margin-bottom: 10px;
- padding-top: 10px;
- text-align: center;
+ tr.even {
+ background-color: #f4f4f4;
+ }
- div#aggregateMetricUserAlertsThreshold {
- margin-top: 15px;
- margin-bottom: 10px;
+ th {
+ border-bottom: solid 1px black;
- table#aggregateMetricUserAlertsThresholdDefinition {
- margin-top: 10px;
+ &:last-of-type {
+ text-align: center;
+ border-left: dotted 1px black;
+ width: 30%;
+ }
+ }
- td:first-of-type {
- text-align: left;
+ td {
+ &:last-of-type {
+ border-left: dotted 1px black;
}
}
- }
- textarea#aggregateMetricUserAlertsSpec {
- margin-top: 10px;
- width: 100%;
- }
+ span.actionsList {
+ display: flex;
+ justify-content: space-around;
- div#addAggregateMetricSpecAlertUser {
- margin-top: 15px;
- text-align: center;
+ a:first-of-type {
+ padding-left: 5px;
+ }
+ }
}
-
- div.alertUserSearch {
- margin-top: 10px;
-
+ &.fieldTable {
input {
width: 100%;
}
+ select {
+ width: 100%;
+ }
}
}
- &.aggregateMetricSectionTitle {
- border-top: 1px solid #d7d7d7;
- color: #555;
- font-size: 13px;
- margin-top: 15px;
- margin-bottom: 10px;
- padding-top: 10px;
- text-align: center;
- }
-
-
- &.resultingMetricText {
- color: #555;
- font-size: 12px;
- margin-top: 10px;
- text-align: center;
- }
-
- &#aggregateMetricSpecUserAlertsSaveState {
- margin-top: 20px;
-
- input {
- background: #f6f9fe;
- border: 1px solid #808080;
- color: #2e6e9e;
- cursor: pointer;
- float: right;
- margin-left: 10px;
- }
- }
-
- &#aggregateMetricSpecSaveState {
- margin-top: 20px;
+ a.actionLink {
+ color: #56758b;
- input {
- background: #f6f9fe;
- border: 1px solid #808080;
- color: #2e6e9e;
+ &:hover {
+ background-color: #E5E5E5;
cursor: pointer;
- float: right;
- margin-left: 10px;
- }
-
- input:disabled {
- color: #c0c0c0;
- cursor: not-allowed;
}
}
-
-
-}
-
-label {
- &#aggregateMetricSpecValidationError {
+ label.validationError {
color: crimson;
}
-}
-
-img {
- &#aggregateMetricSpecSaveLoading {
- float: left;
- margin-right: 15px;
- }
-
- &#aggregateMetricSpecDeleteLoading {
- float: right;
- margin-right: 40px;
- }
-
- &#aggregateMetricSpecAlertsLoading {
- float: left;
- }
-}
-
-table {
-
- &#aggregateMetricSpecAlertedUsers {
- table-layout: fixed;
- border: 2px solid #ddd;
- width: 100%;
- th {
- border-bottom: solid 1px black;
+ div {
+ &.subsectionTitle {
+ border-top: 2px solid darkblue;
+ margin-top: 15px;
+ margin-bottom: 15px;
+ padding-top: 10px;
+ color: #555;
+ font-size: 13px;
text-align: center;
-
- &:first-of-type {
- width: 70%;
- border-right: dotted 1px black;
- }
+ font-weight: bold;
}
-
- tr.even {
- background-color: #f4f4f4;
- }
-
- td.userName {
- border-right: dotted 1px black;
- text-align: left;
- }
-
- tr.activeRow {
- border: 2px solid darkblue;
- background-color: #c0d1fe;
+ &.subsubsectionTitle {
+ color: #555;
+ font-size: 12px;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ text-align: center;
}
- }
-
-
- &#aggregateMetricSpecListTable {
- table-layout: fixed;
- border: 2px solid #ddd;
- width: 100%;
+ &.saveState {
+ margin-top: 15px;
- th {
- border-bottom: solid 1px black;
- text-align: center;
+ input {
+ background: #f6f9fe;
+ border: 1px solid #808080;
+ color: #2e6e9e;
+ cursor: pointer;
+ float: right;
+ margin-left: 10px;
+ }
- &:first-of-type {
- width: 70%;
- border-right: dotted 1px black;
+ input:disabled {
+ color: #c0c0c0;
+ cursor: not-allowed;
}
}
-
- td.specName {
- border-right: dotted 1px black;
+ &#aggregateMetricSpecEditWarning {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ color: orange;
}
+ }
- tr.even {
- background-color: #f4f4f4;
- }
+ img.loadingImg {
+ float: left;
- tr.activeRow {
- border: 2px solid darkblue;
- background-color: #c0d1fe;
+ &#aggregateMetricSpecDeleteLoading {
+ float: right;
+ margin-right: 40px;
}
+ }
- span.actionsList {
- display: flex;
- justify-content: space-around;
+ textarea#aggregateMetricUserAlertsSpec {
+ margin-top: 10px;
+ width: 100%;
+ }
- a:first-of-type {
- padding-left: 5px;
- }
- }
+ input#addAlertUserSearch {
+ width: 100%
}
}
diff --git a/modules/tracker/tests/controllers/ApiAggregatemetricnotificationComponentTest.php b/modules/tracker/tests/controllers/ApiAggregatemetricnotificationComponentTest.php
new file mode 100644
index 000000000..a3a498fe4
--- /dev/null
+++ b/modules/tracker/tests/controllers/ApiAggregatemetricnotificationComponentTest.php
@@ -0,0 +1,227 @@
+enabledModules = array('api', 'scheduler', $this->moduleName);
+ $this->_models = array('Assetstore', 'Community', 'Setting', 'User');
+ $this->setupDatabase(array('default'));
+ $this->setupDatabase(array('aggregateMetric'), 'tracker');
+
+ ControllerTestCase::setUp();
+ }
+
+ /**
+ * Test getting an existing existing aggregate metric notification with a set of params, via GET.
+ *
+ * @throws Zend_Exception
+ */
+ public function testGET()
+ {
+ $usersFile = $this->loadData('User', 'default');
+ /** @var UserDao $userDao */
+ $userDao = $this->User->load($usersFile[0]->getKey());
+ $token = $this->_loginAsAdministrator();
+
+ $restParams = array(
+ 'token' => $token,
+ );
+ $this->resetAll();
+ $this->params = $restParams;
+ $resp = $this->_callRestApi('GET', '/tracker/aggregatemetricnotification/1');
+
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($resp['body']), true), $this->moduleName);
+
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), '1');
+ $this->assertEquals($notificationDao->getBranch(), 'master');
+ $this->assertEquals($notificationDao->getComparison(), '>');
+ $this->assertEquals($notificationDao->getValue(), '19.0');
+ }
+
+ /**
+ * Test creating an existing aggregate metric notification with a set of params, via POST.
+ *
+ * @throws Zend_Exception
+ */
+ public function testPOST()
+ {
+ $usersFile = $this->loadData('User', 'default');
+ /** @var UserDao $userDao */
+ $userDao = $this->User->load($usersFile[0]->getKey());
+ $token = $this->_loginAsAdministrator();
+
+ $restParams = array(
+ 'token' => $token,
+ 'aggregate_metric_spec_id' => 1,
+ 'branch' => 'POST TEST',
+ 'comparison' => '==',
+ 'value' => '16.0',
+ );
+
+ $this->resetAll();
+ $this->params = $restParams;
+ $resp = $this->_callRestApi('POST', '/tracker/aggregatemetricnotification/');
+
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($resp['body']), true), $this->moduleName);
+
+ // Test the result of the API call.
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $restParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $restParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $restParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $restParams['branch']);
+
+ // Load from the DB and test again.
+ $notificationDao = $aggregateMetricNotificationModel->load($notificationDao->getAggregateMetricNotificationId());
+
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $restParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $restParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $restParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $restParams['branch']);
+
+ // Delete to clean up.
+ $aggregateMetricNotificationModel->delete($notificationDao);
+ }
+
+ /**
+ * Test updating an existing aggregate metric notification with a set of params, via PUT.
+ *
+ * @throws Zend_Exception
+ */
+ public function testPUT()
+ {
+ $usersFile = $this->loadData('User', 'default');
+ /** @var UserDao $userDao */
+ $userDao = $this->User->load($usersFile[0]->getKey());
+ $token = $this->_loginAsAdministrator();
+
+ $originalParams = array(
+ 'token' => $token,
+ 'aggregate_metric_spec_id' => 1,
+ 'branch' => 'master',
+ 'comparison' => '>',
+ 'value' => 19.0,
+ );
+
+ $restParams = array(
+ 'token' => $token,
+ 'aggregate_metric_spec_id' => 2,
+ 'branch' => 'retsam',
+ 'comparison' => '!=',
+ 'value' => 21.0,
+ );
+
+ $this->resetAll();
+ $this->params = $restParams;
+ $resp = $this->_callRestApi('PUT', '/tracker/aggregatemetricnotification/1');
+
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($resp['body']), true), $this->moduleName);
+
+ // Test the result of the API call.
+ // The aggregate_metric_spec_id should not have changed.
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $originalParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $restParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $restParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $restParams['branch']);
+
+ // Load from the DB and test again.
+ $notificationDao = $aggregateMetricNotificationModel->load($notificationDao->getAggregateMetricNotificationId());
+
+ // The aggregate_metric_spec_id should not have changed.
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $originalParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $restParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $restParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $restParams['branch']);
+
+ // Reset via PUT to the original state.
+ $this->resetAll();
+ $this->params = $originalParams;
+ $resp = $this->_callRestApi('PUT', '/tracker/aggregatemetricnotification/1');
+
+ // Load from the DB and test again.
+ $notificationDao = $aggregateMetricNotificationModel->load($notificationDao->getAggregateMetricNotificationId());
+
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $originalParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $originalParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $originalParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $originalParams['branch']);
+ }
+
+ /**
+ * Test deleting an existing aggregate metric spec, via DELETE.
+ *
+ * @throws Zend_Exception
+ */
+ public function testDELETE()
+ {
+ $usersFile = $this->loadData('User', 'default');
+ /** @var UserDao $userDao */
+ $userDao = $this->User->load($usersFile[0]->getKey());
+ $token = $this->_loginAsAdministrator();
+
+ // Create a notification via POST.
+
+ $restParams = array(
+ 'token' => $token,
+ 'aggregate_metric_spec_id' => 1,
+ 'branch' => 'DELETE TEST',
+ 'comparison' => '==',
+ 'value' => '16.0',
+ );
+
+ $this->resetAll();
+ $this->params = $restParams;
+ $resp = $this->_callRestApi('POST', '/tracker/aggregatemetricnotification/');
+
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($resp['body']), true), $this->moduleName);
+
+ // Load from the DB and test properties.
+ $notificationDao = $aggregateMetricNotificationModel->load($notificationDao->getAggregateMetricNotificationId());
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), $restParams['aggregate_metric_spec_id']);
+ $this->assertEquals($notificationDao->getValue(), $restParams['value']);
+ $this->assertEquals($notificationDao->getComparison(), $restParams['comparison']);
+ $this->assertEquals($notificationDao->getBranch(), $restParams['branch']);
+
+ $notificationId = $notificationDao->getAggregateMetricNotificationId();
+ $resp = $this->_callRestApi('DELETE', '/tracker/aggregatemetricnotification/'.$notificationId);
+
+ $notificationDao = $aggregateMetricNotificationModel->load($notificationId);
+ $this->assertEquals($notificationDao, false);
+ }
+}
diff --git a/modules/tracker/tests/controllers/ApiAggregatemetricspecComponentTest.php b/modules/tracker/tests/controllers/ApiAggregatemetricspecComponentTest.php
index 448751d2f..b42eef728 100644
--- a/modules/tracker/tests/controllers/ApiAggregatemetricspecComponentTest.php
+++ b/modules/tracker/tests/controllers/ApiAggregatemetricspecComponentTest.php
@@ -32,12 +32,7 @@ public function setUp()
$this->_models = array('Assetstore', 'Community', 'Setting', 'User');
$this->setupDatabase(array('default'));
$this->setupDatabase(array('aggregateMetric'), 'tracker');
- $db = Zend_Registry::get('dbAdapter');
- $configDatabase = Zend_Registry::get('configDatabase');
- if ($configDatabase->database->adapter == 'PDO_PGSQL') {
- $db->query("SELECT setval('tracker_aggregate_metric_spec_aggregate_metric_spec_id_seq', (SELECT MAX(aggregate_metric_spec_id) FROM tracker_aggregate_metric_spec)+1);");
- $db->query("SELECT setval('tracker_scalar_scalar_id_seq', (SELECT MAX(scalar_id) FROM tracker_scalar)+1);");
- }
+
ControllerTestCase::setUp();
}
@@ -66,9 +61,6 @@ public function testGET()
$specDao = $aggregateMetricSpecModel->initDao('AggregateMetricSpec', json_decode(json_encode($resp['body']), true), $this->moduleName);
$this->assertEquals($specDao->getProducerId(), '100');
- $this->assertEquals($specDao->getComparison(), '!=');
- $this->assertEquals($specDao->getValue(), '1.0');
- $this->assertEquals($specDao->getBranch(), 'master');
$this->assertEquals($specDao->getName(), '95th Percentile Greedy error');
$this->assertEquals($specDao->getDescription(), '95th Percentile Greedy error');
$this->assertEquals($specDao->getSpec(), "percentile('Greedy error', 95)");
@@ -89,11 +81,8 @@ public function testPOST()
$restParams = array(
'token' => $token,
'producer_id' => 100,
- 'branch' => 'newbranch',
'name' => 'POST 23 percentile',
'description' => 'opaque',
- 'value' => '23',
- 'comparison' => '==',
'spec' => "percentile('POST', 23)",
);
@@ -108,9 +97,6 @@ public function testPOST()
// Test the result of the API call.
$this->assertEquals($specDao->getProducerId(), $restParams['producer_id']);
- $this->assertEquals($specDao->getComparison(), $restParams['comparison']);
- $this->assertEquals($specDao->getValue(), $restParams['value']);
- $this->assertEquals($specDao->getBranch(), $restParams['branch']);
$this->assertEquals($specDao->getName(), $restParams['name']);
$this->assertEquals($specDao->getDescription(), $restParams['description']);
$this->assertEquals($specDao->getSpec(), $restParams['spec']);
@@ -119,9 +105,6 @@ public function testPOST()
$specDao = $aggregateMetricSpecModel->load($specDao->getAggregateMetricSpecId());
$this->assertEquals($specDao->getProducerId(), $restParams['producer_id']);
- $this->assertEquals($specDao->getComparison(), $restParams['comparison']);
- $this->assertEquals($specDao->getValue(), $restParams['value']);
- $this->assertEquals($specDao->getBranch(), $restParams['branch']);
$this->assertEquals($specDao->getName(), $restParams['name']);
$this->assertEquals($specDao->getDescription(), $restParams['description']);
$this->assertEquals($specDao->getSpec(), $restParams['spec']);
@@ -142,11 +125,8 @@ public function testPUT()
$restParams = array(
'token' => $token,
'producer_id' => 200,
- 'branch' => 'splitter',
'name' => 'NewAlgo 23 percentile',
'description' => 'vivid',
- 'value' => '23',
- // Don't change comparison, to test that an unset value won't change.
'spec' => "percentile('NewAlgo', 23)",
);
@@ -161,9 +141,6 @@ public function testPUT()
// Test the result of the API call.
$this->assertEquals($specDao->getProducerId(), $restParams['producer_id']);
- $this->assertEquals($specDao->getComparison(), '!=');
- $this->assertEquals($specDao->getValue(), $restParams['value']);
- $this->assertEquals($specDao->getBranch(), $restParams['branch']);
$this->assertEquals($specDao->getName(), $restParams['name']);
$this->assertEquals($specDao->getDescription(), $restParams['description']);
$this->assertEquals($specDao->getSpec(), $restParams['spec']);
@@ -172,9 +149,6 @@ public function testPUT()
$specDao = $aggregateMetricSpecModel->load(1);
$this->assertEquals($specDao->getProducerId(), $restParams['producer_id']);
- $this->assertEquals($specDao->getComparison(), '!=');
- $this->assertEquals($specDao->getValue(), $restParams['value']);
- $this->assertEquals($specDao->getBranch(), $restParams['branch']);
$this->assertEquals($specDao->getName(), $restParams['name']);
$this->assertEquals($specDao->getDescription(), $restParams['description']);
$this->assertEquals($specDao->getSpec(), $restParams['spec']);
diff --git a/modules/tracker/tests/controllers/ApiComponentTest.php b/modules/tracker/tests/controllers/ApiComponentTest.php
index 64753d5de..c2999d010 100644
--- a/modules/tracker/tests/controllers/ApiComponentTest.php
+++ b/modules/tracker/tests/controllers/ApiComponentTest.php
@@ -35,14 +35,6 @@ public function setUp()
$this->enabledModules = array('api', 'scheduler', $this->moduleName);
$this->_models = array('Assetstore', 'Community', 'Setting', 'User');
- $db = Zend_Registry::get('dbAdapter');
- $configDatabase = Zend_Registry::get('configDatabase');
- if ($configDatabase->database->adapter == 'PDO_PGSQL') {
- $db->query("SELECT setval('tracker_trend_trend_id_seq', (SELECT MAX(trend_id) FROM tracker_trend)+1);");
- $db->query("SELECT setval('tracker_submission_submission_id_seq', (SELECT MAX(submission_id) FROM tracker_submission)+1);");
- $db->query("SELECT setval('tracker_scalar_scalar_id_seq', (SELECT MAX(scalar_id) FROM tracker_scalar)+1);");
- }
-
ControllerTestCase::setUp();
}
@@ -55,21 +47,33 @@ public function testUploadScalarWithSubmission()
{
$uuidComponent = MidasLoader::loadComponent('Uuid');
$uuid = $uuidComponent->generate();
+ $uuid2 = $uuidComponent->generate();
+ $uuid3 = $uuidComponent->generate();
$token = $this->_loginAsAdministrator();
- $outputs = array();
- $outputs['metric_0'] = $this->_submitScalar($token, $uuid, 'metric_0', '18');
$metric1Params = array('num_param' => 19.0, 'text_param' => 'metric1 text', 'null_param' => null);
- $outputs['metric_1'] = $this->_submitScalar($token, $uuid, 'metric_1', '19', 'meters', $metric1Params);
$metric2Params = array('num_param' => 20.0, 'text_param' => 'metric2 text', 'null_param' => null);
- $outputs['metric_2'] = $this->_submitScalar($token, $uuid, 'metric_2', '20', 'mm', $metric2Params);
+ $this->_submitSubmission($token, $uuid);
+ $this->_submitSubmission($token, $uuid2, $metric1Params);
+ $this->_submitSubmission($token, $uuid3, $metric2Params);
+ $outputs = array();
+ $outputs['metric_0'] = $this->_submitScalar($token, $uuid, 'metric_0', '18');
+ $outputs['metric_1'] = $this->_submitScalar($token, $uuid2, 'metric_1', '19', 'meters');
+ $outputs['metric_2'] = $this->_submitScalar($token, $uuid3, 'metric_2', '20', 'mm');
/** @var Tracker_SubmissionModel $submissionModel */
$submissionModel = MidasLoader::loadModel('Submission', 'tracker');
/** @var Tracker_SubmissionDao $submissionDao */
$submissionDao = $submissionModel->getSubmission($uuid);
+
+ /** @var Tracker_SubmissionDao $submissionDao2 */
+ $submissionDao2 = $submissionModel->getSubmission($uuid2);
+
+ /** @var Tracker_SubmissionDao $submissionDao3 */
+ $submissionDao3 = $submissionModel->getSubmission($uuid3);
+
$scalarDaos = $submissionModel->getScalars($submissionDao);
// Maps the scalars for each metric.
@@ -84,9 +88,9 @@ public function testUploadScalarWithSubmission()
}
// Params should be a zero element array here.
- $this->assertTrue(!($metricToScalar['metric_0']->getParams()));
+ $this->assertTrue(!($submissionDao->getParams()));
- $metric1Params = $metricToScalar['metric_1']->getParams();
+ $metric1Params = $submissionDao2->getParams();
$metric1ParamChecks = array(
'num_param' => array('found' => false, 'type' => 'numeric', 'val' => 19.0),
'text_param' => array('found' => false, 'type' => 'text', 'val' => 'metric1 text'),
@@ -110,7 +114,7 @@ public function testUploadScalarWithSubmission()
$this->assertTrue($checks['found']);
}
- $metric2Params = $metricToScalar['metric_2']->getParams();
+ $metric2Params = $submissionDao3->getParams();
$metric2ParamChecks = array(
'num_param' => array('found' => false, 'type' => 'numeric', 'val' => 20.0),
'text_param' => array('found' => false, 'type' => 'text', 'val' => 'metric2 text'),
@@ -133,6 +137,11 @@ public function testUploadScalarWithSubmission()
foreach ($metric2ParamChecks as $checks) {
$this->assertTrue($checks['found']);
}
+
+ // clean up
+ $submissionModel->delete($submissionDao);
+ $submissionModel->delete($submissionDao2);
+ $submissionModel->delete($submissionDao3);
}
/**
@@ -152,7 +161,6 @@ private function _submitScalar($token, $uuid, $metric, $value, $unit = false, $s
$this->params['method'] = 'midas.tracker.scalar.add';
$this->params['token'] = $token;
$this->params['communityId'] = '2000';
- $this->params['producerDisplayName'] = 'Test Producer';
$this->params['metricName'] = $metric;
$this->params['value'] = $value;
$this->params['producerRevision'] = 'deadbeef';
@@ -169,25 +177,22 @@ private function _submitScalar($token, $uuid, $metric, $value, $unit = false, $s
return $res->data;
}
- /**
- * Test listing the branch names tied to a producer and trend metric_name.
- *
- * @throws Zend_Exception
- */
- public function testBranchesformetricnameList()
+ private function _submitSubmission($token, $uuid, $params = false)
{
- $token = $this->_loginAsAdministrator();
$this->resetAll();
- $this->params['method'] = 'midas.tracker.branchesformetricname.list';
+ $this->params['method'] = 'midas.tracker.submission.add';
$this->params['token'] = $token;
- $this->params['producerId'] = '100';
- $this->params['trendMetricName'] = 'Greedy error';
+ $this->params['communityId'] = '2000';
+ $this->params['producerDisplayName'] = 'Test Producer';
+ $this->params['producerRevision'] = 'deadbeef';
+ $this->params['submitTime'] = 'now';
+ $this->params['uuid'] = $uuid;
+ if ($params !== false) {
+ $this->params['params'] = json_encode($params);
+ }
$res = $this->_callJsonApi();
- /** @var array branches */
- $branches = $res->data;
- $this->assertEquals(count($branches), 2);
- $this->assertTrue(in_array('master', $branches));
- $this->assertTrue(in_array('test', $branches));
+
+ return $res->data;
}
/**
@@ -209,6 +214,8 @@ public function testAggregatemetricsUpdate()
$submissionModel->createSubmission($producerDao, $uuid, 'Tmp submission');
/** @var Tracker_SubmissionDao $submissionDao */
$submissionDao = $submissionModel->getSubmission($uuid);
+ $submissionDao->setBranch('master');
+ $submissionModel->save($submissionDao);
// Create 4 scalars on the submission.
@@ -223,18 +230,21 @@ public function testAggregatemetricsUpdate()
/** @var UserDao $userDao */
$userDao = $authComponent->getUser(array('token' => $token), null);
+ /** @var array $scalars */
+ $scalars = array();
+
/** @var Tracker_TrendDao $greedyError1TrendDao */
$greedyError1TrendDao = $trendModel->load(1);
- $scalarModel->addToTrend($greedyError1TrendDao, 'now', $submissionDao->getSubmissionId(), 'deadbeef', 101, $userDao, false, false, 'url', 'master');
+ $scalars[] = $scalarModel->addToTrend($greedyError1TrendDao, $submissionDao, 101);
/** @var Tracker_TrendDao $greedyError2TrendDao */
$greedyError2TrendDao = $trendModel->load(2);
- $scalarModel->addToTrend($greedyError2TrendDao, 'now', $submissionDao->getSubmissionId(), 'deadbeef', 102, $userDao, false, false, 'url', 'master');
+ $scalars[] = $scalarModel->addToTrend($greedyError2TrendDao, $submissionDao, 102);
/** @var Tracker_TrendDao $greedyError3TrendDao */
$greedyError3TrendDao = $trendModel->load(3);
- $scalarModel->addToTrend($greedyError3TrendDao, 'now', $submissionDao->getSubmissionId(), 'deadbeef', 103, $userDao, false, false, 'url', 'master');
+ $scalars[] = $scalarModel->addToTrend($greedyError3TrendDao, $submissionDao, 103);
/** @var Tracker_TrendDao $greedyError4TrendDao */
$greedyError4TrendDao = $trendModel->load(4);
- $scalarModel->addToTrend($greedyError4TrendDao, 'now', $submissionDao->getSubmissionId(), 'deadbeef', 104, $userDao, false, false, 'url', 'master');
+ $scalars[] = $scalarModel->addToTrend($greedyError4TrendDao, $submissionDao, 104);
// Get existing aggregate metrics for this submission, there should be 0.
@@ -243,12 +253,46 @@ public function testAggregatemetricsUpdate()
/** array $aggregateMetrics */
$aggregateMetrics = $aggregateMetricModel->getAggregateMetricsForSubmission($submissionDao);
+ // Add users 1 & 2 to notification 1, 95th percentile Greedy error > 19.0
+ // Add users 1 & 3 to notification 2, 55th percentile Greedy error != 11.0
+
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+
+ /** @var Tracker_AggregateMetricNotificationDao $amn95thPercentileGreedyError */
+ $amn95thPercentileGreedyError = $aggregateMetricNotificationModel->load(1);
+ /** @var Tracker_AggregateMetricNotificationDao $amn55thPercentileGreedyError */
+ $amn55thPercentileGreedyError = $aggregateMetricNotificationModel->load(2);
+
+ /** @var UserModel $userModel */
+ $userModel = MidasLoader::loadModel('User');
+ /** @var UserDao $user1Dao */
+ $user1Dao = $userModel->load(1);
+ /** @var UserDao $user2Dao */
+ $user2Dao = $userModel->load(2);
+ /** @var UserDao $user3Dao */
+ $user3Dao = $userModel->load(3);
+
+ $aggregateMetricNotificationModel->createUserNotification($amn95thPercentileGreedyError, $user1Dao);
+ $aggregateMetricNotificationModel->createUserNotification($amn95thPercentileGreedyError, $user2Dao);
+
+ $aggregateMetricNotificationModel->createUserNotification($amn55thPercentileGreedyError, $user1Dao);
+ $aggregateMetricNotificationModel->createUserNotification($amn55thPercentileGreedyError, $user3Dao);
+
+ // Sadly, enabling a module does not import its constants.
+ require_once BASE_PATH.'/modules/scheduler/constant/module.php';
+ /** @var Scheduler_JobModel $jobModel */
+ $jobModel = MidasLoader::loadModel('Job', 'scheduler');
+ // Ensure there aren't any notification jobs existing.
+ $this->assertEquals(0, count($jobModel->findBy('task', 'TASK_TRACKER_SEND_AGGREGATE_METRIC_NOTIFICATION')));
+
// Call the API to update and return metrics for this submission.
$this->resetAll();
$this->params['method'] = 'midas.tracker.aggregatemetrics.update';
$this->params['token'] = $token;
$this->params['uuid'] = $uuid;
+ $this->params['notify'] = true;
$resp = $this->_callJsonApi();
$aggregateMetrics = array();
/** stdClass $aggregateMetricStdClass */
@@ -305,8 +349,85 @@ public function testAggregatemetricsUpdate()
$this->assertTrue($metricValue[key($metricValue)]);
}
- // Call delete on the submission so as to not interfere with other tests.
+ // Check that the correction notifications were scheduled.
+
+ $expectedParams = array(
+ array(
+ 'aggregate_metric_notification_id' => '1',
+ 'aggregate_metric_id' => '1',
+ 'recipient_id' => '1',
+ 'found' => false,
+ ),
+ array(
+ 'aggregate_metric_notification_id' => '1',
+ 'aggregate_metric_id' => '1',
+ 'recipient_id' => '2',
+ 'found' => false,
+ ),
+ array(
+ 'aggregate_metric_notification_id' => '2',
+ 'aggregate_metric_id' => '2',
+ 'recipient_id' => '1',
+ 'found' => false,
+ ),
+ array(
+ 'aggregate_metric_notification_id' => '2',
+ 'aggregate_metric_id' => '2',
+ 'recipient_id' => '3',
+ 'found' => false,
+ ),
+ );
+
+ /** @var array $aggregateMetricNotificationJobs */
+ $aggregateMetricNotificationJobs = $jobModel->findBy('task', 'TASK_TRACKER_SEND_AGGREGATE_METRIC_NOTIFICATION');
+ $this->assertEquals(4, count($aggregateMetricNotificationJobs));
+ /** @var Scheduler_JobDao $job */
+ foreach ($aggregateMetricNotificationJobs as $job) {
+ /** @var string $params */
+ $params = $job->getParams();
+ preg_match("/\"aggregate_metric_notification_id\":\"(\d+)\",\"aggregate_metric_id\":\"(\d+)\",\"recipient_id\":\"(\d+)\"/", $params, $matches);
+ /** @var string $notificationId */
+ $notificationId = $matches[1];
+ /** @var string $metricId */
+ $metricId = $matches[2];
+ /** @var string $userId */
+ $userId = $matches[3];
+
+ /** @var int $ind */
+ /** @var array $expectedParam */
+ foreach ($expectedParams as $ind => $expectedParam) {
+ if ($expectedParam['aggregate_metric_notification_id'] == $notificationId &&
+ $expectedParam['aggregate_metric_id'] == $metricId &&
+ $expectedParam['recipient_id'] == $userId) {
+ $expectedParams[$ind]['found'] = true;
+ break;
+ }
+ }
+ }
+
+ // Check that all the expected jobs were found.
+ /** @var int $ind */
+ /** @var array $expectedParam */
+ foreach ($expectedParams as $ind => $expectedParam) {
+ $this->assertTrue($expectedParam['found']);
+ }
+
+ // Clean up after the test so as to not interfere with other tests.
+
+ // Delete all the jobs.
+ /** @var Scheduler_JobDao $job */
+ foreach ($aggregateMetricNotificationJobs as $job) {
+ $jobModel->delete($job);
+ }
+
+ // Delete the created submission.
$submissionModel->delete($submissionDao);
+
+ // Delete the users associated to notifications.
+ $aggregateMetricNotificationModel->deleteUserNotification($amn95thPercentileGreedyError, $user1Dao);
+ $aggregateMetricNotificationModel->deleteUserNotification($amn95thPercentileGreedyError, $user2Dao);
+ $aggregateMetricNotificationModel->deleteUserNotification($amn55thPercentileGreedyError, $user1Dao);
+ $aggregateMetricNotificationModel->deleteUserNotification($amn55thPercentileGreedyError, $user3Dao);
}
/**
@@ -326,13 +447,23 @@ public function testAggregatemetricspecNotificationEndpoints()
$userDao = $authComponent->getUser(array('token' => $token), null);
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
- $this->assertEquals(0, count($notifiedUsers));
+ $notifications = $resp->data;
+ // Initialliy there is one notification with zero users.
+ $this->assertEquals(1, count($notifications));
+ $this->assertEquals(0, count($notifications[0]->users));
+ /** @var Tracker_AggregateMetricNotificationModel $aggregateMetricNotificationModel */
+ $aggregateMetricNotificationModel = MidasLoader::loadModel('AggregateMetricNotification', 'tracker');
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($notifications[0]->notification), true), $this->moduleName);
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), 1);
+ $this->assertEquals($notificationDao->getValue(), 19.0);
+ $this->assertEquals($notificationDao->getComparison(), '>');
+ $this->assertEquals($notificationDao->getBranch(), 'master');
// Create one notified user.
@@ -340,17 +471,22 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.create';
$this->params['token'] = $token;
$this->params['userId'] = 1;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = $notificationDao->getAggregateMetricNotificationId();
$resp = $this->_callJsonApi();
$this->assertEquals(1, $resp->data->user_id);
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
+ // There should be one user on this notification.
+ $this->assertEquals(1, count($notifications));
+ $this->assertEquals(1, count($notifications[0]->users));
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
1 => false,
@@ -364,6 +500,12 @@ public function testAggregatemetricspecNotificationEndpoints()
foreach ($expectedUserIds as $expectedUserId) {
$this->assertTrue($expectedUserIds[$expectedUserId]);
}
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($notifications[0]->notification), true), $this->moduleName);
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), 1);
+ $this->assertEquals($notificationDao->getValue(), 19.0);
+ $this->assertEquals($notificationDao->getComparison(), '>');
+ $this->assertEquals($notificationDao->getBranch(), 'master');
// Create a notification with the same user.
@@ -371,16 +513,18 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.create';
$this->params['token'] = $token;
$this->params['userId'] = 1;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
1 => false,
@@ -394,6 +538,12 @@ public function testAggregatemetricspecNotificationEndpoints()
foreach ($expectedUserIds as $expectedUserId) {
$this->assertTrue($expectedUserIds[$expectedUserId]);
}
+ /** @var Tracker_AggregateMetricNotificationDao $notificationDao */
+ $notificationDao = $aggregateMetricNotificationModel->initDao('AggregateMetricNotification', json_decode(json_encode($notifications[0]->notification), true), $this->moduleName);
+ $this->assertEquals($notificationDao->getAggregateMetricSpecId(), 1);
+ $this->assertEquals($notificationDao->getValue(), 19.0);
+ $this->assertEquals($notificationDao->getComparison(), '>');
+ $this->assertEquals($notificationDao->getBranch(), 'master');
// Create a notification with a second user.
@@ -401,17 +551,19 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.create';
$this->params['token'] = $token;
$this->params['userId'] = 2;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->assertEquals(2, $resp->data->user_id);
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
1 => false,
@@ -433,16 +585,18 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.create';
$this->params['token'] = $token;
$this->params['userId'] = 3;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
1 => false,
@@ -465,17 +619,19 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.delete';
$this->params['token'] = $token;
$this->params['userId'] = 2;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->assertEquals(2, $resp->data->user_id);
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
1 => false,
@@ -498,17 +654,19 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.delete';
$this->params['token'] = $token;
$this->params['userId'] = 1;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->assertEquals(1, $resp->data->user_id);
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
/** @var array $expectedUserIds */
$expectedUserIds = array(
3 => false,
@@ -530,16 +688,18 @@ public function testAggregatemetricspecNotificationEndpoints()
$this->params['method'] = 'midas.tracker.aggregatemetricspecnotifieduser.delete';
$this->params['token'] = $token;
$this->params['userId'] = 3;
- $this->params['aggregateMetricSpecId'] = 1;
+ $this->params['aggregateMetricNotificationId'] = 1;
$resp = $this->_callJsonApi();
$this->resetAll();
- $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifiedusers.list';
+ $this->params['method'] = 'midas.tracker.aggregatemetricspecnotifications.list';
$this->params['token'] = $token;
$this->params['aggregateMetricSpecId'] = 1;
$resp = $this->_callJsonApi();
+ /** @var array $notifications */
+ $notifications = $resp->data;
/** @var array $notifiedUsers */
- $notifiedUsers = $resp->data;
+ $notifiedUsers = $notifications[0]->users;
$this->assertEquals(0, count($notifiedUsers));
}
}
diff --git a/modules/tracker/tests/controllers/ApiScalarComponentTest.php b/modules/tracker/tests/controllers/ApiScalarComponentTest.php
deleted file mode 100644
index 19f3fee4d..000000000
--- a/modules/tracker/tests/controllers/ApiScalarComponentTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-enabledModules = array('api', 'scheduler', $this->moduleName);
- $this->_models = array('Assetstore', 'Community', 'Setting', 'User');
- $this->setupDatabase(array('default'));
- $this->setupDatabase(array('default'), 'tracker');
-
- $db = Zend_Registry::get('dbAdapter');
- $configDatabase = Zend_Registry::get('configDatabase');
- if ($configDatabase->database->adapter == 'PDO_PGSQL') {
- $db->query("SELECT setval('tracker_aggregate_metric_spec_aggregate_metric_spec_id_seq', (SELECT MAX(aggregate_metric_spec_id) FROM tracker_aggregate_metric_spec)+1);");
- $db->query("SELECT setval('tracker_scalar_scalar_id_seq', (SELECT MAX(scalar_id) FROM tracker_scalar)+1);");
- }
-
- ControllerTestCase::setUp();
- }
-
- /**
- * Test updating an existing scalar with a set of params, via PUT.
- *
- * @throws Zend_Exception
- */
- public function testPUT()
- {
- $usersFile = $this->loadData('User', 'default');
- /** @var UserDao $userDao */
- $userDao = $this->User->load($usersFile[0]->getKey());
-
- // Create a scalar attached to a trend.
- /** @var Tracker_TrendModel $trendModel */
- $trendModel = MidasLoader::loadModel('Trend', 'tracker');
- /** @var Tracker_TrendDao $trend */
- $trend = $trendModel->load(1001);
-
- /** @var Tracker_ScalarModel $scalarModel */
- $scalarModel = MidasLoader::loadModel('Scalar', 'tracker');
- $scalarArgs = array(
- 'trend_id' => $trend->getTrendId(),
- 'value' => 42,
- 'build_results_url' => 'http://localhost',
- );
- /** @var Tracker_ScalarDao $scalar */
- $scalar = $scalarModel->initDao('Scalar', $scalarArgs, $this->moduleName);
- $scalarModel->save($scalar);
-
- $token = $this->_loginAsAdministrator();
-
- $params = array(
- 'num_param' => 90,
- 'text_param' => 'master',
- 'null_param' => '',
- );
- $restParams = array(
- 'trend_id' => $trend->getTrendId(),
- 'params' => json_encode($params),
- 'token' => $token,
- );
-
- $this->resetAll();
- $this->params = $restParams;
- $resp = $this->_callRestApi('PUT', '/tracker/scalar/'.$scalar->getScalarId());
-
- // Ensure params are properly set on scalar.
- $paramChecks = array(
- 'num_param' => array('found' => false, 'type' => 'numeric', 'val' => 90),
- 'text_param' => array('found' => false, 'type' => 'text', 'val' => 'master'),
- 'null_param' => array('found' => false, 'type' => 'text', 'val' => ''),
- );
-
- /** @var Tracker_ParamModel $param */
- foreach ($scalar->getParams() as $param) {
- $checks = $paramChecks[$param->getParamName()];
- $this->assertEquals($checks['type'], $param->getParamType());
- if ($checks['type'] === 'numeric') {
- $this->assertEquals($checks['val'], $param->getNumericValue());
- } else {
- $this->assertEquals($checks['val'], $param->getTextValue());
- }
- $paramChecks[$param->getParamName()]['found'] = true;
- }
-
- foreach ($paramChecks as $checks) {
- $this->assertTrue($checks['found']);
- }
- }
-}
diff --git a/modules/tracker/tests/controllers/CMakeLists.txt b/modules/tracker/tests/controllers/CMakeLists.txt
index 72750b1d5..7f93fb2de 100644
--- a/modules/tracker/tests/controllers/CMakeLists.txt
+++ b/modules/tracker/tests/controllers/CMakeLists.txt
@@ -20,6 +20,6 @@
set(module_name tracker)
to_titlecase(${module_name} module_name_titlecase)
-add_midas_test(${module_name_titlecase}ApiComponent ApiComponentTest.php)
-add_midas_test(${module_name_titlecase}ApiAggregatemetricspecComponent ApiAggregatemetricspecComponentTest.php)
-add_midas_test(${module_name_titlecase}ApiScalarComponent ApiScalarComponentTest.php)
+add_midas_mysql_test(${module_name_titlecase}ApiComponent ApiComponentTest.php)
+add_midas_mysql_test(${module_name_titlecase}ApiAggregatemetricspecComponent ApiAggregatemetricspecComponentTest.php)
+add_midas_mysql_test(${module_name_titlecase}ApiAggregatemetricnotificationComponent ApiAggregatemetricnotificationComponentTest.php)
diff --git a/modules/tracker/tests/databaseDataset/aggregateMetric.xml b/modules/tracker/tests/databaseDataset/aggregateMetric.xml
index 2154557f5..edb2ab8a3 100644
--- a/modules/tracker/tests/databaseDataset/aggregateMetric.xml
+++ b/modules/tracker/tests/databaseDataset/aggregateMetric.xml
@@ -2,265 +2,261 @@