Resolve main merge and add unmanaged store race tests
Co-authored-by: genichin <4282227+genichin@users.noreply.github.com>
This commit is contained in:
co-authored by
genichin
parent
c73e382b70
commit
84d81658a1
@@ -258,7 +258,7 @@ class PostgreSQLUnmanagedPositionStore:
|
||||
"actor": row[4],
|
||||
"evidence_ref": row[5],
|
||||
"note": row[6],
|
||||
"created_at": row[7],
|
||||
"recorded_at": row[7],
|
||||
}
|
||||
for row in cur.fetchall()
|
||||
]
|
||||
|
||||
@@ -660,7 +660,7 @@ class InMemoryUnmanagedPositionStore:
|
||||
"operator_note": "",
|
||||
"operator_actor": None,
|
||||
"operator_updated_at": None,
|
||||
"created_at": now,
|
||||
"recorded_at": now,
|
||||
**preserved,
|
||||
"updated_at": now,
|
||||
}
|
||||
@@ -695,7 +695,7 @@ class InMemoryUnmanagedPositionStore:
|
||||
if transition == "quantity_changed" and previous_quantity is not None
|
||||
else ""
|
||||
),
|
||||
"created_at": now,
|
||||
"recorded_at": now,
|
||||
}
|
||||
)
|
||||
return {
|
||||
@@ -737,7 +737,7 @@ class InMemoryUnmanagedPositionStore:
|
||||
"actor": actor,
|
||||
"evidence_ref": state.get("evidence_ref"),
|
||||
"note": "",
|
||||
"created_at": now,
|
||||
"recorded_at": now,
|
||||
}
|
||||
)
|
||||
return resolved
|
||||
@@ -798,7 +798,7 @@ class InMemoryUnmanagedPositionStore:
|
||||
"actor": actor,
|
||||
"evidence_ref": evidence_ref,
|
||||
"note": note,
|
||||
"created_at": now,
|
||||
"recorded_at": now,
|
||||
}
|
||||
)
|
||||
return dict(state)
|
||||
|
||||
Reference in New Issue
Block a user