Skip to content

Commit 25ff1d0

Browse files
DavidHogueDavidHogue
committed
PG-215 Rename GetUnprocessedMessage to GetDeadLetterMessage
1 parent a3750af commit 25ff1d0

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

‎src/Learning.MessageQueue/Messages/RetryableAsyncRedisSubscription.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public virtual async Task RetryAsync()
5454
for (var i = 0; i < listLength; i++)
5555
{
5656
var indexToGet = i - eventsProcessed;
57-
var eventData = await _messageQueueRepository.GetUnprocessedMessage<T>(indexToGet).ConfigureAwait(false);
57+
var eventData = await _messageQueueRepository.GetDeadLetterMessage<T>(indexToGet).ConfigureAwait(false);
5858

5959
if (string.IsNullOrEmpty(eventData))
6060
{

‎src/Learning.MessageQueue/Messages/RetryableRedisSubscription.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public virtual async Task RetryAsync()
5252
for (var i = 0; i < listLength; i++)
5353
{
5454
var indexToGet = i - eventsProcessed;
55-
var eventData = await _messageQueueRepository.GetUnprocessedMessage<T>(indexToGet).ConfigureAwait(false);
55+
var eventData = await _messageQueueRepository.GetDeadLetterMessage<T>(indexToGet).ConfigureAwait(false);
5656

5757
if (string.IsNullOrEmpty(eventData))
5858
{

‎src/Learning.MessageQueue/Repository/IMessageQueueRepository.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public interface IMessageQueueRepository
1010
{
1111
Task<long> GetDeadLetterListLength<T>() where T : IMessage;
1212

13-
// TODO: Rename to GetDeadLetterMessage
14-
Task<RedisValue> GetUnprocessedMessage<T>(int index) where T : IMessage;
13+
Task<RedisValue> GetDeadLetterMessage<T>(int index) where T : IMessage;
1514

1615
void AddToDeadLetterQueue<T>(RedisValue eventData, IMessage @event, Exception exception) where T : IMessage;
1716

‎src/Learning.MessageQueue/Repository/MessageQueueRepository.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public async Task<long> GetDeadLetterListLength<T>() where T : IMessage
3535
return listLength;
3636
}
3737

38-
// TODO: Rename to GetDeadLetterMessage
39-
public async Task<RedisValue> GetUnprocessedMessage<T>(int index) where T : IMessage
38+
public async Task<RedisValue> GetDeadLetterMessage<T>(int index) where T : IMessage
4039
{
4140
var deadLetterListKey = GetDeadLetterListKey<T>();
4241

‎test/Learning.EventStore.Test/RedisMessageQueue/RetryableAsyncSubscriptionTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task CallsCallbackAndDeletesFromDeadLetterQueue()
2323
var message1 = JsonConvert.SerializeObject(new TestAsyncMessage { Id = "0" });
2424
var message2 = JsonConvert.SerializeObject(new TestAsyncMessage { Id = "1" });
2525
var message3 = JsonConvert.SerializeObject(new TestAsyncMessage { Id = "2" });
26-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestAsyncMessage>(0)).ReturnsNextFromSequence(message1, message2, message3);
26+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestAsyncMessage>(0)).ReturnsNextFromSequence(message1, message2, message3);
2727
var retryData = new RetryData
2828
{
2929
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1)
@@ -47,7 +47,7 @@ public async Task IncrementsExecutionCounterOnCallbackException()
4747
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
4848
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestAsyncMessage>()).Returns(1);
4949
var message = new TestAsyncMessage { Id = "0" };
50-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
50+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
5151
var retryData = new RetryData
5252
{
5353
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1)
@@ -68,7 +68,7 @@ public async Task CallsCallbackIfTimeToLiveHasNotBeenExceeded()
6868
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
6969
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestAsyncMessage>()).Returns(1);
7070
var message = new TestAsyncMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-1) };
71-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
71+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
7272
var retryData = new RetryData
7373
{
7474
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),
@@ -90,7 +90,7 @@ public async Task DoesNotCallCallbackAndDeletesFromDeadLetterQueueIfTimeToLiveIs
9090
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
9191
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestAsyncMessage>()).Returns(1);
9292
var message = new TestAsyncMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-169) };
93-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
93+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
9494
var retryData = new RetryData
9595
{
9696
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),
@@ -112,7 +112,7 @@ public async Task DoesNotFailWithLargeNumberOfRetries()
112112
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
113113
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestAsyncMessage>()).Returns(1);
114114
var message = new TestAsyncMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-1) };
115-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
115+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestAsyncMessage>(0)).Returns(JsonConvert.SerializeObject(message));
116116
var retryData = new RetryData
117117
{
118118
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),

‎test/Learning.EventStore.Test/RedisMessageQueue/RetryableSubscriptionTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task CallsCallbackAndDeletesFromDeadLetterQueue()
2323
var message1 = JsonConvert.SerializeObject(new TestMessage { Id = "0" });
2424
var message2 = JsonConvert.SerializeObject(new TestMessage { Id = "1" });
2525
var message3 = JsonConvert.SerializeObject(new TestMessage { Id = "2" });
26-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestMessage>(0)).ReturnsNextFromSequence(message1, message2, message3);
26+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestMessage>(0)).ReturnsNextFromSequence(message1, message2, message3);
2727
var retryData = new RetryData
2828
{
2929
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1)
@@ -47,7 +47,7 @@ public async Task IncrementsExecutionCounterOnCallbackException()
4747
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
4848
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestMessage>()).Returns(1);
4949
var message = new TestMessage { Id = "0" };
50-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
50+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
5151
var retryData = new RetryData
5252
{
5353
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1)
@@ -68,7 +68,7 @@ public async Task CallsCallbackIfTimeToLiveHasNotBeenExceeded()
6868
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
6969
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestMessage>()).Returns(1);
7070
var message = new TestMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-1) };
71-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
71+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
7272
var retryData = new RetryData
7373
{
7474
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),
@@ -90,7 +90,7 @@ public async Task DoesNotCallCallbackAndDeletesFromDeadLetterQueueIfTimeToLiveIs
9090
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
9191
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestMessage>()).Returns(1);
9292
var message = new TestMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-169) };
93-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
93+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
9494
var retryData = new RetryData
9595
{
9696
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),
@@ -112,7 +112,7 @@ public async Task DoesNotFailWithLargeNumberOfRetries()
112112
var eventStoreRepository = A.Fake<IMessageQueueRepository>();
113113
A.CallTo(() => eventStoreRepository.GetDeadLetterListLength<TestMessage>()).Returns(1);
114114
var message = new TestMessage { Id = "0", TimeStamp = DateTimeOffset.UtcNow.AddHours(-1) };
115-
A.CallTo(() => eventStoreRepository.GetUnprocessedMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
115+
A.CallTo(() => eventStoreRepository.GetDeadLetterMessage<TestMessage>(0)).Returns(JsonConvert.SerializeObject(message));
116116
var retryData = new RetryData
117117
{
118118
LastRetryTime = DateTimeOffset.UtcNow.AddHours(-1),

0 commit comments

Comments
 (0)