Minor changes suggested by Jeff

Author: summerhenson

sasdata/fair_database/data/models.py

@@ -3,6 +3,14 @@
 from django.core.files.storage import FileSystemStorage
 
 
+def empty_list():
+    return []
+
+
+def empty_dict():
+    return {}
+
+
 class Data(models.Model):
     """Base model for data."""
 
@@ -86,6 +94,15 @@ class Quantity(models.Model):
 
 
 class ReferenceQuantity(models.Model):
+    """
+    Database models for quantities referenced by variables in an OperationTree.
+
+    Corresponds to the references dictionary in the QuantityHistory class in
+    sasdata/quantity.py. ReferenceQuantities should be essentially the same as
+    Quantities but with no operations performed on them and therefore no
+    OperationTree.
+    """
+
     # data value
     value = models.JSONField()
 
@@ -105,14 +122,6 @@ class ReferenceQuantity(models.Model):
     )
 
 
-def empty_list():
-    return []
-
-
-def empty_dict():
-    return {}
-
-
 class MetaData(models.Model):
     """Database model for scattering metadata"""
 
@@ -178,7 +187,8 @@ class OperationTree(models.Model):
         null=True,
     )
 
-    # related quantity, only set for base of tree
+    # quantity the operation produces
+    # only set for base of tree (the most recent operation)
     quantity = models.OneToOneField(
         Quantity,
         on_delete=models.CASCADE,
@@ -201,6 +211,7 @@ class PublishedState(models.Model):
     # published
     published = models.BooleanField(default=False)
 
+    # TODO: update doi as needed when DOI generation is implemented
     # doi
     doi = models.URLField()
 

sasdata/fair_database/fair_database/permissions.py

@@ -14,11 +14,9 @@ def has_access(request, obj):
 class DataPermission(BasePermission):
     def has_object_permission(self, request, view, obj):
         if request.method == "GET":
-            if obj.is_public or has_access(request, obj):
-                return True
+            return obj.is_public or has_access(request, obj)
         elif request.method == "DELETE":
-            if not obj.is_public and is_owner(request, obj):
-                return True
+            return not obj.is_public and is_owner(request, obj)
         else:
             return is_owner(request, obj)
 

sasdata/fair_database/user_app/tests.py

@@ -120,10 +120,10 @@ def test_register_logout(self):
         self.client1.post("/auth/register/", data=self.register_data)
         response = self.client1.post("/auth/logout/")
         response2 = self.client1.get("/auth/user/")
-        User.objects.get(username="testUser").delete()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.content, b'{"detail":"Successfully logged out."}')
         self.assertEqual(response2.status_code, status.HTTP_401_UNAUTHORIZED)
+        User.objects.get(username="testUser").delete()
 
     def test_multiple_logout(self):
         self.client1.post("/auth/login/", data=self.login_data_2)
@@ -142,10 +142,10 @@ def test_register_login(self):
         )
         logout_response = self.client1.post("/auth/logout/")
         login_response = self.client1.post("/auth/login/", data=self.login_data)
-        User.objects.get(username="testUser").delete()
         self.assertEqual(register_response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(logout_response.status_code, status.HTTP_200_OK)
         self.assertEqual(login_response.status_code, status.HTTP_200_OK)
+        User.objects.get(username="testUser").delete()
 
     # Test password is successfully changed
     def test_password_change(self):