Make sure to only return hasOriginID if there are only origin.id fields.

lostlevels · lostlevels · commit 8d8ea30bb464 · 2024-07-11T10:41:52.000-07:00
diff --git a/data/store/mongo/mongo_datum.go b/data/store/mongo/mongo_datum.go
@@ -557,7 +557,6 @@ func validateAndTranslateSelectors(selectors *data.Selectors) (filter bson.M, ha
 			if selector.ID != nil {
 				selectorIDs = append(selectorIDs, *selector.ID)
 			} else if selector.Origin != nil && selector.Origin.ID != nil {
-				hasOriginID = true
 				selectorOriginIDs = append(selectorOriginIDs, *selector.Origin.ID)
 			}
 		}
@@ -579,7 +578,7 @@ func validateAndTranslateSelectors(selectors *data.Selectors) (filter bson.M, ha
 		return nil, false, errors.New("selectors is invalid")
 	}
 
-	return selector, hasOriginID, nil
+	return selector, len(selectorOriginIDs) > 0 && len(selectorIDs) == 0, nil
 }
 
 func (d *DatumRepository) GetDataRange(ctx context.Context, userId string, typ []string, status *data.UserDataStatus) (*mongo.Cursor, error) {

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,6 @@ func validateAndTranslateSelectors(selectors *data.Selectors) (filter bson.M, ha`
`557`	`557`	`if selector.ID != nil {`
`558`	`558`	`selectorIDs = append(selectorIDs, *selector.ID)`
`559`	`559`	`} else if selector.Origin != nil && selector.Origin.ID != nil {`
`560`		`- hasOriginID = true`
`561`	`560`	`selectorOriginIDs = append(selectorOriginIDs, *selector.Origin.ID)`
`562`	`561`	`}`
`563`	`562`	`}`
`@@ -579,7 +578,7 @@ func validateAndTranslateSelectors(selectors *data.Selectors) (filter bson.M, ha`
`579`	`578`	`return nil, false, errors.New("selectors is invalid")`
`580`	`579`	`}`
`581`	`580`
`582`		`- return selector, hasOriginID, nil`
	`581`	`+ return selector, len(selectorOriginIDs) > 0 && len(selectorIDs) == 0, nil`
`583`	`582`	`}`
`584`	`583`
`585`	`584`	`func (d DatumRepository) GetDataRange(ctx context.Context, userId string, typ []string, status data.UserDataStatus) (*mongo.Cursor, error) {`