refactor : Mc sdk adjustment (masastack#375)

wzh425 · web-flow · commit 539566baeaf5 · 2022-12-20T18:57:08.000+08:00
* feature : add SystemId

* refactor :  Modify Model

* refactor : Modify Model

* test : add unit testing

* refactor : use Guid.Empty
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs
@@ -0,0 +1,24 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Mc.Model;
+
+public class GetMessageTaskModel : PaginatedOptions
+{
+    public string Filter { get; set; } = string.Empty;
+    public Guid ChannelId { get; set; }
+    public MessageTypes? EntityType { get; set; }
+    public bool? IsDraft { get; set; }
+    public bool? IsEnabled { get; set; }
+    public MessageTaskTimeTypes? TimeType { get; set; }
+    public DateTime? StartTime { get; set; }
+    public DateTime? EndTime { get; set; }
+    public MessageTaskStatuses? Status { get; set; }
+    public MessageTaskSources? Source { get; set; }
+    public string SystemId { get; set; } = string.Empty;
+
+    public GetMessageTaskModel(int page, int pageSize, Dictionary<string, bool>? sorting = null) : base(page, pageSize, sorting)
+    {
+
+    }
+}
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTemplateModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTemplateModel.cs
@@ -13,7 +13,7 @@ public class GetMessageTemplateModel : PaginatedOptions
 
     public ChannelTypes? ChannelType { get; set; }
 
-    public Guid? ChannelId { get; set; }
+    public Guid ChannelId { get; set; }
 
     public DateTime? StartTime { get; set; }
 
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs
@@ -3,13 +3,18 @@
 
 namespace Masa.BuildingBlocks.StackSdks.Mc.Model;
 
-public class GetWebsiteMessageModel : PaginatedOptionsModel
+public class GetWebsiteMessageModel : PaginatedOptions
 {
     public string Filter { get; set; } = string.Empty;
 
     public WebsiteMessageFilterType? FilterType { get; set; }
 
-    public Guid? ChannelId { get; set; }
+    public Guid ChannelId { get; set; }
 
     public bool? IsRead { get; set; }
+
+    public GetWebsiteMessageModel(int page, int pageSize, Dictionary<string, bool>? sorting = null) : base(page, pageSize, sorting)
+    {
+
+    }
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageInfoUpsertModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageInfoUpsertModel.cs
@@ -14,4 +14,6 @@ public class MessageInfoUpsertModel
     public bool IsJump { get; set; }
 
     public string JumpUrl { get; set; } = string.Empty;
+
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new();
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskModel.cs
@@ -40,4 +40,6 @@ public class MessageTaskModel : AuditEntityModel<Guid, Guid>
     public MessageTaskStatuses Status { get; set; }
 
     public MessageTaskSources Source { get; set; }
+
+    public string ModifierName { get; set; } = string.Empty;
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskTimeTypes.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskTimeTypes.cs
@@ -0,0 +1,10 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Mc.Model;
+
+public enum MessageTaskTimeTypes
+{
+    ModificationTime = 1,
+    SendTime,
+}
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs
@@ -0,0 +1,39 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Mc.Model;
+
+public class MessageTaskUpsertModel
+{
+    public string DisplayName { get; set; } = string.Empty;
+
+    public Guid ChannelId { get; set; }
+
+    public ChannelTypes ChannelType { get; set; }
+
+    public MessageTypes EntityType { get; set; }
+
+    public Guid EntityId { get; set; }
+
+    public bool IsDraft { get; set; }
+
+    public bool IsEnabled { get; set; }
+
+    public SendTargets ReceiverType { get; set; }
+
+    public MessageTaskSelectReceiverTypes SelectReceiverType { get; set; } = MessageTaskSelectReceiverTypes.ManualSelection;
+
+    public string Sign { get; set; } = string.Empty;
+
+    public List<MessageTaskReceiverModel> Receivers { get; set; } = new();
+
+    public SendRuleModel SendRules { get; set; } = new();
+
+    public MessageInfoUpsertModel MessageInfo { get; set; } = new();
+
+    public ExtraPropertyDictionary Variables { get; set; } = new();
+
+    private MessageTaskSources Source { get;} = MessageTaskSources.Sdk;
+
+    public Guid OperatorId { get; set; } = Guid.Empty;
+}
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/PaginatedOptionsModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/PaginatedOptionsModel.cs
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/ReadAllWebsiteMessageModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/ReadAllWebsiteMessageModel.cs
@@ -5,4 +5,8 @@ namespace Masa.BuildingBlocks.StackSdks.Mc.Model;
 
 public class ReadAllWebsiteMessageModel : GetWebsiteMessageModel
 {
+    public ReadAllWebsiteMessageModel(int page, int pageSize, Dictionary<string, bool>? sorting = null) : base(page, pageSize, sorting)
+    {
+
+    }
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendOrdinaryMessageByExternalModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendOrdinaryMessageByExternalModel.cs
@@ -20,4 +20,6 @@ public class SendOrdinaryMessageByExternalModel
     public ExtraPropertyDictionary Variables { get; set; } = new();
 
     public Guid OperatorId { get; set; } = Guid.Empty;
+
+    public string SystemId { get; set; } = string.Empty;
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendOrdinaryMessageByInternalModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendOrdinaryMessageByInternalModel.cs
@@ -20,4 +20,6 @@ public class SendOrdinaryMessageByInternalModel
     public ExtraPropertyDictionary Variables { get; set; } = new();
 
     public Guid OperatorId { get; set; } = Guid.Empty;
+
+    public string SystemId { get; set; } = string.Empty;
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendTemplateMessageByExternalModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendTemplateMessageByExternalModel.cs
@@ -22,4 +22,6 @@ public class SendTemplateMessageByExternalModel
     public ExtraPropertyDictionary Variables { get; set; } = new();
 
     public Guid OperatorId { get; set; } = Guid.Empty;
+
+    public string SystemId { get; set; } = string.Empty;
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendTemplateMessageByInternalModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/SendTemplateMessageByInternalModel.cs
@@ -22,4 +22,6 @@ public class SendTemplateMessageByInternalModel
     public ExtraPropertyDictionary Variables { get; set; } = new();
 
     public Guid OperatorId { get; set; } = Guid.Empty;
+
+    public string SystemId { get; set; } = string.Empty;
 }
diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Service/IMessageTaskService.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Service/IMessageTaskService.cs
@@ -14,4 +14,16 @@ public interface IMessageTaskService
     Task SendOrdinaryMessageByExternalAsync(SendOrdinaryMessageByExternalModel options);
 
     Task SendTemplateMessageByExternalAsync(SendTemplateMessageByExternalModel options);
+
+    Task<PaginatedListModel<MessageTaskModel>> GetListAsync(GetMessageTaskModel options);
+
+    Task DeleteAsync(Guid id);
+
+    Task UpdateAsync(Guid id, MessageTaskUpsertModel messageTask);
+
+    Task SetIsEnabledAsync(Guid id, bool isEnabled);
+
+    Task WithdrawnAsync(Guid id);
+
+    Task ResendAsync(Guid id);
 }
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/MessageTaskService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/MessageTaskService.cs
@@ -42,4 +42,40 @@ public async Task SendTemplateMessageByExternalAsync(SendTemplateMessageByExtern
         var requestUri = $"{_party}/SendTemplateMessageByExternal";
         await _caller.PostAsync(requestUri, options);
     }
+
+    public async Task<PaginatedListModel<MessageTaskModel>> GetListAsync(GetMessageTaskModel options)
+    {
+        var requestUri = $"{_party}";
+        return await _caller.GetAsync<GetMessageTaskModel, PaginatedListModel<MessageTaskModel>>(requestUri, options) ?? new();
+    }
+
+    public async Task DeleteAsync(Guid id)
+    {
+        var requestUri = $"{_party}/{id}";
+        await _caller.DeleteAsync(requestUri, null);
+    }
+
+    public async Task UpdateAsync(Guid id, MessageTaskUpsertModel messageTask)
+    {
+        var requestUri = $"{_party}/{id}";
+        await _caller.PutAsync(requestUri, messageTask);
+    }
+
+    public async Task SetIsEnabledAsync(Guid id, bool isEnabled)
+    {
+        var requestUri = $"{_party}/{id}/enabled/{isEnabled}";
+        await _caller.PutAsync(requestUri, new { });
+    }
+
+    public async Task WithdrawnAsync(Guid id)
+    {
+        var requestUri = $"{_party}/{id}/Withdrawn";
+        await _caller.PostAsync(requestUri, new { });
+    }
+
+    public async Task ResendAsync(Guid id)
+    {
+        var requestUri = $"{_party}/{id}/Resend";
+        await _caller.PostAsync(requestUri, new { });
+    }
 }
diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/MessageTaskServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/MessageTaskServiceTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-using Masa.Contrib.StackSdks.Mc.Service;
-
 namespace Masa.Contrib.StackSdks.Mc.Tests;
 
 [TestClass]
@@ -69,4 +67,43 @@ public async Task TestSendTemplateMessageByExternalAsync()
         await messageTaskService.Object.SendTemplateMessageByExternalAsync(options);
         caller.Verify(provider => provider.PostAsync(requestUri, options, true, default), Times.Once);
     }
+
+    [TestMethod]
+    public async Task TestGetListAsync()
+    {
+        var options = new GetMessageTaskModel(1, 10);
+        var data = new PaginatedListModel<MessageTaskModel>();
+        var requestUri = $"api/message-task";
+        var caller = new Mock<ICaller>();
+        caller.Setup(provider => provider.GetAsync<GetMessageTaskModel, PaginatedListModel<MessageTaskModel>>(requestUri, options, default)).ReturnsAsync(data).Verifiable();
+        var service = new Mock<MessageTaskService>(caller.Object);
+        var result = await service.Object.GetListAsync(options);
+        caller.Verify(provider => provider.GetAsync<GetMessageTaskModel, PaginatedListModel<MessageTaskModel>>(requestUri, options, default), Times.Once);
+        Assert.IsTrue(result is not null);
+    }
+
+    [TestMethod]
+    public async Task TestDeleteAsync()
+    {
+        Guid id = Guid.NewGuid();
+        var requestUri = $"api/message-task/{id}";
+        var caller = new Mock<ICaller>();
+        caller.Setup(provider => provider.DeleteAsync(requestUri, null, true, default)).Verifiable();
+        var service = new Mock<MessageTaskService>(caller.Object);
+        await service.Object.DeleteAsync(id);
+        caller.Verify(provider => provider.DeleteAsync(requestUri, null, true, default), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task TestUpdateAsync()
+    {
+        Guid id = Guid.NewGuid();
+        var options = new MessageTaskUpsertModel();
+        var requestUri = $"api/message-task/{id}";
+        var caller = new Mock<ICaller>();
+        caller.Setup(provider => provider.PutAsync(requestUri, options, true, default)).Verifiable();
+        var service = new Mock<MessageTaskService>(caller.Object);
+        await service.Object.UpdateAsync(id, options);
+        caller.Verify(provider => provider.PutAsync(requestUri, options, true, default), Times.Once);
+    }
 }
diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/ReceiverGroupServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/ReceiverGroupServiceTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-using Masa.Contrib.StackSdks.Mc.Service;
-
 namespace Masa.Contrib.StackSdks.Mc.Tests;
 
 [TestClass]
diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/WebsiteMessageServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/WebsiteMessageServiceTest.cs
@@ -25,7 +25,7 @@ public async Task TestGetAsync()
     [TestMethod]
     public async Task TestGetListAsync()
     {
-        var options = new GetWebsiteMessageModel();
+        var options = new GetWebsiteMessageModel(1,10);
         var data = new PaginatedListModel<WebsiteMessageModel>();
         var requestUri = $"api/website-message";
         var caller = new Mock<ICaller>();
@@ -101,7 +101,7 @@ public async Task TestReadAsync()
     [TestMethod]
     public async Task TestSetAllReadAsync()
     {
-        var options = new ReadAllWebsiteMessageModel();
+        var options = new ReadAllWebsiteMessageModel(1,10);
         var requestUri = $"api/website-message/SetAllRead";
         var caller = new Mock<ICaller>();
         caller.Setup(provider => provider.PostAsync(requestUri, options, true, default)).Verifiable();
diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/_Imports.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/_Imports.cs
@@ -4,6 +4,7 @@
 global using Masa.BuildingBlocks.Service.Caller;
 global using Masa.BuildingBlocks.StackSdks.Mc;
 global using Masa.BuildingBlocks.StackSdks.Mc.Model;
+global using Masa.Contrib.StackSdks.Mc.Service;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.VisualStudio.TestTools.UnitTesting;
 global using Moq;

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ public class MessageInfoUpsertModel`
`14`	`14`	`public bool IsJump { get; set; }`
`15`	`15`
`16`	`16`	`public string JumpUrl { get; set; } = string.Empty;`
	`17`	`+`
	`18`	`+ public ExtraPropertyDictionary ExtraProperties { get; set; } = new();`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,6 @@ public class MessageTaskModel : AuditEntityModel<Guid, Guid>`
`40`	`40`	`public MessageTaskStatuses Status { get; set; }`
`41`	`41`
`42`	`42`	`public MessageTaskSources Source { get; set; }`
	`43`	`+`
	`44`	`+ public string ModifierName { get; set; } = string.Empty;`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,8 @@ namespace Masa.BuildingBlocks.StackSdks.Mc.Model;`
`5`	`5`
`6`	`6`	`public class ReadAllWebsiteMessageModel : GetWebsiteMessageModel`
`7`	`7`	`{`
	`8`	`+ public ReadAllWebsiteMessageModel(int page, int pageSize, Dictionary<string, bool>? sorting = null) : base(page, pageSize, sorting)`
	`9`	`+ {`
	`10`	`+`
	`11`	`+ }`
`8`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ public class SendOrdinaryMessageByExternalModel`
`20`	`20`	`public ExtraPropertyDictionary Variables { get; set; } = new();`
`21`	`21`
`22`	`22`	`public Guid OperatorId { get; set; } = Guid.Empty;`
	`23`	`+`
	`24`	`+ public string SystemId { get; set; } = string.Empty;`
`23`	`25`	`}`