Fixes to tests and clients

novuhq · May 8, 2023 · 4f307ae · 4f307ae
1 parent 3596991
commit 4f307ae
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 61 deletions.
diff --git a/src/Novu.Tests/Events/EventUnitTest.cs b/src/Novu.Tests/Events/EventUnitTest.cs
@@ -70,7 +70,7 @@ public async void Should_Trigger_Bulk_Event()
             },
         };
 
-        var trigger = await client.Event.TriggerBulkAsync(payload);
+        var trigger = await client.Event.TriggerBulkAsync(new SendBulkRequest(payload));
 
         if (trigger.PayloadDtos.Count != 2)
         {
@@ -97,16 +97,8 @@ public async void Should_Trigger_Broadcast_Event()
         };
 
         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);
 
@@ -129,16 +121,8 @@ public async void Should_Trigger_Cancel_Event()
         };
 
         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);
 

diff --git a/src/Novu.Tests/Topics/TopicUnitTest.cs b/src/Novu.Tests/Topics/TopicUnitTest.cs
@@ -37,25 +37,22 @@ public async void Should_Add_Subscriber_To_Topic()
         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]
@@ -80,39 +77,35 @@ public async void Should_Validate_Topic_Subscriber()
             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 });
+
         await client.Topic.AddSubscriberAsync(topic.Data.Key, subscriberList);
 
         await client.Topic.RemoveSubscriberAsync(topic.Data.Key, subscriberList);

diff --git a/src/Novu/DTO/EventTriggerDataDto.cs b/src/Novu/DTO/EventTriggerDataDto.cs
@@ -2,6 +2,9 @@
 
 namespace Novu.DTO;
 
+public record BroadcastMessageRequest(string Name ,object Payload, string? TransactionId);
+
+public record SendBulkRequest(List<EventTriggerDataDto> Events);
 public class EventTriggerDataDto
 {
     [JsonProperty("name")]

diff --git a/src/Novu/DTO/Topics/TopicSubscriberUpdateDto.cs b/src/Novu/DTO/Topics/TopicSubscriberUpdateDto.cs
@@ -5,8 +5,4 @@ namespace Novu.DTO.Topics;
 /// <summary>
 /// todo add docs
 /// </summary>
-public class TopicSubscriberUpdateDto
-{
-    [JsonProperty("subscribers")]
-    public List<string> Keys { get; set; }
-}
+public record TopicSubscriberUpdateDto(List<string> Subscribers);
diff --git a/src/Novu/Interfaces/IEventClient.cs b/src/Novu/Interfaces/IEventClient.cs
@@ -9,10 +9,10 @@ public interface IEventClient
     Task<TriggerResponseDto> Trigger([Body]EventTriggerDataDto dto);
 
     [Post("/events/trigger/bulk")]
-    Task<TriggerBulkResponseDto> TriggerBulkAsync([Body] List<EventTriggerDataDto> payload);
+    Task<TriggerBulkResponseDto> TriggerBulkAsync([Body] SendBulkRequest payload);
 
     [Post("/events/trigger/broadcast")]
-    Task<TriggerResponseDto> TriggerBroadcastAsync([Body]EventTriggerDataDto dto);
+    Task<TriggerResponseDto> TriggerBroadcastAsync([Body]BroadcastMessageRequest dto);
 
     [Delete("/events/trigger/{transactionId}")]
     Task TriggerCancelAsync(Guid transactionId);

diff --git a/src/Novu/Novu.csproj b/src/Novu/Novu.csproj
@@ -26,6 +26,7 @@
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Refit" Version="6.3.2" />
+        <PackageReference Include="Refit.Newtonsoft.Json" Version="6.3.2" />
     </ItemGroup>
 
     <!-- Nuget Assets --> 

diff --git a/src/Novu/NovuClient.cs b/src/Novu/NovuClient.cs
@@ -1,21 +1,41 @@
-using Novu.Clients;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Novu.Clients;
 using Novu.Interfaces;
 using Refit;
 
 namespace Novu;
 
 public class NovuClient : INovuClient
 {
+    private static readonly JsonSerializerSettings SerializerSettings = new()
+    {
+        MissingMemberHandling = MissingMemberHandling.Ignore,
+        NullValueHandling = NullValueHandling.Ignore,
+        ContractResolver = new DefaultContractResolver
+        {
+            NamingStrategy = new CamelCaseNamingStrategy()
+        }
+    };
     public NovuClient(INovuClientConfiguration configuration): this(configuration, default) {}
 
     public NovuClient(INovuClientConfiguration configuration,HttpClient? client = default)
     {
         var httpClient = client ?? new HttpClient();
         httpClient.BaseAddress = new Uri(configuration.Url);
         httpClient.DefaultRequestHeaders.Add("Authorization", $"ApiKey {configuration.ApiKey}");
-        Subscriber = RestService.For<ISubscriberClient>(httpClient);
-        Event = RestService.For<IEventClient>(httpClient);
-        Topic = RestService.For<ITopicClient>(httpClient);
+        Subscriber = RestService.For<ISubscriberClient>(httpClient, new RefitSettings
+        {
+            ContentSerializer = new NewtonsoftJsonContentSerializer(SerializerSettings)
+        });
+        Event = RestService.For<IEventClient>(httpClient, new RefitSettings
+        {
+            ContentSerializer = new NewtonsoftJsonContentSerializer(SerializerSettings)
+        });
+        Topic = RestService.For<ITopicClient>(httpClient,  new RefitSettings
+        {
+            ContentSerializer = new NewtonsoftJsonContentSerializer(SerializerSettings)
+        });
     }
 
     public ISubscriberClient Subscriber { get; }