flows: fix exporting and importing for models with multiple unique fields

passbook/flows/transfer/common.py

@@ -11,10 +11,10 @@ from passbook.lib.sentry import SentryIgnoredException
 def get_attrs(obj: SerializerModel) -> Dict[str, Any]:
     """Get object's attributes via their serializer, and covert it to a normal dict"""
     data = dict(obj.serializer(obj).data)
-    if "policies" in data:
-        data.pop("policies")
-    if "stages" in data:
-        data.pop("stages")
+    to_remove = ("policies", "stages", "pk")
+    for to_remove_name in to_remove:
+        if to_remove_name in data:
+            data.pop(to_remove_name)
     return data
 
 
@@ -22,17 +22,26 @@ def get_attrs(obj: SerializerModel) -> Dict[str, Any]:
 class FlowBundleEntry:
     """Single entry of a bundle"""
 
-    identifier: str
+    identifiers: Dict[str, Any]
     model: str
     attrs: Dict[str, Any]
 
     @staticmethod
-    def from_model(model: SerializerModel) -> "FlowBundleEntry":
+    def from_model(
+        model: SerializerModel, *extra_identifier_names: str
+    ) -> "FlowBundleEntry":
         """Convert a SerializerModel instance to a Bundle Entry"""
+        identifiers = {
+            "pk": model.pk,
+        }
+        all_attrs = get_attrs(model)
+
+        for extra_identifier_name in extra_identifier_names:
+            identifiers[extra_identifier_name] = all_attrs.pop(extra_identifier_name)
         return FlowBundleEntry(
-            identifier=model.pk,
+            identifiers=identifiers,
             model=f"{model._meta.app_label}.{model._meta.model_name}",
-            attrs=get_attrs(model),
+            attrs=all_attrs,
         )