chore(review) Address review comments (#72)

* chore(review) Address review comments * chore(review) - Add missed UpdateBuilder refactor
gottscj · Jun 22, 2017 · e13e08d · e13e08d
1 parent 8dcdcae
commit e13e08d
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Hangfire.Mongo/MongoWriteOnlyTransaction.cs b/src/Hangfire.Mongo/MongoWriteOnlyTransaction.cs
@@ -149,7 +149,7 @@ public override void AddToSet(string key, string value, double score)
             var builder = Builders<SetDto>.Update;
             var set = builder.Set(_ => _.Score, score);
             var setTypesOnInsert = builder.SetOnInsert("_t", new[] {nameof(KeyValueDto), nameof(ExpiringKeyValueDto), nameof(SetDto)});
-            var setExpireAt = builder.SetOnInsert(nameof(SetDto.ExpireAt), BsonNull.Value);
+            var setExpireAt = builder.SetOnInsert(_ => _.ExpireAt, null);
             var update = builder.Combine(set, setTypesOnInsert, setExpireAt);
 
             QueueCommand(x => x.StateData
@@ -225,10 +225,8 @@ public override void SetRangeInHash(string key, IEnumerable<KeyValuePair<string,
                 throw new ArgumentNullException(nameof(keyValuePairs));
 
             var builder = Builders<HashDto>.Update;
-            var setTypesOnInsert = builder.SetOnInsert("_t",
-                new[] { nameof(KeyValueDto), nameof(ExpiringKeyValueDto), nameof(HashDto) });
-            var setExpireAt = builder.SetOnInsert(nameof(HashDto.ExpireAt), BsonNull.Value);
-
+            var setTypesOnInsert = builder.SetOnInsert("_t", new[] { nameof(KeyValueDto), nameof(ExpiringKeyValueDto), nameof(HashDto) });
+            var setExpireAt = builder.SetOnInsert(_ => _.ExpireAt, null);
 
             foreach (var keyValuePair in keyValuePairs)
             {
@@ -342,16 +340,15 @@ public override void AddRangeToSet(string key, IList<string> items)
             var builder = Builders<SetDto>.Update;
 
 
-            var setTypesOnInsert = builder.SetOnInsert("_t",
-                new[] { nameof(KeyValueDto), nameof(ExpiringKeyValueDto), nameof(SetDto) });
-            var setExpireAt = builder.SetOnInsert(nameof(SetDto.ExpireAt), BsonNull.Value);
+            var setTypesOnInsert = builder.SetOnInsert("_t", new[] { nameof(KeyValueDto), nameof(ExpiringKeyValueDto), nameof(SetDto) });
+            var setExpireAt = builder.SetOnInsert(_ => _.ExpireAt, null);
             var set = builder.Set(_ => _.Score, 0.0);
+            var update = builder.Combine(set, setTypesOnInsert, setExpireAt);
 
             foreach (var item in items)
             {
                 QueueCommand(x =>
                 {
-                    var update = builder.Combine(set, setTypesOnInsert, setExpireAt);
                     x.StateData
                         .OfType<SetDto>()
                         .UpdateMany(