check OrderBy values

Author: nbeatty-gpa

Source/Applications/SystemCenter/Controllers/OpenXDA/AssetGroups/OpenXDAAssetGroupsController.cs

@@ -116,6 +116,13 @@ public IHttpActionResult GetAssetsPaged([FromBody] PostData postData, [FromUri]
             PagedResults results = new PagedResults();
             results.RecordsPerPage = recordsPerPage;
 
+            string orderBy = "ID";
+
+            if (typeof(Asset).GetProperties().Select(prop => prop.Name).Contains(postData.OrderBy) || postData.OrderBy == "AssetType")
+            {
+                orderBy = postData.OrderBy;
+            }
+
             using (AdoDataConnection connection = new AdoDataConnection(Connection))
             {
                 string sql = $@"SELECT   
@@ -144,7 +151,7 @@ GROUP BY
                                 AssetType.Name,
                                 AssetAssetGroup.AssetGroupID
                             HAVING AssetAssetGroup.AssetGroupID = {{0}}
-                            ORDER BY {postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}
+                            ORDER BY {orderBy} {(postData.Ascending ? "ASC" : "DESC")}
                             ";
 
                 DataTable records = connection.RetrieveData(sql, assetGroupID);
@@ -280,6 +287,11 @@ public IHttpActionResult GetMetersPaged([FromBody] PostData postData, [FromUri]
             PagedResults results = new PagedResults();
             results.RecordsPerPage = recordsPerPage;
 
+            string orderBy = "ID";
+            
+            if (typeof(Meter).GetProperties().Select(prop => prop.Name).Contains(postData.OrderBy))
+                orderBy = postData.OrderBy;
+
             using (AdoDataConnection connection = new AdoDataConnection(Connection))
             {
                 string sql = $@"SELECT DISTINCT
@@ -306,7 +318,7 @@ GROUP BY
                             Location.Name,
                             MeterAssetGroup.AssetGroupID
                         HAVING MeterAssetGroup.AssetGroupID = {{0}}
-                        ORDER BY {postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}
+                        ORDER BY {orderBy} {(postData.Ascending ? "ASC" : "DESC")}
                 ";
 
                 DataTable records = connection.RetrieveData(sql, assetGroupID);
@@ -446,9 +458,9 @@ public IHttpActionResult GetSubGroupsPaged([FromBody] PostData postData, [FromUr
             {
                 IEnumerable<AssetGroupView> records = new TableOperations<AssetGroupView>(connection).QueryRecordsWhere("ID in (SELECT ChildAssetGroupID FROM AssetGroupAssetGroupView WHERE ParentAssetGroupID = {0})", assetGroupID);
                 if (postData.Ascending)
-                    records = records.OrderBy(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record));
+                    records = records.OrderBy(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record) ?? record.ID);
                 else
-                    records = records.OrderByDescending(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record));
+                    records = records.OrderByDescending(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record) ?? record.ID);
 
                 results.TotalRecords = records.Count();
                 results.NumberOfPages = (records.Count() + recordsPerPage - 1) / recordsPerPage;

Source/Applications/SystemCenter/Controllers/OpenXDA/Assets/OpenXDAAssetController.cs

@@ -230,6 +230,11 @@ public IHttpActionResult GetAssetAssetConnectionsPaged([FromBody] PostData postD
 
             PagedResults results = new PagedResults();
 
+            string orderBy = "ID";
+
+            if (typeof(Asset).GetProperties().Select(prop => prop.Name).Contains(postData.OrderBy))
+                orderBy = postData.OrderBy;
+
             using (AdoDataConnection connection = new AdoDataConnection(Connection))
             {
                 DataTable records = connection.RetrieveData(@$"
@@ -242,15 +247,15 @@ public IHttpActionResult GetAssetAssetConnectionsPaged([FromBody] PostData postD
                         FROM
 	                        AssetRelationship JOIN
 	                        AssetRelationshipType ON AssetRelationship.AssetRelationshipTypeID = AssetRelationshipType.ID JOIN
-	                        ASset ON Asset.ID = (
+	                        Asset ON Asset.ID = (
 		                        CASE 
 			                        WHEN ParentID = {{0}} THEN AssetRelationship.ChildID
 			                        ELSE AssetRelationship.ParentID
 		                        END
 	                        )
                         WHERE
 	                        ParentID = {{0}} OR ChildID = {{0}}
-                        ORDER BY {postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}
+                        ORDER BY {orderBy} {(postData.Ascending ? "ASC" : "DESC")}
                     ", assetID);
 
                 int totalRecords = records.Rows.Count;