Accept final member positions in ownership transactions
This commit is contained in:
@@ -22,10 +22,11 @@ func (s *service) moveSubgraphMembers(w http.ResponseWriter, r *http.Request, pr
|
||||
return nil
|
||||
}
|
||||
var input struct {
|
||||
Source string `json:"source_board_id"`
|
||||
Target string `json:"target_board_id"`
|
||||
Nodes []string `json:"node_ids"`
|
||||
Expected map[string]int64 `json:"expected_versions"`
|
||||
Source string `json:"source_board_id"`
|
||||
Target string `json:"target_board_id"`
|
||||
Nodes []string `json:"node_ids"`
|
||||
Expected map[string]int64 `json:"expected_versions"`
|
||||
Positions map[string]memberDropPosition `json:"positions,omitempty"`
|
||||
}
|
||||
if !decode(w, r, &input) {
|
||||
return nil
|
||||
@@ -40,6 +41,10 @@ func (s *service) moveSubgraphMembers(w http.ResponseWriter, r *http.Request, pr
|
||||
return nil
|
||||
}
|
||||
}
|
||||
if !validMemberDropPositions(input.Nodes, input.Positions) {
|
||||
reject(w, 400, "invalid_subgraph_request")
|
||||
return nil
|
||||
}
|
||||
if len(input.Expected) == 0 {
|
||||
reject(w, 428, "version_required")
|
||||
return nil
|
||||
@@ -194,6 +199,14 @@ func (s *service) moveSubgraphMembers(w http.ResponseWriter, r *http.Request, pr
|
||||
before = append(before, snapshot)
|
||||
}
|
||||
raw := map[string]json.RawMessage{parent: snapshots[parent].Document, input.Source: snapshots[input.Source].Document, input.Target: snapshots[input.Target].Document}
|
||||
if input.Positions != nil {
|
||||
positioned, err := positionMemberDrop(raw[input.Source], input.Positions)
|
||||
if err != nil {
|
||||
reject(w, 409, "ownership_conflict")
|
||||
return nil
|
||||
}
|
||||
raw[input.Source] = positioned
|
||||
}
|
||||
moved, err := moveMembersDocuments(parent, input.Source, input.Target, input.Nodes, raw)
|
||||
if err != nil {
|
||||
if err == errGraphOwnership {
|
||||
|
||||
Reference in New Issue
Block a user