records: fixes skipped empty values in serializers

Signed-off-by: pamfilos <[email protected]>
cernanalysispreservation · Dec 20, 2023 · 5f2b9fd · 5f2b9fd
1 parent 4225c5d
commit 5f2b9fd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cap/modules/deposit/serializers/schemas/json.py b/cap/modules/deposit/serializers/schemas/json.py
@@ -103,7 +103,7 @@ def remove_skip_values(self, data):
         keys = ["can_review", "review", "x_cap_permission", "egroups"]
 
         for key in keys:
-            if not data.get(key, ""):
+            if data.get(key, "") is None:
                 del data[key]
 
         return data

diff --git a/cap/modules/records/serializers/schemas/common.py b/cap/modules/records/serializers/schemas/common.py
@@ -184,7 +184,7 @@ def remove_skip_values(self, data):
         keys = ["egroups"]
 
         for key in keys:
-            if not data.get(key, ''):
+            if data.get(key, '') is None:
                 del data[key]
 
         return data
@@ -246,7 +246,7 @@ def get_schema(self, obj):
 
     def get_egroups(self, obj):
         _egroups = obj.get("metadata", {}).get("_egroups", [])
-        if "deposit" not in obj or obj["deposit"].schema_egroups_enabled():
+        if "deposit" in obj and obj["deposit"].schema_egroups_enabled():
             return _egroups
         else:
             return None

diff --git a/cap/modules/records/serializers/schemas/json.py b/cap/modules/records/serializers/schemas/json.py
@@ -79,7 +79,7 @@ def remove_skip_values(self, data):
         keys = ["can_review", "review", "egroups"]
 
         for key in keys:
-            if not data.get(key, ''):
+            if data.get(key, '') is None:
                 del data[key]
 
         return data

diff --git a/tests/integration/test_get_records.py b/tests/integration/test_get_records.py
@@ -442,7 +442,7 @@ def test_get_record_with_form_json_serializer(
         },
         'can_update': True,
         'is_owner': True,
-        # 'can_review': False,
+        'can_review': False,
         'created': rec.created.strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'),
         'updated': rec.updated.strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'),
         'created_by': {'email': example_user.email, 'profile': {}},