smell: expression_attribute_values

Author: JamesW1-NHS

lambdas/backend/src/repository/fhir_repository.py

@@ -223,27 +223,21 @@ def _perform_dynamo_update(
             else Attr("PK").eq(attr.pk) & Attr("DeletedAt").not_exists()
         )
 
+        expression_attribute_values = {
+            ":timestamp": attr.timestamp,
+            ":patient_pk": attr.patient_pk,
+            ":patient_sk": attr.patient_sk,
+            ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
+            ":operation": "UPDATE",
+            ":version": updated_version,
+            ":supplier_system": supplier_system,
+        }
         if reinstate_operation_required:
-            expression_attribute_values = {
-                ":timestamp": attr.timestamp,
-                ":patient_pk": attr.patient_pk,
-                ":patient_sk": attr.patient_sk,
-                ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
-                ":operation": "UPDATE",
-                ":version": updated_version,
-                ":supplier_system": supplier_system,
-                ":respawn": "reinstated",
-            }
-        else:
-            expression_attribute_values = {
-                ":timestamp": attr.timestamp,
-                ":patient_pk": attr.patient_pk,
-                ":patient_sk": attr.patient_sk,
-                ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
-                ":operation": "UPDATE",
-                ":version": updated_version,
-                ":supplier_system": supplier_system,
-            }
+            expression_attribute_values.update(
+                {
+                    ":respawn": "reinstated",
+                }
+            )
 
         try:
             self.table.update_item(

lambdas/recordforwarder/src/repository/fhir_batch_repository.py

@@ -274,27 +274,21 @@ def _perform_dynamo_update(
                 if deleted_at_required
                 else Attr("PK").eq(attr.pk) & Attr("DeletedAt").not_exists()
             )
+            expression_attribute_values = {
+                ":timestamp": attr.timestamp,
+                ":patient_pk": attr.patient_pk,
+                ":patient_sk": attr.patient_sk,
+                ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
+                ":operation": "UPDATE",
+                ":version": attr.version,
+                ":supplier_system": attr.supplier,
+            }
             if deleted_at_required and update_reinstated is False:
-                expression_attribute_values = {
-                    ":timestamp": attr.timestamp,
-                    ":patient_pk": attr.patient_pk,
-                    ":patient_sk": attr.patient_sk,
-                    ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
-                    ":operation": "UPDATE",
-                    ":version": attr.version,
-                    ":supplier_system": attr.supplier,
-                    ":respawn": "reinstated",
-                }
-            else:
-                expression_attribute_values = {
-                    ":timestamp": attr.timestamp,
-                    ":patient_pk": attr.patient_pk,
-                    ":patient_sk": attr.patient_sk,
-                    ":imms_resource_val": json.dumps(attr.resource, use_decimal=True),
-                    ":operation": "UPDATE",
-                    ":version": attr.version,
-                    ":supplier_system": attr.supplier,
-                }
+                expression_attribute_values.update(
+                    {
+                        ":respawn": "reinstated",
+                    }
+                )
 
             response = table.update_item(
                 Key={"PK": attr.pk},