Merge pull request RedHatInsights#1194 from coderbydesign/ensure-time…

…stamps-on-workspace-api

Ensure timestamps are returned in workspace serializer

rbac/management/workspace/serializer.py

@@ -28,12 +28,21 @@ class WorkspaceSerializer(serializers.ModelSerializer):
     uuid = serializers.UUIDField(read_only=True, required=False)
     description = serializers.CharField(allow_null=True, required=False, max_length=255)
     parent_id = serializers.UUIDField(allow_null=True, required=False)
+    created = serializers.DateTimeField(read_only=True)
+    modified = serializers.DateTimeField(read_only=True)
 
     class Meta:
         """Metadata for the serializer."""
 
         model = Workspace
-        fields = ("name", "uuid", "parent_id", "description")
+        fields = (
+            "name",
+            "uuid",
+            "parent_id",
+            "description",
+            "created",
+            "modified",
+        )
 
     def create(self, validated_data):
         """Create the workspace object in the database."""

tests/management/workspace/test_serializer.py

@@ -40,6 +40,9 @@ def tearDown(self):
         Workspace.objects.update(parent=None)
         Workspace.objects.all().delete()
 
+    def _format_timestamps(self, timestamp):
+        return timestamp.isoformat(timespec="microseconds").replace("+00:00", "Z")
+
     def test_get_workspace_detail_child(self):
         """Return GET /workspace/<uuid>/ serializer response for child"""
         serializer = WorkspaceSerializer(self.child)
@@ -48,6 +51,8 @@ def test_get_workspace_detail_child(self):
             "name": self.child.name,
             "description": self.child.description,
             "parent_id": str(self.parent.uuid),
+            "created": self._format_timestamps(self.child.created),
+            "modified": self._format_timestamps(self.child.modified),
         }
 
         self.assertDictEqual(serializer.data, expected_data)
@@ -60,6 +65,8 @@ def test_get_workspace_detail_parent(self):
             "name": self.parent.name,
             "description": self.parent.description,
             "parent_id": None,
+            "created": self._format_timestamps(self.parent.created),
+            "modified": self._format_timestamps(self.parent.modified),
         }
 
         self.assertDictEqual(serializer.data, expected_data)