Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced RestSharp with Refit #25

Merged
merged 3 commits into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions src/Novu.Tests/Events/EventUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@
new()
{
EventName = "test",
To = { SubscriberId = subscriber.SubscriberId},

Check warning on line 62 in src/Novu.Tests/Events/EventUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Possible null reference assignment.
Payload = new TestRecord(){ Message = "Hello"}
},
new()
{
EventName = "test",
To = { SubscriberId = subscriber.SubscriberId},

Check warning on line 68 in src/Novu.Tests/Events/EventUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Possible null reference assignment.
Payload = new TestRecord(){ Message = "World"}
},
};

var trigger = await client.Event.TriggerBulkAsync(payload);
var trigger = await client.Event.TriggerBulkAsync(new SendBulkRequest(payload));

if (trigger.PayloadDtos.Count != 2)
{
Expand All @@ -97,16 +97,8 @@
};

if (subscriber.SubscriberId == null) throw new Exception("Subscriber Id is null");

var dto = new EventTriggerDataDto()
{
EventName = "test",
To =
{
SubscriberId = subscriber.SubscriberId
},
Payload = testRecord
};

var dto = new BroadcastMessageRequest("test", testRecord, default);

var trigger = await client.Event.TriggerBroadcastAsync(dto);

Expand All @@ -129,16 +121,8 @@
};

if (subscriber.SubscriberId == null) throw new Exception("Subscriber Id is null");

var dto = new EventTriggerDataDto()
{
EventName = "test",
To =
{
SubscriberId = subscriber.SubscriberId
},
Payload = testRecord
};

var dto = new BroadcastMessageRequest("test", testRecord, default);

var trigger = await client.Event.TriggerBroadcastAsync(dto);

Expand Down Expand Up @@ -185,4 +169,4 @@
public record TestRecord
{
[JsonProperty("message")]
public string Message { get; set; }

Check warning on line 172 in src/Novu.Tests/Events/EventUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Non-nullable property 'Message' must contain a non-null value when exiting constructor. Consider declaring the property as nullable.
Expand Down
8 changes: 3 additions & 5 deletions src/Novu.Tests/Subscribers/SubscriberUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

// Clean up

await _fixture.NovuClient.Subscriber.DeleteSubscriber(subscriber.SubscriberId);

Check warning on line 24 in src/Novu.Tests/Subscribers/SubscriberUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Possible null reference argument for parameter 'id' in 'Task<DeleteResponseDto> ISubscriberClient.DeleteSubscriber(string id)'.
}

[Fact]
Expand All @@ -41,7 +41,7 @@
public async void Should_Get_One_Subscriber()
{
var testSub = await _fixture.GenerateTestSubscriber();
var subscriber = await _fixture.NovuClient.Subscriber.GetSubscriber(testSub.SubscriberId);

Check warning on line 44 in src/Novu.Tests/Subscribers/SubscriberUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Possible null reference argument for parameter 'id' in 'Task<SubscriberDto> ISubscriberClient.GetSubscriber(string id)'.

Assert.Equal(subscriber.SubscriberId, testSub.SubscriberId);
}
Expand All @@ -54,7 +54,7 @@
subToUpdate.FirstName = "Updated";
subToUpdate.LastName = "Subscriber";

var updatedSub = await _fixture.NovuClient.Subscriber.UpdateSubscriber(subToUpdate);
var updatedSub = await _fixture.NovuClient.Subscriber.UpdateSubscriber(subToUpdate.SubscriberId!, subToUpdate);

// Check to make sure fields changed
Assert.Equal(updatedSub.FirstName, subToUpdate.FirstName);
Expand All @@ -68,7 +68,7 @@
public async void Should_Delete_Subscriber()
{
var subscriber = await _fixture.GenerateTestSubscriber();
var deleteResponse = await _fixture.NovuClient.Subscriber.DeleteSubscriber(subscriber.SubscriberId);
var deleteResponse = await _fixture.NovuClient.Subscriber.DeleteSubscriber(subscriber.SubscriberId!);

Assert.True(deleteResponse.Data.Acknowledged);
}
Expand All @@ -77,13 +77,11 @@
public async void Should_Update_Online_Status()
{
var subscriber = await _fixture.GenerateTestSubscriber();
var updateResponse = await _fixture.NovuClient.Subscriber.UpdateOnlineStatus(subscriber.SubscriberId, new SubscriberOnlineDto
var updateResponse = await _fixture.NovuClient.Subscriber.UpdateOnlineStatus(subscriber.SubscriberId!, new SubscriberOnlineDto
{
IsOnline = true
});

Assert.True(updateResponse.IsOnline);
}


}
53 changes: 23 additions & 30 deletions src/Novu.Tests/Topics/TopicUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,22 @@
var topicRequest = new TopicCreateDto
{
Key = $"test:topic:{Guid.NewGuid().ToString()}",
Name = "Test Topic",

Name = "Test Topic"
};

