DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix meta id for record duplication warnings

Browse Source
This commit is contained in:
Vivek Patel 2022-09-23 14:27:13 +05:30
parent 93b3a2819a
commit a3831aaf87
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/service/record.go
View File

@ -585,7 +585,9 @@ func (svc record) Bulk(ctx context.Context, oo ...*types.RecordBulkOperation) (r
aProp.setChanged(r)
// Attach meta ID to each value error for FE identification
dd.SetMetaID(p.ID)
if !dd.HasStrictErrors() && r != nil {
dd.SetMetaID(r.ID)
}
if rve := types.IsRecordValueErrorSet(err); rve != nil {
// Attach additional meta to each value error for FE identification

7
compose/types/record_detect_duplicates.go
View File

@ -61,6 +61,9 @@ func (d deDup) CheckDuplication(ctx context.Context, rules DeDupRuleSet, rec Rec
return
}
if out.IsValid() {
out = nil
}
return
}
@ -131,7 +134,7 @@ func (rule DeDupRule) checkCaseSensitiveDuplication(ctx context.Context, ls loca
return
}
func (v *RecordValueErrorSet) SetMetaID(id string) {
func (v *RecordValueErrorSet) SetMetaID(id uint64) {
if v.IsValid() {
return
}
@ -139,7 +142,7 @@ func (v *RecordValueErrorSet) SetMetaID(id string) {
for _, val := range v.Set {
if val.Meta != nil {
if _, ok := val.Meta["id"]; !ok {
val.Meta["id"] = id
val.Meta["id"] = cast.ToString(id)
}
}
}