diff --git a/swh/storage/replay.py b/swh/storage/replay.py --- a/swh/storage/replay.py +++ b/swh/storage/replay.py @@ -21,6 +21,7 @@ Directory, Origin, OriginVisit, + OriginVisitStatus, Revision, SkippedContent, Snapshot, @@ -37,6 +38,7 @@ object_converter_fn: Dict[str, Callable[[Dict], BaseModel]] = { "origin": Origin.from_dict, "origin_visit": OriginVisit.from_dict, + "origin_visit_status": OriginVisitStatus.from_dict, "snapshot": Snapshot.from_dict, "revision": Revision.from_dict, "release": Release.from_dict, @@ -116,15 +118,16 @@ if object_type == "skipped_content": skipped_contents = [SkippedContent.from_dict(obj) for obj in objects] collision_aware_content_add(storage.skipped_content_add, skipped_contents) - elif object_type == "origin_visit": - visits: List[OriginVisit] = [] + elif object_type in ("origin_visit", "origin_visit_status"): origins: List[Origin] = [] + converter_fn = object_converter_fn[object_type] + model_objs = [] for obj in objects: - visit = OriginVisit.from_dict(obj) - visits.append(visit) - origins.append(Origin(url=visit.origin)) + origins.append(Origin(url=obj["origin"])) + model_objs.append(converter_fn(obj)) storage.origin_add(origins) - storage.origin_visit_upsert(visits) + method = getattr(storage, f"{object_type}_add") + method(model_objs) elif object_type in ("directory", "revision", "release", "snapshot", "origin",): method = getattr(storage, object_type + "_add") method(object_converter_fn[object_type](o) for o in objects) diff --git a/swh/storage/tests/test_replay.py b/swh/storage/tests/test_replay.py --- a/swh/storage/tests/test_replay.py +++ b/swh/storage/tests/test_replay.py @@ -201,6 +201,7 @@ "snapshots", "origins", "origin_visits", + "origin_visit_statuses", ): if exclude and attr in exclude: continue @@ -284,9 +285,8 @@ # Fill the src storage nb_sent = 0 for obj_type, objs in TEST_OBJECTS.items(): - if obj_type == "origin_visit": - # these have non-consistent API and are unrelated with what we - # want to test here + if obj_type in ("origin_visit", "origin_visit_status"): + # these are unrelated with what we want to test here continue method = getattr(storage, obj_type + "_add") method(objs) @@ -348,6 +348,7 @@ "releases", "snapshots", "origins", + "origin_visit_statuses", ): expected_objects = [ (id, maybe_anonymize(obj))