Skip to content

Commit

Permalink
Fix API spec - return for create & update for 'analyses' and 'model' (#…
Browse files Browse the repository at this point in the history
…1078)

* Fix analyses return types

* Add missing data_files to read-only model serializer

* Fix model return types
  • Loading branch information
sambles authored Jul 10, 2024
1 parent fcb10d4 commit 68767d8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/server/oasisapi/analyses/v2_api/viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,10 @@ class Meta:

# https://stackoverflow.com/questions/62572389/django-drf-yasg-how-to-add-description-to-tags

@method_decorator(name='list', decorator=swagger_auto_schema(responses={200: AnalysisSerializer(many=True)}))
@method_decorator(name='list', decorator=swagger_auto_schema(responses={200: AnalysisListSerializer(many=True)}))
@method_decorator(name='create', decorator=swagger_auto_schema(responses={200: AnalysisListSerializer()}))
@method_decorator(name='update', decorator=swagger_auto_schema(responses={200: AnalysisListSerializer()}))
@method_decorator(name='partial_update', decorator=swagger_auto_schema(responses={200: AnalysisListSerializer()}))
class AnalysisViewSet(VerifyGroupAccessModelViewSet):
"""
list:
Expand Down
1 change: 1 addition & 0 deletions src/server/oasisapi/analysis_models/v2_api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class AnalysisModelListSerializer(serializers.Serializer):
groups = serializers.SlugRelatedField(many=True, read_only=False, slug_field='name', required=False, queryset=Group.objects.all())
settings = serializers.SerializerMethodField()
run_mode = serializers.CharField(read_only=True)
data_files = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
namespace = 'v2-models'

@swagger_serializer_method(serializer_or_field=serializers.URLField)
Expand Down
4 changes: 4 additions & 0 deletions src/server/oasisapi/analysis_models/v2_api/viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ def content(self, request, pk=None, models_pk=None, version=None):
return handle_json_data(self.get_object(), 'file', request, AnalysisSettingsSerializer)


@method_decorator(name='list', decorator=swagger_auto_schema(responses={200: AnalysisModelListSerializer(many=True)}))
@method_decorator(name='create', decorator=swagger_auto_schema(responses={200: AnalysisModelListSerializer()}))
@method_decorator(name='update', decorator=swagger_auto_schema(responses={200: AnalysisModelListSerializer()}))
@method_decorator(name='partial_update', decorator=swagger_auto_schema(responses={200: AnalysisModelListSerializer()}))
class AnalysisModelViewSet(VerifyGroupAccessModelViewSet):
"""
list:
Expand Down

0 comments on commit 68767d8

Please sign in to comment.