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.

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

Update to match style guide for params for analysis view set #3337

Merged
merged 1 commit into from
Apr 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions refinery/core/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1683,22 +1683,22 @@ def test_get_analysis_returns_offset_analyses_for_user(self):

def test_get_analysis_with_data_set_uuid_returns_401(self):
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
get_response = self.view(get_request_with_ds)
self.assertEqual(get_response.status_code, 401)

def test_get_analysis_with_invalid_data_set_uuid_returns_404(self):
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': 'xxx5'}
self.url_root, {'data_set_uuid': 'xxx5'}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
self.assertEqual(get_response.status_code, 404)

def test_get_analysis_with_data_set_uuid_returns_analyses(self):
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1710,7 +1710,7 @@ def test_get_analysis_with_data_set_uuid_returns_analyses(self):
def test_get_analysis_with_data_set_uuid_returns_names_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1719,7 +1719,7 @@ def test_get_analysis_with_data_set_uuid_returns_names_field(self):
def test_get_analysis_with_data_set_uuid_returns_status_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1729,7 +1729,7 @@ def test_get_analysis_with_data_set_uuid_returns_status_field(self):
def test_get_analysis_with_data_set_uuid_returns_summary_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1739,7 +1739,7 @@ def test_get_analysis_with_data_set_uuid_returns_summary_field(self):
def test_get_analysis_with_data_set_uuid_returns_time_start_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1749,7 +1749,7 @@ def test_get_analysis_with_data_set_uuid_returns_time_start_field(self):
def test_get_analysis_with_data_set_uuid_returns_time_end_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1759,7 +1759,7 @@ def test_get_analysis_with_data_set_uuid_returns_time_end_field(self):
def test_get_analysis_with_data_set_uuid_returns_uuid_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1768,7 +1768,7 @@ def test_get_analysis_with_data_set_uuid_returns_uuid_field(self):
def test_get_analysis_with_data_set_uuid_returns_workflow_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1778,7 +1778,7 @@ def test_get_analysis_with_data_set_uuid_returns_workflow_field(self):
def test_get_analysis_with_data_set_uuid_returns_owner_field(self):
self.analysis2.delete()
get_request_with_ds = self.factory.get(
self.url_root, {'dataSetUuid': self.data_set.uuid}
self.url_root, {'data_set_uuid': self.data_set.uuid}
)
force_authenticate(get_request_with_ds, user=self.user)
get_response = self.view(get_request_with_ds)
Expand All @@ -1789,7 +1789,7 @@ def test_get_analysis_with_data_set_uuid_returns_owner_field(self):

def test_get_analysis_with_data_set_uuid_returns_sorted_analyses(self):
get_request = self.factory.get(self.url_root,
{'dataSetUuid': self.data_set.uuid})
{'data_set_uuid': self.data_set.uuid})
force_authenticate(get_request, user=self.user)
get_response = self.view(get_request)
# sorted in reverse time_start
Expand All @@ -1801,7 +1801,7 @@ def test_get_analysis_with_data_set_uuid_returns_paged_analyses(self):
get_request = self.factory.get(self.url_root,
{'limit': limit,
'offset': 0,
'dataSetUuid': self.data_set.uuid})
'data_set_uuid': self.data_set.uuid})
force_authenticate(get_request, user=self.user)
get_response = self.view(get_request)
self.assertEqual(len(get_response.data), limit)
Expand All @@ -1810,7 +1810,7 @@ def test_get_analysis_with_data_set_uuid_returns_offset_analyses(self):
offset = 1
get_request = self.factory.get(self.url_root,
{'offset': offset,
'dataSetUuid': self.data_set.uuid})
'data_set_uuid': self.data_set.uuid})
force_authenticate(get_request, user=self.user)
get_response = self.view(get_request)
# know the total length off analysis is 2
Expand Down
4 changes: 2 additions & 2 deletions refinery/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ class AnalysisViewSet(APIView):
get:
description: Returns analyses filtered by either data set or user
parameters:
- name: dataSetUuid
- name: data_set_uuid
description: param to have analyses filtered by a data set
paramType: param
type: string
Expand All @@ -848,7 +848,7 @@ class AnalysisViewSet(APIView):
http_method_names = ['get', 'delete']

def get(self, request):
data_set_uuid = request.query_params.get('dataSetUuid')
data_set_uuid = request.query_params.get('data_set_uuid')
paginator = LimitOffsetPagination()
paginator.default_limit = 100

Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/analysis-monitor/ctrls/ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function AnalysisMonitorCtrl (
// analysis list and refreshes details for running analyses.
vm.updateAnalysesList = function () {
var param = {
dataSetUuid: $window.dataSetUuid
data_set_uuid: $window.dataSetUuid
};

vm.timerList = $timeout(vm.updateAnalysesList, 15000);
Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/analysis-monitor/services/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function analysisMonitorFactory (

// Copies and sorts analyses list
var processAnalysesList = function (data, params) {
if ('dataSetUuid' in params) {
if ('data_set_uuid' in params) {
addElapseAndHumanTime(data);
} else {
angular.copy(data, analysesGlobalList);
Expand Down
4 changes: 2 additions & 2 deletions refinery/ui/source/js/commons/services/analyses.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe('Common.service.analysis: unit tests', function () {
var $httpBackend;
var $rootScope;
var fakeUuid = 'x508x83x-x9xx-4740-x9x7-x7x0x631280x';
var params = '/?dataSetUuid=' + fakeUuid;
var params = '/?data_set_uuid=' + fakeUuid;
var service;
var fakeResponse = {
meta: {
Expand Down Expand Up @@ -55,7 +55,7 @@ describe('Common.service.analysis: unit tests', function () {
it('should return a resolving promise', function () {
var results;
var promise = service.get({
dataSetUuid: fakeUuid
data_set_uuid: fakeUuid
}).$promise.then(function (response) {
results = response;
});
Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/provvis/ctrls/ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
// Ajax calls, grabs the analysis & files promises for a particular data set
function getData () {
var analysisParams = {
dataSetUuid: _dataSetUuid
data_set_uuid: _dataSetUuid
};

var filesParams = {
Expand Down