diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs index 12df9d88c..4b288db19 100644 --- a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs +++ b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetMessageTaskModel.cs @@ -6,15 +6,27 @@ namespace Masa.BuildingBlocks.StackSdks.Mc.Model; public class GetMessageTaskModel : PaginatedOptions { public string Filter { get; set; } = string.Empty; + public Guid ChannelId { get; set; } + + public string ChannelCode { get; set; } = string.Empty; + 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? sorting = null) : base(page, pageSize, sorting) diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs index 423df3463..4da1f5883 100644 --- a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs +++ b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/GetWebsiteMessageModel.cs @@ -11,6 +11,8 @@ public class GetWebsiteMessageModel : PaginatedOptions public Guid? ChannelId { get; set; } + public string ChannelCode { get; set; } = string.Empty; + public bool? IsRead { get; set; } public string Tag { get; set; } = string.Empty; diff --git a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs index 9752f949a..86b282a52 100644 --- a/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs +++ b/src/BuildingBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Mc/Model/MessageTaskUpsertModel.cs @@ -9,6 +9,8 @@ public class MessageTaskUpsertModel public Guid ChannelId { get; set; } + public string ChannelCode { get; set; } = string.Empty; + public ChannelTypes ChannelType { get; set; } public MessageTypes EntityType { get; set; } diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/WebsiteMessageService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/WebsiteMessageService.cs index 907041141..e2a9eab8e 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/WebsiteMessageService.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/Service/WebsiteMessageService.cs @@ -30,7 +30,7 @@ public async Task DeleteAsync(Guid id) public async Task> GetChannelListAsync() { - var requestUri = $"{_party}/GetChannelList"; + var requestUri = $"{_party}/ChannelList"; return await _caller.GetAsync>(requestUri) ?? new(); } @@ -42,7 +42,7 @@ public async Task> GetListAsync(GetWebsi public async Task> GetNoticeListAsync(GetNoticeListModel options) { - var requestUri = $"{_party}/GetNoticeList"; + var requestUri = $"{_party}/NoticeList"; return await _caller.GetAsync>(requestUri, options) ?? new(); } 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 index 3f6cb049d..0548168d5 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/WebsiteMessageServiceTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/WebsiteMessageServiceTest.cs @@ -61,7 +61,7 @@ public async Task TestDeleteAsync() public async Task TestGetChannelListAsync() { var data = new List(); - var requestUri = $"api/website-message/GetChannelList"; + var requestUri = $"api/website-message/ChannelList"; var caller = new Mock(); caller.Setup(provider => provider.GetAsync>(requestUri, default)).ReturnsAsync(data).Verifiable(); var websiteMessageService = new Mock(caller.Object); @@ -75,7 +75,7 @@ public async Task TestGetNoticeListAsync() { var options = new GetNoticeListModel(); var data = new List(); - var requestUri = $"api/website-message/GetNoticeList"; + var requestUri = $"api/website-message/NoticeList"; var caller = new Mock(); caller.Setup(provider => provider.GetAsync>(requestUri, options, default)).ReturnsAsync(data).Verifiable(); var websiteMessageService = new Mock(caller.Object);