Merge branch 'master' into feature/remaining-icat-endpoints-#145

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,6 @@
+**Description**:
+Add a description here
+
+**Acceptance criteria**:
+- [ ] A checklist
+- [ ] of criteria to accept this story as done

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+This PR will close #{issue number}
+
+## Description
+Enter a description of the changes here
+
+## Testing instructions
+Add a set up instructions describing how the reviewer should test the code
+
+- [ ] Review code
+- [ ] Check Travis build
+- [ ] Review changes to test coverage
+- [ ] {more steps here}
+
+## Agile board tracking
+connect to #{issue number}

common/icat/query.py

@@ -266,16 +266,12 @@ def map_distinct_attributes_to_entity_names(self, distinct_fields, included_fiel
             if len(split_fields) == 1:
                 # Conventional list assignment causes IndexError because -2 is out of
                 # range of a list with a single element
-                split_fields.insert(-2, "base")
+                split_fields.insert(0, "base")
 
             # If a key doesn't exist in the dictionary, create it and assign an empty
             # list to it
-            try:
-                distinct_field_dict[split_fields[-2]]
-            except KeyError:
-                distinct_field_dict[split_fields[-2]] = []
-
-            distinct_field_dict[split_fields[-2]].append(split_fields[-1])
+            distinct_field_dict.setdefault(split_fields[0], [])
+            distinct_field_dict[split_fields[0]].append(split_fields[-1])
 
         # Remove "base" key as this isn't a valid entity name in Python ICAT
         distinct_entities = list(distinct_field_dict.keys())