From 2de062c0ea22250a7475419fcf602a47d25bc9ab Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 22 Mar 2023 22:08:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E6=96=B0=E5=A2=9E=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E6=97=A5=E7=A8=8B=E6=88=96=E4=BC=9A=E8=AE=AE=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E4=BC=9A=E8=AE=AE=E5=AE=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...chatWorkClientExecuteCgibinOAExtensions.cs | 42 ++++++++++++++++++- ...CgibinOAMeetingRoomBookByMeetingRequest.cs | 29 +++++++++++++ ...gibinOAMeetingRoomBookByMeetingResponse.cs | 22 ++++++++++ ...gibinOAMeetingRoomBookByScheduleRequest.cs | 29 +++++++++++++ ...ibinOAMeetingRoomBookByScheduleResponse.cs | 22 ++++++++++ .../Book/CgibinOAMeetingRoomBookRequest.cs | 2 +- .../Book/CgibinOAMeetingRoomBookResponse.cs | 10 ++--- ...ibinOAMeetingRoomBookByMeetingRequest.json | 5 +++ ...binOAMeetingRoomBookByMeetingResponse.json | 7 ++++ ...binOAMeetingRoomBookByScheduleRequest.json | 5 +++ ...inOAMeetingRoomBookByScheduleResponse.json | 6 +++ .../Book/CgibinOAMeetingRoomBookResponse.json | 4 +- 12 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.cs create mode 100644 test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.json diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs index 832f41e7..5c73fa89 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs @@ -403,7 +403,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } - #region MeetingRoomBook + #region MeetingRoom/Book /// /// 异步调用 [POST] /cgi-bin/oa/meetingroom/get_booking_info 接口。 /// REF: https://developer.work.weixin.qq.com/document/path/93620 @@ -464,6 +464,46 @@ namespace SKIT.FlurlHttpClient.Wechat.Work return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } + /// + /// 异步调用 [POST] /cgi-bin/oa/meetingroom/book_by_schedule 接口。 + /// REF: https://developer.work.weixin.qq.com/document/path/93620 + /// + /// + /// + /// + /// + public static async Task ExecuteCgibinOAMeetingRoomBookByScheduleAsync(this WechatWorkClient client, Models.CgibinOAMeetingRoomBookByScheduleRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_schedule") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /cgi-bin/oa/meetingroom/book_by_meeting 接口。 + /// REF: https://developer.work.weixin.qq.com/document/path/93620 + /// + /// + /// + /// + /// + public static async Task ExecuteCgibinOAMeetingRoomBookByMeetingAsync(this WechatWorkClient client, Models.CgibinOAMeetingRoomBookByMeetingRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_meeting") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + /// /// 异步调用 [POST] /cgi-bin/oa/meetingroom/cancel_book 接口。 /// REF: https://developer.work.weixin.qq.com/document/path/93620 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.cs new file mode 100644 index 00000000..13f3d479 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.cs @@ -0,0 +1,29 @@ +namespace SKIT.FlurlHttpClient.Wechat.Work.Models +{ + /// + /// 表示 [POST] /cgi-bin/oa/meetingroom/book_by_meeting 接口的请求。 + /// + public class CgibinOAMeetingRoomBookByMeetingRequest : WechatWorkRequest + { + /// + /// 获取或设置会议室 ID。 + /// + [Newtonsoft.Json.JsonProperty("meetingroom_id")] + [System.Text.Json.Serialization.JsonPropertyName("meetingroom_id")] + public int MeetingRoomId { get; set; } + + /// + /// 获取或设置会议 ID。 + /// + [Newtonsoft.Json.JsonProperty("meetingid")] + [System.Text.Json.Serialization.JsonPropertyName("meetingid")] + public string Meeting { get; set; } = string.Empty; + + /// + /// 获取或设置预定者的成员账号。 + /// + [Newtonsoft.Json.JsonProperty("booker")] + [System.Text.Json.Serialization.JsonPropertyName("booker")] + public string BookerUserId { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.cs new file mode 100644 index 00000000..08e8e243 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.cs @@ -0,0 +1,22 @@ +namespace SKIT.FlurlHttpClient.Wechat.Work.Models +{ + /// + /// 表示 [POST] /cgi-bin/oa/meetingroom/book_by_meeting 接口的响应。 + /// + public class CgibinOAMeetingRoomBookByMeetingResponse : WechatWorkResponse + { + /// + /// 获取或设置预定 ID。 + /// + [Newtonsoft.Json.JsonProperty("booking_id")] + [System.Text.Json.Serialization.JsonPropertyName("booking_id")] + public string BookingId { get; set; } = default!; + + /// + /// 获取或设置冲突日期的时间戳列表。 + /// + [Newtonsoft.Json.JsonProperty("conflict_date")] + [System.Text.Json.Serialization.JsonPropertyName("conflict_date")] + public string[]? ConflictDateTimestampList { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.cs new file mode 100644 index 00000000..4abbd382 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.cs @@ -0,0 +1,29 @@ +namespace SKIT.FlurlHttpClient.Wechat.Work.Models +{ + /// + /// 表示 [POST] /cgi-bin/oa/meetingroom/book_by_schedule 接口的请求。 + /// + public class CgibinOAMeetingRoomBookByScheduleRequest : WechatWorkRequest + { + /// + /// 获取或设置会议室 ID。 + /// + [Newtonsoft.Json.JsonProperty("meetingroom_id")] + [System.Text.Json.Serialization.JsonPropertyName("meetingroom_id")] + public int MeetingRoomId { get; set; } + + /// + /// 获取或设置日程 ID。 + /// + [Newtonsoft.Json.JsonProperty("schedule_id")] + [System.Text.Json.Serialization.JsonPropertyName("schedule_id")] + public string ScheduleId { get; set; } = string.Empty; + + /// + /// 获取或设置预定者的成员账号。 + /// + [Newtonsoft.Json.JsonProperty("booker")] + [System.Text.Json.Serialization.JsonPropertyName("booker")] + public string BookerUserId { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.cs new file mode 100644 index 00000000..0fa10a98 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.cs @@ -0,0 +1,22 @@ +namespace SKIT.FlurlHttpClient.Wechat.Work.Models +{ + /// + /// 表示 [POST] /cgi-bin/oa/meetingroom/book_by_schedule 接口的响应。 + /// + public class CgibinOAMeetingRoomBookByScheduleResponse : WechatWorkResponse + { + /// + /// 获取或设置预定 ID。 + /// + [Newtonsoft.Json.JsonProperty("booking_id")] + [System.Text.Json.Serialization.JsonPropertyName("booking_id")] + public string BookingId { get; set; } = default!; + + /// + /// 获取或设置冲突日期的时间戳列表。 + /// + [Newtonsoft.Json.JsonProperty("conflict_date")] + [System.Text.Json.Serialization.JsonPropertyName("conflict_date")] + public string[]? ConflictDateTimestampList { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookRequest.cs index bb623981..3bbd1e7e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookRequest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.Work.Models { diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.cs index db4a50b0..41c535ae 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/oa/meetingroom/book 接口的响应。 @@ -6,11 +6,11 @@ public class CgibinOAMeetingRoomBookResponse : WechatWorkResponse { /// - /// 获取或设置会议 ID。 + /// 获取或设置预定 ID。 /// - [Newtonsoft.Json.JsonProperty("meeting_id")] - [System.Text.Json.Serialization.JsonPropertyName("meeting_id")] - public string MeetingId { get; set; } = default!; + [Newtonsoft.Json.JsonProperty("booking_id")] + [System.Text.Json.Serialization.JsonPropertyName("booking_id")] + public string BookingId { get; set; } = default!; /// /// 获取或设置关联日程 ID。 diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.json new file mode 100644 index 00000000..ea7fde0f --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingRequest.json @@ -0,0 +1,5 @@ +{ + "meetingroom_id": 1, + "meetingid": "hy7e7226edae66468bc48e9859812402", + "booker": "rocky" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.json new file mode 100644 index 00000000..9b8d1162 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByMeetingResponse.json @@ -0,0 +1,7 @@ +{ + "errcode": 0, + "errmsg": "ok", + "booking_id": "bkgsaseb6e027c123cbafAAA", + "conflict_date": [ 1672502400, 1675180800, 1677600000 ] + +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.json new file mode 100644 index 00000000..807062c9 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleRequest.json @@ -0,0 +1,5 @@ +{ + "meetingroom_id": 1, + "schedule_id": "1c7e7226edae66468bc48e9859812402", + "booker": "rocky" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.json new file mode 100644 index 00000000..15c83c7a --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookByScheduleResponse.json @@ -0,0 +1,6 @@ +{ + "errcode": 0, + "errmsg": "ok", + "booking_id": "bkgsaseb6e027c123cbafAAA", + "conflict_date": [ 1672502400, 1675180800, 1677600000 ] +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.json index 680e3ba7..528d5dc6 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomBookResponse.json @@ -1,6 +1,6 @@ -{ +{ "errcode": 0, "errmsg": "ok", - "meeting_id": "mtgsaseb6e027c123cbafAAA", + "booking_id": "bkgsaseb6e027c123cbafAAA", "schedule_id": "17c7d2bd9f20d652840f72f59e796AAA" }