From 58238276acbab75e78d8e0e8dbfed522fd86514a Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 20 Dec 2023 15:35:20 +1300 Subject: [PATCH] _deduplicator clause to selector --- .../20231128_jellyfish_migration.go | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go b/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go index 26c0b4d24..a2f504cf4 100644 --- a/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go +++ b/migrations/20231128_jellyfish_migration/20231128_jellyfish_migration.go @@ -363,7 +363,7 @@ func (m *Migration) fetchAndUpdateBatch() bool { start := time.Now() selector := bson.M{ - //"_deduplicator": bson.M{"$exists": false}, + "_deduplicator": bson.M{"$exists": false}, // testing based on _userId for jamie+qa3_2@tidepool.org "_userId": "db0157c8-565e-4f67-92a5-dfb6b0f4c385", } @@ -401,19 +401,17 @@ func (m *Migration) fetchAndUpdateBatch() bool { log.Printf("failed decoding data: %s", err) return false } - if dDataResult["_deduplicator"] == nil { - datumID, datumUpdates, err := utils.GetDatumUpdates(dDataResult) - if err != nil { - m.onError(err, datumID, "failed getting updates") - continue - } - - updateOp := mongo.NewUpdateOneModel() - updateOp.SetFilter(bson.M{"_id": datumID, "modifiedTime": dDataResult["modifiedTime"]}) - updateOp.SetUpdate(datumUpdates) - m.updates = append(m.updates, updateOp) - m.lastUpdatedId = datumID + datumID, datumUpdates, err := utils.GetDatumUpdates(dDataResult) + if err != nil { + m.onError(err, datumID, "failed getting updates") + continue } + + updateOp := mongo.NewUpdateOneModel() + updateOp.SetFilter(bson.M{"_id": datumID, "modifiedTime": dDataResult["modifiedTime"]}) + updateOp.SetUpdate(datumUpdates) + m.updates = append(m.updates, updateOp) + m.lastUpdatedId = datumID } log.Printf("selector took %s", time.Since(start)) return len(m.updates) > 0