Fix use of Add with expiry in transaction

Author: mythz

src/ServiceStack.Redis/RedisClient.ICacheClient.cs

@@ -116,6 +116,14 @@ public bool Add<T>(string key, T value, DateTime expiresAt)
             });
         }
 
+        public bool Add<T>(string key, T value, TimeSpan expiresIn)
+        {
+            return Exec(r => {
+                r.SetEntryIfNotExists(key, value.ToJson(), expiresIn);
+                return true;
+            });
+        }
+
         public bool Set<T>(string key, T value, TimeSpan expiresIn)
         {
             var bytesValue = value as byte[];
@@ -159,19 +167,6 @@ public bool Replace<T>(string key, T value, DateTime expiresAt)
             });
         }
 
-        public bool Add<T>(string key, T value, TimeSpan expiresIn)
-        {
-            return Exec(r =>
-            {
-                if (r.Add(key, value))
-                {
-                    r.ExpireEntryIn(key, expiresIn);
-                    return true;
-                }
-                return false;
-            });
-        }
-
         public bool Replace<T>(string key, T value, TimeSpan expiresIn)
         {
             return Exec(r =>

tests/ServiceStack.Redis.Tests/RedisTransactionTests.cs

@@ -244,7 +244,8 @@ public void Transaction_can_be_replayed()
                 Assert.That(Redis.GetValue(KeySquared), Is.EqualTo("1"));
             }
         }
-            [Test]
+
+        [Test]
         public void Transaction_can_issue_watch()
         {
             Redis.Del(Key);
@@ -265,7 +266,50 @@ public void Transaction_can_issue_watch()
 
             Assert.That(Redis.GetValue(Key), Is.EqualTo("7"));
             Assert.That(Redis.GetValue(KeySquared), Is.Null);   
+        }
+
+        [Test]
+        public void Can_set_Expiry_on_key_in_transaction()
+        {
+            var expiresIn = TimeSpan.FromMinutes(15);
+
+            const string key = "No TTL-Transaction";
+            var keyWithTtl = "{0}s TTL-Transaction".Fmt(expiresIn.TotalSeconds);
+
+            using (var trans = Redis.CreateTransaction())
+            {
+                trans.QueueCommand(r => r.Add(key, "Foo"));
+                trans.QueueCommand(r => r.Add(keyWithTtl, "Bar", expiresIn));
+
+                if (!trans.Commit())
+                    throw new Exception("Transaction Failed");
+            }
+
+            Assert.That(Redis.Get<string>(key), Is.EqualTo("Foo"));
+            Assert.That(Redis.Get<string>(keyWithTtl), Is.EqualTo("Bar"));
+
+            Assert.That(Redis.GetTimeToLive(key).TotalSeconds, Is.EqualTo(-1));
+            Assert.That(Redis.GetTimeToLive(keyWithTtl).TotalSeconds, Is.GreaterThan(1));
+        }
+
+        [Test]
+        public void Does_not_set_Expiry_on_existing_key_in_transaction()
+        {
+            var expiresIn = TimeSpan.FromMinutes(15);
+
+            var key = "Exting TTL-Transaction";
+            Redis.Add(key, "Foo");
+
+            using (var trans = Redis.CreateTransaction())
+            {
+                trans.QueueCommand(r => r.Add(key, "Bar", expiresIn));
+
+                if (!trans.Commit())
+                    throw new Exception("Transaction Failed");
+            }
 
+            Assert.That(Redis.Get<string>(key), Is.EqualTo("Foo"));
+            Assert.That(Redis.GetTimeToLive(key).TotalSeconds, Is.EqualTo(-1));
         }
     }
 }