Questions tab, question bubbles, answer snapshots; errors to transcript
This commit is contained in:
@@ -34,14 +34,13 @@ func (m *Manager) MergeAfterReview(ctx context.Context, task api.Task, user api.
|
||||
}
|
||||
}
|
||||
|
||||
snaps, err := m.store.ListSnapshots(ctx, task.Id)
|
||||
latest, err := m.store.LastSnapshotNot(ctx, task.Id, api.SnapshotTriggerAnswer)
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
return api.Task{}, fmt.Errorf("%w: task %s has no snapshot under review", ErrConflict, task.Id)
|
||||
}
|
||||
if err != nil {
|
||||
return api.Task{}, err
|
||||
}
|
||||
if len(snaps) == 0 {
|
||||
return api.Task{}, fmt.Errorf("%w: task %s has no snapshot under review", ErrConflict, task.Id)
|
||||
}
|
||||
latest := snaps[len(snaps)-1]
|
||||
reviews, err := m.store.ListReviews(ctx, task.Id)
|
||||
if err != nil {
|
||||
return api.Task{}, err
|
||||
@@ -147,11 +146,11 @@ func (m *Manager) startMergeAfterReview(ctx context.Context, r api.Review, mar s
|
||||
if task.Discarding {
|
||||
return "the task is being discarded"
|
||||
}
|
||||
snaps, err := m.store.ListSnapshots(ctx, task.Id)
|
||||
latest, err := m.store.LastSnapshotNot(ctx, task.Id, api.SnapshotTriggerAnswer)
|
||||
if err != nil {
|
||||
return err.Error()
|
||||
}
|
||||
if len(snaps) == 0 || snaps[len(snaps)-1].N != r.SnapshotN {
|
||||
if latest.N != r.SnapshotN {
|
||||
return "a newer snapshot was taken"
|
||||
}
|
||||
sess, found, err := m.liveSession(ctx, task.Id)
|
||||
|
||||
Reference in New Issue
Block a user