Merge branch 'master' of github.com:GridProtectionAlliance/gsf

gsfbuildbot committed 4 years ago

Commit f08c1fe2 parents f6b0f39 96feff05 files · +34 −29Browse files

Showing the changes to Source/Libraries/GSF.Web (1 of 5 files). Show all

Unified · Split

Source/Libraries/GSF.Web/Model/ModelController.cs+16−14

 using System.Web.Http;
 using GSF.Data;
 using GSF.Data.Model;
-using GSF.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+#pragma warning disable CS1591 // TODO: Fix missing XML comments for publicly visible types and members
 namespace GSF.Web.Model
 {
     /// <summary>
     public class ModelController<T> : ApiController where T : class, new()
     {
         #region [ Members ]
         /// <summary>
         /// Class Providing Search Parameters for the Search Endpoints
         /// </summary>
         }
         /// <summary>
-        /// Gets record from associated table with a primary key matching the id provided
+        /// Gets record from associated table with a primary key matching the <paramref name="id"/> provided.
         /// </summary>
         /// <param name="id">ID to be used</param>
-        /// <returns><see cref="IHttpActionResult"/> containing <see cref="T"/> or <see cref="Exception"/></returns>
+        /// <returns><see cref="IHttpActionResult"/> containing <typeparamref name="T"/> or <see cref="Exception"/></returns>
         [HttpGet, Route("One/{id}")]
         public virtual IHttpActionResult GetOne(string id)
         {
         }
         /// <summary>
-        /// Gets a sorted list of <see cref="T"/>.
+        /// Gets a sorted list of <typeparamref name="T"/>.
         /// </summary>
         /// <param name="sort"> the Field to be sorted by.</param>
         /// <param name="ascending"> parameter to indicate whether the list is in ascending order.</param>
         /// <summary>
         /// Adds a new Record.
         /// </summary>
-        /// <param name="record"> The <see cref="T"/> record to be added.</param>
+        /// <param name="record"> The <typeparamref name="T"/> record to be added.</param>
         /// <returns><see cref="IHttpActionResult"/> containing the added record or <see cref="Exception"/> </returns>
         [HttpPost, Route("Add")]
         public virtual IHttpActionResult Post([FromBody] JObject record)
         /// <summary>
         /// Updates an existing Record.
         /// </summary>
-        /// <param name="record"> The <see cref="T"/> record to be updated.</param>
+        /// <param name="record"> The <typeparamref name="T"/> record to be updated.</param>
         /// <returns><see cref="IHttpActionResult"/> containing the updated record or <see cref="Exception"/> </returns>
         [HttpPatch, Route("Update")]
         /// <summary>
         /// Deletes an existing Record.
         /// </summary>
-        /// <param name="record"> The <see cref="T"/> record to be deleted.</param>
+        /// <param name="record"> The <typeparamref name="T"/> record to be deleted.</param>
         /// <returns><see cref="IHttpActionResult"/> containing the number of records deleted or <see cref="Exception"/> </returns>
         [HttpDelete, Route("Delete")]
         }
         /// <summary>
-        /// Gets all records from associated table, filtered and sorted as defined in <see cref="postData"/>.
+        /// Gets all records from associated table, filtered and sorted as defined in <paramref name="postData"/>.
         /// </summary>
         /// <param name="postData"><see cref="PostData"/> containing the search and sort parameters</param>
        /// <returns><see cref="IHttpActionResult"/> containing <see cref="IEnumerable{T}"/> or <see cref="Exception"/></returns>
                                 SELECT
                                     SRC.*,
                                     ''AFV_'' + AF.{SearchSettings.FieldKeyField} AS AFFieldKey,
-	                                AF.{SearchSettings.ValueField} AS AFValue
+                                    AF.{SearchSettings.ValueField} AS AFValue
                                 FROM  {tableName} SRC LEFT JOIN
                                     {SearchSettings.AdditionalFieldTable} AF ON {joinCondition}
                                 ) as FullTbl ' + (SELECT CASE WHEN Len(@PivotColumns) > 0 THEN 'PIVOT (
                                 DECLARE @NoNPivotColumns NVARCHAR(MAX) = N''''
                                     SELECT @NoNPivotColumns = @NoNPivotColumns + ''[''+ name + ''],''
                                         FROM tempdb.sys.columns WHERE  object_id = Object_id(''tempdb..#Tbl'') AND name NOT LIKE ''AFV%'';
-		                        DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
+                                DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
-		                        exec sp_executesql @CleanSQL
+                                exec sp_executesql @CleanSQL
                             '
                             exec sp_executesql @SQLStatement";
                     else
                                 SELECT
                                     SRC.*,
                                     ''AFV_'' + AF.{SearchSettings.FieldKeyField} AS AFFieldKey,
-	                                AF.{SearchSettings.ValueField} AS AFValue
+                                    AF.{SearchSettings.ValueField} AS AFValue
                                 FROM  ({CustomView.Replace("'", "''")}) SRC LEFT JOIN
                                     {SearchSettings.AdditionalFieldTable} AF ON {joinCondition}
                                 ) as FullTbl ' + (SELECT CASE WHEN Len(@PivotColumns) > 0 THEN 'PIVOT (
                                 DECLARE @NoNPivotColumns NVARCHAR(MAX) = N''''
                                     SELECT @NoNPivotColumns = @NoNPivotColumns + ''[''+ name + ''],''
                                         FROM tempdb.sys.columns WHERE  object_id = Object_id(''tempdb..#Tbl'') AND name NOT LIKE ''AFV%'';
-		                        DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
+                                DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
-		                        exec sp_executesql @CleanSQL
+                                exec sp_executesql @CleanSQL
                             '
                             exec sp_executesql @SQLStatement";
                 }

Merge branch 'master' of github.com:GridProtectionAlliance/gsf

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code