Add status field to PACS operations' filters and serializers

FNNDSC · Dec 13, 2024 · eca2c9c · eca2c9c
1 parent 05847e4
commit eca2c9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/chris_backend/pacsfiles/models.py b/chris_backend/pacsfiles/models.py
@@ -108,7 +108,8 @@ class PACSQueryFilter(FilterSet):
     class Meta:
         model = PACSQuery
         fields = ['id', 'min_creation_date', 'max_creation_date', 'title_exact',
-                  'title', 'description', 'pacs_id', 'pacs_identifier', 'owner_username']
+                  'title', 'status', 'description', 'pacs_id', 'pacs_identifier',
+                  'owner_username']
 
 
 PACS_RETRIEVE_STATUS_CHOICES = PACS_QUERY_STATUS_CHOICES
@@ -161,7 +162,8 @@ class PACSRetrieveFilter(FilterSet):
 
     class Meta:
         model = PACSRetrieve
-        fields = ['id', 'min_creation_date', 'max_creation_date', 'owner_username']
+        fields = ['id', 'min_creation_date', 'max_creation_date', 'status',
+                  'owner_username']
 
 
 class PACSSeries(models.Model):

diff --git a/chris_backend/pacsfiles/serializers.py b/chris_backend/pacsfiles/serializers.py
@@ -95,13 +95,15 @@ class PACSRetrieveSerializer(serializers.HyperlinkedModelSerializer):
     pacs_identifier = serializers.ReadOnlyField(source='pacs_query.pacs.identifier')
     owner_username = serializers.ReadOnlyField(source='owner.username')
     result = serializers.ReadOnlyField()
+    status = serializers.ReadOnlyField()
     pacs_query = serializers.HyperlinkedRelatedField(view_name='pacsquery-detail',
                                                      read_only=True)
 
     class Meta:
         model = PACSRetrieve
         fields = ('url', 'id', 'creation_date', 'pacs_query_id', 'pacs_query_title',
-                  'query', 'pacs_identifier', 'owner_username',  'result', 'pacs_query')
+                  'query', 'pacs_identifier', 'status', 'owner_username', 'result',
+                  'pacs_query')
 
 
 class PACSSeriesSerializer(serializers.HyperlinkedModelSerializer):