QueryOffset and QuerySequence (#99)

Change in QueryOffset and QuerySequence: on reference null or empty throws QueryException message

Author: simone-fariselli

RabbitMQ.Stream.Client/StreamSystem.cs

@@ -111,6 +111,13 @@ public async Task<bool> StreamExists(string stream)
             return response.StreamInfos is { Count: >= 1 } &&
                    response.StreamInfos[stream].ResponseCode == ResponseCode.Ok;
         }
+        private static void MaybeThrowQueryException(string reference, string stream)
+        {
+            if (string.IsNullOrEmpty(reference) || string.IsNullOrEmpty(stream))
+            {
+                throw new QueryException("Stream name and reference can't be empty or null");
+            }
+        }
 
         /// <summary>
         /// QueryOffset retrieves the last consumer offset stored
@@ -121,15 +128,7 @@ public async Task<bool> StreamExists(string stream)
         /// <returns></returns>
         public async Task<ulong> QueryOffset(string reference, string stream)
         {
-            if (string.IsNullOrEmpty(reference))
-            {
-                return 0;
-            }
-
-            if (string.IsNullOrEmpty(stream))
-            {
-                throw new QueryException("Stream name can't be empty");
-            }
+            MaybeThrowQueryException(reference, stream);
 
             var response = await client.QueryOffset(reference, stream);
             ClientExceptions.MaybeThrowException(response.ResponseCode,
@@ -146,15 +145,7 @@ public async Task<ulong> QueryOffset(string reference, string stream)
         /// <returns></returns>
         public async Task<ulong> QuerySequence(string reference, string stream)
         {
-            if (string.IsNullOrEmpty(reference))
-            {
-                return 0;
-            }
-
-            if (string.IsNullOrEmpty(stream))
-            {
-                throw new QueryException("Stream name can't be empty");
-            }
+            MaybeThrowQueryException(reference, stream);
 
             var response = await client.QueryPublisherSequence(reference, stream);
             ClientExceptions.MaybeThrowException(response.ResponseCode,

Tests/SystemTests.cs

@@ -155,30 +155,65 @@ await Assert.ThrowsAsync<CreateStreamException>(
 
         [Fact]
         [WaitTestBeforeAfter]
-        public async void ValidateQuery()
+        public async void ValidateQueryOffset()
         {
             // here we just validate the Query for Offset and Sequence
             // if the reference is == "" return must be 0
             // stream name is mandatory
             var config = new StreamSystemConfig();
             var system = await StreamSystem.Create(config);
-            var res = await system.QueryOffset("", "stream_we_don_t_care");
-            Assert.True(res == 0);
 
-            res = await system.QuerySequence("", "stream_we_don_t_care");
-            Assert.True(res == 0);
+            await Assert.ThrowsAsync<QueryException>(
+                async () =>
+                {
+                    await system.QueryOffset(string.Empty, "stream_we_don_t_care");
+                }
+            );
+
+            await Assert.ThrowsAsync<QueryException>(
+                async () =>
+                {
+                    await system.QueryOffset("reference_we_don_care", string.Empty);
+                }
+            );
+
+            await Assert.ThrowsAsync<QueryException>(
+                async () =>
+                {
+                    await system.QueryOffset(string.Empty, string.Empty);
+                }
+            );
+            await system.Close();
+        }
+
+        [Fact]
+        [WaitTestBeforeAfter]
+        public async void ValidateQuerySequence()
+        {
+            // here we just validate the Query for Offset and Sequence
+            // if the reference is == "" return must be 0
+            // stream name is mandatory
+            var config = new StreamSystemConfig();
+            var system = await StreamSystem.Create(config);
+
+            await Assert.ThrowsAsync<QueryException>(
+                async () =>
+                {
+                    await system.QuerySequence(string.Empty, "stream_we_don_t_care");
+                }
+            );
 
             await Assert.ThrowsAsync<QueryException>(
                 async () =>
                 {
-                    await system.QueryOffset("reference_we_don_care", "");
+                    await system.QuerySequence("reference_we_don_care", string.Empty);
                 }
             );
 
             await Assert.ThrowsAsync<QueryException>(
                 async () =>
                 {
-                    await system.QuerySequence("reference_we_don_care", "");
+                    await system.QuerySequence(string.Empty, string.Empty);
                 }
             );
             await system.Close();