Merge pull request #163 from simplygoodsoftware/eg/api-calendar-impro…

…vements-259220315

meetings in GetCalendarTasks response

Entities/Meeting.cs

@@ -0,0 +1,40 @@
+using System;
+using Newtonsoft.Json;
+using Pyrus.ApiClient.JsonConverters;
+
+namespace PyrusApiClient
+{
+	public class Meeting
+	{
+		[JsonProperty("id")]
+		public int Id { get; set; }
+
+		[JsonProperty("type")]
+		public MeetingType Type { get; set; }
+
+		[JsonProperty("start_time")]
+		[JsonConverter(typeof(DateTimeJsonConverter), Constants.DateTimeFormat)]
+		public DateTime? StartTime { get; set; }
+
+		[JsonProperty("duration")]
+		public int? Duration { get; set; }
+
+		[JsonProperty("join_parameters")]
+		public MeetingJoinParameters JoinParameters { get; set; }
+
+		[JsonProperty("creator_id")]
+		public int CreatorId { get; set; }
+
+		[JsonProperty("task_id")]
+		public int TaskId { get; set; }
+
+		[JsonProperty("shared_calendar_event_id")]
+		public string SharedCalendarEventId { get; set; }
+
+		[JsonProperty("shared_to_email")]
+		public bool SharedToEmail { get; set; }
+
+		[JsonProperty("deleted")]
+		public bool Deleted { get; set; }
+	}
+}

Entities/MeetingJoinParameters.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace PyrusApiClient
+{
+	public class MeetingJoinParameters
+	{
+		[JsonProperty("url")]
+		public string Url { get; }
+
+		[JsonProperty("external_id")]
+		public string ExternalId { get; set; }
+
+        [JsonProperty("password")]
+        public string Password { get; set; }
+    }
+}

Enums/MeetingType.cs

@@ -0,0 +1,25 @@
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace PyrusApiClient
+{
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum MeetingType
+	{
+		[EnumMember(Value = "none")]
+		None,
+
+		[EnumMember(Value = "zoom")]
+		Zoom,
+
+		[EnumMember(Value = "offline")]
+		Offline,
+
+		[EnumMember(Value = "google_meet")]
+		GoogleMeet,
+
+		[EnumMember(Value = "yandex_telemost")]
+		YandexTelemost,
+	}
+}

Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.9.0.0")]
-[assembly: AssemblyFileVersion("4.9.0.0")]
+[assembly: AssemblyVersion("4.10.0.0")]
+[assembly: AssemblyFileVersion("4.10.0.0")]

Pyrus.ApiClient.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>Pyrus.ApiClient</PackageId>
-    <Version>4.9.0.0</Version>
+    <Version>4.10.0.0</Version>
     <Title>Pyrus API Client</Title>
 	<Authors>Pyrus</Authors>
     <Owners>Pyrus</Owners>

Pyrus.ApiClient.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>Pyrus.ApiClient</id>
-		<version>4.9.0.0</version>
+		<version>4.10.0.0</version>
 		<title>Pyrus API Client</title>
 		<authors>Pyrus</authors>
 		<owners>Pyrus</owners>

PyrusClient.cs

@@ -698,20 +698,31 @@ public async Task<InboxResponse> GetInbox(int tasksCount = 50, string accessToke
             return response;
         }
 
-        public async Task<CalendarResponse> GetCalendarTasks(DateTime startDateTime, DateTime endDateTime,
-            int? tasksCount = 50, bool allAccessedTasks = false, int filterMask = 0b0111, string accessToken = null)
+        public async Task<CalendarResponse> GetCalendarTasks(
+            DateTime startDateTime,
+            DateTime endDateTime,
+            int? tasksCount = 50,
+            bool allAccessedTasks = false,
+            int filterMask = 0b0111,
+            bool includeMeetings = false,
+            string accessToken = null)
         {
-            var path = $"{CalendarEndpoint}?" +
-                      $"start_date_utc={startDateTime}" +
-                      $"&end_date_utc={endDateTime}" +
-                      $"&item_count={tasksCount}" +
-                      $"&all_accessed_tasks={allAccessedTasks}" +
-                      $"&filter_mask={filterMask}";
+            var startDateTimeStr = startDateTime.ToString(Constants.DateTimeFormat);
+            var endDateTimeStr = endDateTime.ToString(Constants.DateTimeFormat);
+
+            var query = string.Join(
+                "&",
+                $"start_date_utc={startDateTimeStr}",
+                $"end_date_utc={endDateTimeStr}",
+                $"item_count={tasksCount}",
+                $"all_accessed_tasks={allAccessedTasks}",
+                $"filter_mask={filterMask}",
+                $"include_meetings={includeMeetings}");
 
             if (accessToken != null)
                 Token = accessToken;
 
-            var response = await this.RunQuery<CalendarResponse>(() => RequestHelper.GetRequest(this, $"{ClientSettings.Origin}{path}", Token));
+            var response = await this.RunQuery<CalendarResponse>(() => RequestHelper.GetRequest(this, $"{ClientSettings.Origin}{CalendarEndpoint}?{query}", Token));
             return response;
         }
 

Requests/Builders/GetCalendarTasksBuilder.cs

@@ -43,6 +43,12 @@ public GetCalendarTasksBuilder WithReminded(bool withReminded)
 			return this;
 		}
 
+		public GetCalendarTasksBuilder IncludeMeetings(bool includeMeetings)
+		{
+			_calendarTasksRequest.IncludeMeetings = includeMeetings;
+			return this;
+		}
+
 		public static implicit operator CalendarTasksRequest(GetCalendarTasksBuilder builder)
 		{
 			return builder._calendarTasksRequest;

Requests/Builders/RequestBuilder.cs

@@ -143,6 +143,9 @@ public static GetBotsRequestBuilder GetBots()
         public static OnePropertyBuilder<int, InboxResponse> GetInbox(int tasksCount = 50)
             => new OnePropertyBuilder<int, InboxResponse>(tasksCount);
 
+        public static GetCalendarTasksBuilder GetCalendarTasks(DateTime startDateTimeUtc, DateTime endDateTimeUtc)
+            => new GetCalendarTasksBuilder(startDateTimeUtc, endDateTimeUtc);
+
         public static CallBuilder RegisterCall() => new CallBuilder();
 
         public static AttachCallRecordBuilder AttachCallRecord(string recordFile)
@@ -316,7 +319,8 @@ public static async Task<CalendarResponse> Process(this GetCalendarTasksBuilder
             CalendarTasksRequest request = builder;
             return await client.GetCalendarTasks(
                 request.StartDateUtc, request.EndDateUtc,
-                request.ItemCount, request.AllAccessedTasks, request.FilterMask ?? 0b0111);
+                request.ItemCount, request.AllAccessedTasks,
+                request.FilterMask ?? 0b0111, request.IncludeMeetings);
         }
 
         public static async Task<ResponseBase> Process(this CallBuilder builder, PyrusClient client)

Requests/CalendarTasksRequest.cs

@@ -19,5 +19,8 @@ public class CalendarTasksRequest
 
 		[JsonProperty(PropertyName = "filter_mask")]
 		public int? FilterMask { get; set; }
-	}
+
+		[JsonProperty(PropertyName = "include_meetings")]
+		public bool IncludeMeetings { get; set; }
+    }
 }

Responses/CalendarResponse.cs

@@ -11,5 +11,8 @@ public class CalendarResponse : ResponseBase
 
 		[JsonProperty("has_more")]
 		public bool HasMore { get; set; }
+
+		[JsonProperty("meetings")]
+		public List<Meeting> Meetings { get; set; }
 	}
 }