Move variable definition outside if.

Author: rhysrevans3

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/utils.py

@@ -150,14 +150,15 @@ def remove_commands(commands: ESCommandSet, path: ElasticPath) -> None:
         path (ElasticPath): Path to value to be removed
 
     """
+    commands.add(f"def {path.variable_name};")
     if isinstance(path.key, int):
         commands.add(
             f"if (ctx._source{path.es_nest} instanceof ArrayList)"
-            f"{{def {path.variable_name} = ctx._source{path.es_nest}.remove({path.es_key});}} else "
+            f"{{{path.variable_name} = ctx._source{path.es_nest}.remove({path.es_key});}} else "
         )
 
     commands.add(
-        f"def {path.variable_name} = ctx._source{path.es_nest}.remove('{path.key}');"
+        f"{path.variable_name} = ctx._source{path.es_nest}.remove('{path.key}');"
     )
 
 
@@ -190,11 +191,12 @@ def add_commands(
     if isinstance(path.key, int):
         commands.add(
             f"if (ctx._source{path.es_nest} instanceof ArrayList)"
-            f"{{ctx._source{path.es_nest}.{'add' if operation.op in ['add', 'move'] else 'set'}({path.es_key}, {value})}}"
-            f" else "
+            f"{{ctx._source{path.es_nest}.{'add' if operation.op in ['add', 'move'] else 'set'}({path.es_key}, {value});}}"
+            f" else ctx._source{path.es_nest}['{path.es_key}'] = {value};"
         )
 
-    commands.add(f"ctx._source{path.es_path} = {value};")
+    else:
+        commands.add(f"ctx._source{path.es_path} = {value};")
 
 
 def test_commands(