Add updated changes to thread builder

data/threadbuilder/threadbuilder.go

@@ -26,6 +26,7 @@ type threadChange struct {
 type ThreadBuilder struct {
 	threadId       string
 	allChanges     map[string]*threadChange
+	updatedChanges map[string]*threadChange
 	heads          []string
 	maybeHeads     []string
 	keychain       *Keychain
@@ -34,6 +35,7 @@ type ThreadBuilder struct {
 func NewThreadBuilder(keychain *Keychain) *ThreadBuilder {
 	return &ThreadBuilder{
 		allChanges:     make(map[string]*threadChange),
+		updatedChanges: make(map[string]*threadChange),
 		keychain:       keychain,
 	}
 }
@@ -121,7 +123,20 @@ func (t *ThreadBuilder) SetHeads(heads []string) {
 }
 
 func (t *ThreadBuilder) GetChange(ctx context.Context, recordID string) (*threadmodels.RawChange, error) {
-	rec := t.allChanges[recordID]
+	return t.getChange(recordID, t.allChanges), nil
+}
+
+func (t *ThreadBuilder) GetUpdatedChanges() []*threadmodels.RawChange {
+	var res []*threadmodels.RawChange
+	for _, ch := range t.updatedChanges {
+		rawCh := t.getChange(ch.id, t.updatedChanges)
+		res = append(res, rawCh)
+	}
+	return res
+}
+
+func (t *ThreadBuilder) getChange(changeId string, m map[string]*threadChange) *threadmodels.RawChange {
+	rec := m[changeId]
 
 	if rec.changesDataDecrypted != nil {
 		encrypted, err := rec.readKey.Key.Encrypt(rec.changesDataDecrypted)
@@ -145,13 +160,9 @@ func (t *ThreadBuilder) GetChange(ctx context.Context, recordID string) (*thread
 	transformedRec := &threadmodels.RawChange{
 		Payload:   aclMarshaled,
 		Signature: signature,
-		Id:        recordID,
+		Id:        changeId,
 	}
-	return transformedRec, nil
+	return transformedRec
-}
-
-func (t *ThreadBuilder) PushChange(payload proto.Marshaler) (id string, err error) {
-	panic("implement me")
 }
 
 func (t *ThreadBuilder) Parse(thread *YMLThread) {
@@ -161,6 +172,20 @@ func (t *ThreadBuilder) Parse(thread *YMLThread) {
 	t.keychain.ParseKeys(&thread.Keys)
 	t.threadId = t.parseThreadId(thread.Description)
 	for _, ch := range thread.Changes {
+		newChange := t.parseChange(ch)
+		t.allChanges[newChange.id] = newChange
+	}
+
+	for _, ch := range thread.UpdatedChanges {
+		newChange := t.parseChange(ch)
+		t.updatedChanges[newChange.id] = newChange
+	}
+
+	t.parseGraph(thread)
+	t.parseHeads(thread)
+}
+
+func (t *ThreadBuilder) parseChange(ch *Change) *threadChange {
 	newChange := &threadChange{
 		id: ch.Id,
 	}
@@ -198,16 +223,13 @@ func (t *ThreadBuilder) Parse(thread *YMLThread) {
 		}
 		m, err := proto.Marshal(changesData)
 		if err != nil {
-				return
+			return nil
 		}
 		newChange.changesDataDecrypted = m
 	}
 	aclChange.CurrentReadKeyHash = k.Hash
 	newChange.ACLChange = aclChange
-		t.allChanges[newChange.id] = newChange
+	return newChange
-	}
-	t.parseGraph(thread)
-	t.parseHeads(thread)
 }
 
 func (t *ThreadBuilder) parseThreadId(description *ThreadDescription) string {
@@ -415,8 +437,8 @@ func (t *ThreadBuilder) convertPermission(perm string) pb.ACLChangeUserPermissio
 
 func (t *ThreadBuilder) traverseFromHeads(f func(t *threadChange) error) error {
 	uniqMap := map[string]struct{}{}
-	stack := make([]string, len(t.heads), 10)
+	stack := make([]string, len(t.maybeHeads), 10)
-	copy(stack, t.heads)
+	copy(stack, t.maybeHeads)
 	for len(stack) > 0 {
 		id := stack[len(stack)-1]
 		stack = stack[:len(stack)-1]
@@ -444,6 +466,13 @@ func (t *ThreadBuilder) parseGraph(thread *YMLThread) {
 		rec.TreeHeadIds = node.TreeHeads
 		rec.SnapshotBaseId = node.BaseSnapshot
 	}
+
+	for _, node := range thread.UpdatedGraph {
+		rec := t.updatedChanges[node.Id]
+		rec.AclHeadIds = node.ACLHeads
+		rec.TreeHeadIds = node.TreeHeads
+		rec.SnapshotBaseId = node.BaseSnapshot
+	}
 }
 
 func (t *ThreadBuilder) parseHeads(thread *YMLThread) {

data/threadbuilder/userjoinexample.yml

@@ -101,3 +101,15 @@ graph:
     treeHeads: [B.1.1]
 maybeHeads:
   - "A.1.3"
+updatedChanges:
+  - id: B.1.3
+    identity: B
+    changes:
+      - textAppend:
+          text: "first"
+    readKey: key.Read.1
+updatedGraph:
+  - id: B.1.3
+    baseSnapshot: A.1.1
+    aclHeads: [ B.1.1 ]
+    treeHeads: [ B.1.2 ]

data/threadbuilder/ymlentities.go

@@ -70,9 +70,15 @@ type PlainTextChange struct {
 	} `yaml:"textAppend"`
 }
 
-type YMLThread struct {
+type GraphNode struct {
-	Description *ThreadDescription `yaml:"thread"`
+	Id           string   `yaml:"id"`
-	Changes     []struct {
+	BaseSnapshot string   `yaml:"baseSnapshot"`
+	AclSnapshot  string   `yaml:"aclSnapshot"`
+	ACLHeads     []string `yaml:"aclHeads"`
+	TreeHeads    []string `yaml:"treeHeads"`
+}
+
+type Change struct {
 	Id       string `yaml:"id"`
 	Identity string `yaml:"identity"`
 
@@ -82,17 +88,17 @@ type YMLThread struct {
 	Changes     []*PlainTextChange `yaml:"changes"`
 
 	ReadKey string `yaml:"readKey"`
-	} `yaml:"changes"`
+}
+
+type YMLThread struct {
+	Description    *ThreadDescription `yaml:"thread"`
+	Changes        []*Change          `yaml:"changes"`
+	UpdatedChanges []*Change          `yaml:"updatedChanges"`
 
 	Keys Keys `yaml:"keys"`
 
-	Graph []struct {
+	Graph        []*GraphNode `yaml:"graph"`
-		Id           string   `yaml:"id"`
+	UpdatedGraph []*GraphNode `yaml:"updatedGraph"`
-		BaseSnapshot string   `yaml:"baseSnapshot"`
-		AclSnapshot  string   `yaml:"aclSnapshot"`
-		ACLHeads     []string `yaml:"aclHeads"`
-		TreeHeads    []string `yaml:"treeHeads"`
-	} `yaml:"graph"`
 
 	Heads      []string `yaml:"heads"`
 	MaybeHeads []string `yaml:"maybeHeads"`