From b25ff604754b3d3863772ac9723fb8d1e42ebf5f Mon Sep 17 00:00:00 2001
From: Matthias Koenig <konigmatt@googlemail.com>
Date: Fri, 1 Nov 2019 11:08:49 +0100
Subject: [PATCH] Fix #457, bugfix for group checking

---
 backend/pkdb_app/serializers.py | 34 ++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/backend/pkdb_app/serializers.py b/backend/pkdb_app/serializers.py
index d1baf43c..f0e927ed 100644
--- a/backend/pkdb_app/serializers.py
+++ b/backend/pkdb_app/serializers.py
@@ -548,14 +548,14 @@ def to_internal_related_fields(self, data):
                         Q(ex__groupset__study__sid=study_sid)
                         & Q(name=data.get("group"))
                     ).pk
-
-                except (ObjectDoesNotExist, MultipleObjectsReturned) as err:
-                    if err == ObjectDoesNotExist:
-                        msg = f'group <{data.get("group")}> does not exist, check groups.'
-                    else:
-                        msg = f'group <{data.get("group")}> is defined multiple times.'
-
-                    raise serializers.ValidationError(msg)
+                except ObjectDoesNotExist:
+                        raise serializers.ValidationError(
+                            f'group <{data.get("group")}> does not exist, check groups.'
+                        )
+                except MultipleObjectsReturned:
+                        raise serializers.ValidationError(
+                            f'group <{data.get("group")}> is defined multiple times.'
+                        )
 
         if "individual" in data:
             if data["individual"]:
@@ -568,14 +568,17 @@ def to_internal_related_fields(self, data):
                     ).pk
 
                 except ObjectDoesNotExist:
-                    msg = f'individual: individual <{data.get("individual")}> does not exist, check individuals.'
-                    raise serializers.ValidationError(msg)
+                    raise serializers.ValidationError(
+                        f'individual: individual <{data.get("individual")}> does '
+                        f'not exist, check individuals.'
+                    )
                 except MultipleObjectsReturned:
-                    msg = f'individual: individual <{data.get("individual")}> is defined multiple times'
-                    raise serializers.ValidationError(msg)
+                    raise serializers.ValidationError(
+                        f'individual: individual <{data.get("individual")}> is '
+                        f'defined multiple times'
+                    )
 
         if "interventions" in data:
-
             if data["interventions"]:
                 interventions = []
                 if isinstance(data["interventions"], str):
@@ -590,8 +593,9 @@ def to_internal_related_fields(self, data):
                             ).pk
                         )
                     except ObjectDoesNotExist:
-                        msg = f"intervention <{intervention}> does not exist, check interventions."
-                        raise serializers.ValidationError(msg)
+                        raise serializers.ValidationError(
+                            f"intervention <{intervention}> does not exist, check interventions."
+                        )
                 data["interventions"] = interventions
         return data