[#586] fixed nested multiple expands with shared path

2022-12-20 11:07:16 +02:00
parent ca528cef03
commit fb57c8091d
34 changed files with 216 additions and 41 deletions
--- a/daos/record_expand.go
+++ b/daos/record_expand.go
@@ -216,12 +216,7 @@ func (dao *Dao) expandRecords(records []*models.Record, expandPath string, fetch
 					continue
 				}

-				oldRelExpand := oldExpandedRel.Expand()
-				newRelExpand := rel.Expand()
-				for k, v := range oldRelExpand {
-					newRelExpand[k] = v
-				}
-				rel.SetExpand(newRelExpand)
+				rel.MergeExpand(oldExpandedRel.Expand())
 			}
 		}