var subscriber = await client.Subscriber.CreateSubscriber(new CreateSubscriberDto()
{
SubscriberId = "test:subscriber:1",
Email = "noreply@novu.com"
});
var topic = await client.Topic.CreateTopicAsync(topicRequest);

var subscriberList = new TopicSubscriberUpdateDto
{
Keys = new List<string>
{
"test:subscriber:1",
}
};
var subscriberList = new TopicSubscriberUpdateDto(new() {"test:subscriber:1" });

var result = await client.Topic.AddSubscriberAsync(topic.Data.Key, subscriberList);

Assert.Single(result.Data.Succeeded);

Assert.Contains(subscriberList.Keys, x => x == result.Data.Succeeded.First());
Assert.Contains(subscriberList.Subscribers, x => x == result.Data.Succeeded.First());
}

[Fact]
Expand All @@ -80,39 +77,35 @@
Key = $"test:topic:{Guid.NewGuid().ToString()}",
Name = "Test Topic - Should_Validate_Topic_Subscriber",
});

var subscriberList = new TopicSubscriberUpdateDto
var subscriber = await client.Subscriber.CreateSubscriber(new CreateSubscriberDto()
{
Keys = new List<string>
{
"test:subscriber:1",
}
};

SubscriberId = "test:subscriber:1",
});
var subscriberList = new TopicSubscriberUpdateDto(new() { "test:subscriber:1" });

await client.Topic.AddSubscriberAsync(topic.Data.Key, subscriberList);

await client.Topic.VerifySubscriberAsync(topic.Data.Key, subscriberList.Keys.First());
await client.Topic.VerifySubscriberAsync(topic.Data.Key, subscriberList.Subscribers.First());
}

[Fact]
public async void Should_Remove_Subscriber_From_Topic()
{
var client = _fixture.NovuClient;

var subscriber = await client.Subscriber.CreateSubscriber(new CreateSubscriberDto()
{
SubscriberId = "test:subscriber:1",
Email = "noreply@novu.com"
});
var topic = await client.Topic.CreateTopicAsync(new TopicCreateDto
{
Key = $"test:topic:{Guid.NewGuid().ToString()}",
Name = "Test Topic - Should_Validate_Topic_Subscriber",
});

var subscriberList = new TopicSubscriberUpdateDto
{
Keys = new List<string>
{
"test:subscriber:1",
}
};


var subscriberList = new TopicSubscriberUpdateDto(new() {subscriber.SubscriberId });

Check warning on line 107 in src/Novu.Tests/Topics/TopicUnitTest.cs

View workflow job for this annotation

GitHub Actions / build_and_test

Possible null reference argument for parameter 'item' in 'void List<string>.Add(string item)'.

await client.Topic.AddSubscriberAsync(topic.Data.Key, subscriberList);

await client.Topic.RemoveSubscriberAsync(topic.Data.Key, subscriberList);
Expand Down Expand Up @@ -161,7 +154,7 @@

var newTopicName = $"test:topic-rename:{Guid.NewGuid().ToString()}";

var result = await client.Topic.RenameTopicAsync(topic.Data.Key, newTopicName);
var result = await client.Topic.RenameTopicAsync(topic.Data.Key, new RenameTopicRequest(newTopicName));

Assert.Equal(newTopicName, result.Data.Name);
}
Expand Down
24 changes: 0 additions & 24 deletions src/Novu/Clients/ApiClient.cs

This file was deleted.

101 changes: 0 additions & 101 deletions src/Novu/Clients/EventClient.cs

This file was deleted.

30 changes: 0 additions & 30 deletions src/Novu/Clients/NotificationsClient.cs

This file was deleted.

Loading
Loading