Changed existing get method to retrieve count, added count to modeledresponse

Author: DanielW093

Postgrest/Interfaces/IPostgrestTable.cs

@@ -116,17 +116,9 @@ IPostgrestTable<TModel> Filter<TCriterion>(Expression<Func<TModel, object>> pred
         /// Executes the query using the defined filters on the current instance.
         /// </summary>
         /// <param name="cancellationToken"></param>
+        /// <param name="countType"></param>
         /// <returns></returns>
-        Task<ModeledResponse<TModel>> Get(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Executes the query using the defined filters on the current instance, along with count from the specified query.
-        /// </summary>
-        /// <param name="type">The kind of count.</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task<(ModeledResponse<TModel> Result, int Count)> GetWithCount(Constants.CountType type,
-            CancellationToken cancellationToken = default);
+        Task<ModeledResponse<TModel>> Get(CancellationToken cancellationToken = default, Constants.CountType countType = Constants.CountType.Estimated);
 
         /// <summary>
         /// Executes a BULK INSERT query using the defined query params on the current instance.

Postgrest/Responses/ModeledResponse.cs

@@ -24,6 +24,11 @@ namespace Supabase.Postgrest.Responses
 		/// A list of models in the response.
 		/// </summary>
 		public List<T> Models { get; } = new();
+
+		/// <summary>
+		/// The number of results matching the specified filters
+		/// </summary>
+		public int Count = 0;
 
 		/// <inheritdoc />
 		public ModeledResponse(BaseResponse baseResponse, JsonSerializerSettings serializerSettings, Func<Dictionary<string, string>>? getHeaders = null, bool shouldParse = true) : base(baseResponse.ClientOptions, baseResponse.ResponseMessage, baseResponse.Content)
@@ -71,6 +76,9 @@ public ModeledResponse(BaseResponse baseResponse, JsonSerializerSettings seriali
 					break;
 				}
 			}
+			
+			var countStr = baseResponse.ResponseMessage?.Content.Headers.GetValues("Content-Range").FirstOrDefault();
+			Count = int.Parse(countStr?.Split('/')[1] ?? throw new InvalidOperationException());
 
 			Debugger.Instance.Log(this, $"Response: [{baseResponse.ResponseMessage?.StatusCode}]\n" + $"Parsed Models <{typeof(T).Name}>:\n\t{JsonConvert.SerializeObject(Models)}\n");
 		}

Postgrest/Table.cs

@@ -628,15 +628,7 @@ public async Task<int> Count(CountType type, CancellationToken cancellationToken
         }
 
         /// <inheritdoc />
-        public Task<ModeledResponse<TModel>> Get(CancellationToken cancellationToken = default)
-        {
-            var request = Send<TModel>(_method, null, null, cancellationToken);
-            Clear();
-            return request;
-        }
-        
-        /// <inheritdoc />
-        public async Task<(ModeledResponse<TModel> Result, int Count)>GetWithCount(CountType type, CancellationToken cancellationToken = default)
+        public Task<ModeledResponse<TModel>> Get(CancellationToken cancellationToken = default, CountType type = CountType.Estimated)
         {
             var attr = type.GetAttribute<MapToAttribute>();
 
@@ -648,11 +640,7 @@ public Task<ModeledResponse<TModel>> Get(CancellationToken cancellationToken = d
             var request = Send<TModel>(_method, null, headers, cancellationToken);
             Clear();
 
-            var response = await request;
-            var countStr = response.ResponseMessage?.Content.Headers.GetValues("Content-Range").FirstOrDefault();
-            var count = int.Parse(countStr?.Split('/')[1] ?? throw new InvalidOperationException());
-
-            return (response, count);
+            return request;
         }
 
         /// <summary>