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

Remove protocol resource which is not used by client. #3253

Merged
merged 4 commits into from
Mar 12, 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
5 changes: 0 additions & 5 deletions refinery/config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
from core.views import CustomRegistrationView
from data_set_manager.api import (AttributeResource,
InvestigationResource, NodeResource,
ProtocolReferenceParameterResource,
ProtocolReferenceResource, ProtocolResource,
PublicationResource, StudyResource)
from data_set_manager.urls import data_set_manager_router
from file_store.urls import file_store_router
Expand All @@ -43,9 +41,6 @@
v1_api.register(UserAuthenticationResource())
v1_api.register(InvitationResource())
v1_api.register(InvestigationResource())
v1_api.register(ProtocolResource())
v1_api.register(ProtocolReferenceResource())
v1_api.register(ProtocolReferenceParameterResource())
v1_api.register(PublicationResource())
v1_api.register(AttributeResource())
v1_api.register(ExtendedGroupResource())
Expand Down
79 changes: 1 addition & 78 deletions refinery/data_set_manager/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

from file_store.models import FileStoreItem

from .models import (Attribute, Investigation, Node, Protocol,
ProtocolReference, ProtocolReferenceParameter,
Publication, Study)
from .models import Attribute, Investigation, Node, Publication, Study

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -124,75 +122,6 @@ class Meta:
}


class ProtocolResource(ModelResource):
# Leads to to many "duplicated" references, i.e. many samples have the same
# protocol parameters but are regarded unique.
# references = fields.ToManyField(
# 'data_set_manager.api.ProtocolReferenceResource',
# attribute=lambda bundle: (
# ProtocolReference.objects.filter(
# protocol=bundle.obj
# ).distinct()
# ),
# full=True,
# null=True
# )

class Meta:
queryset = Protocol.objects.all()
detail_uri_name = 'uuid'
allowed_methods = ['get']
resource_name = 'protocols'
filtering = {
'uuid': ALL
}
fields = [
'description',
'name'
]


class ProtocolReferenceResource(ModelResource):
parameters = fields.ToManyField(
'data_set_manager.api.ProtocolReferenceParameterResource',
attribute=lambda bundle: (
ProtocolReferenceParameter.objects.filter(
protocol_reference=bundle.obj
).exclude(value__isnull=True).exclude(value__exact='').distinct()
),
full=True,
null=True
)

class Meta:
queryset = ProtocolReference.objects.all()
allowed_methods = ['get']
resource_name = 'protocol-references'
fields = [
'id',
'parameters'
]
include_resource_uri = False


class ProtocolReferenceParameterResource(ModelResource):
class Meta:
queryset = (ProtocolReferenceParameter
.objects
.exclude(value__isnull=True)
.exclude(value__exact=''))
allowed_methods = [
'get'
]
resource_name = 'protocol-reference-parameters'
fields = [
'name',
'value',
'value_unit'
]
include_resource_uri = False


class PublicationResource(ModelResource):
class Meta:
queryset = Publication.objects.all()
Expand All @@ -205,12 +134,6 @@ class StudyResource(ModelResource):
attribute='investigation__uuid',
use_in='all'
)
protocols = fields.ToManyField(
'data_set_manager.api.ProtocolResource',
'protocol_set',
full=True,
null=True
)
publications = fields.ToManyField(
'data_set_manager.api.PublicationResource',
'publication_set',
Expand Down