Addressing comments

Author: e107109

client_encryption/field_level_encryption.py

@@ -12,10 +12,7 @@ def encrypt_payload(payload, config, _params=None):
     """Encrypt some fields of a JSON payload using the given configuration."""
 
     try:
-        if type(payload) is dict or type(payload) is list:
-            json_payload = copy.deepcopy(payload)
-        else:
-            json_payload = json.loads(payload)
+        json_payload = copy.deepcopy(payload) if type(payload) is dict or type(payload) is list else json.loads(payload)
 
         for elem, target in config.paths["$"].to_encrypt.items():
             if not _params:
@@ -50,10 +47,7 @@ def decrypt_payload(payload, config, _params=None):
     """Decrypt some fields of a JSON payload using the given configuration."""
 
     try:
-        if type(payload) is dict or type(payload) is list:
-            json_payload = payload
-        else:
-            json_payload = json.loads(payload)
+        json_payload = payload if type(payload) is dict or type(payload) is list else json.loads(payload)
 
         for elem, target in config.paths["$"].to_decrypt.items():
             try:

client_encryption/json_path_utils.py

@@ -32,10 +32,7 @@ def update_node(tree, path, node_str):
     if __not_root(path):
         parent = path.split(_SEPARATOR)
         to_set = parent.pop()
-        if parent:
-            current_node = __get_node(tree, parent, False)
-        else:
-            current_node = tree
+        current_node = __get_node(tree, parent, False) if parent else tree
 
         try:
             node_json = json.loads(node_str)

tests/test_json_path_utils.py

@@ -21,6 +21,23 @@ def __get_sample_json():
             }
         }
 
+    @staticmethod
+    def __get_array_sample_json():
+        return {
+            "node1": [
+                {
+                    "node2": {
+                    "colour": "red",
+                    "shape": "circle",
+                    "position": {
+                        "lat": 1,
+                        "long": 3
+                        }
+                    }
+                }
+            ]
+        }
+
     def test_get_node(self):
         sample_json = self.__get_sample_json()
 
@@ -151,6 +168,29 @@ def test_update_node_not_json(self):
 
         self.assertIsInstance(node["node1"]["node2"], str, "not a json string")
 
+    def test_update_node_array_with_str(self):
+        sample_json = self.__get_array_sample_json()
+        node = to_test.update_node(sample_json, "node1.node2", "not a json string")
+
+        self.assertIsInstance(node["node1"][0]["node2"], str, "not a json string")
+
+    def test_update_node_array_with_json_str(self):
+        sample_json = self.__get_array_sample_json()
+        node = to_test.update_node(sample_json, "node1.node2", '{"position": {"brightness": 6}}')
+
+        self.assertIsInstance(node["node1"][0]["node2"]["position"], dict)
+        self.assertDictEqual({'node1': [
+                                {'node2': {
+                                    'colour': 'red',
+                                    'shape': 'circle',
+                                    'position': {
+                                        'brightness': 6
+                                    }
+                                }
+                                }
+                            ]}, node)
+
+
     def test_update_node_primitive_type(self):
         sample_json = self.__get_sample_json()