[ADMINAPI-1039] Fixes to the Sorting

Application/EdFi.Ods.AdminApi.DBTests/Database/QueryTests/GetAllApplicationsQuery.cs

@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+// Licensed to the Ed-Fi Alliance under one or more agreements.
+// The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+// See the LICENSE and NOTICES files in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using EdFi.Admin.DataAccess.Models;
+using EdFi.Ods.AdminApi.Helpers;
+using EdFi.Ods.AdminApi.Infrastructure;
+using EdFi.Ods.AdminApi.Infrastructure.Database.Queries;
+using Microsoft.Extensions.Options;
+using NUnit.Framework;
+using Shouldly;
+using VendorUser = EdFi.Admin.DataAccess.Models.User;
+
+
+namespace EdFi.Ods.AdminApi.DBTests.Database.QueryTests;
+
+[TestFixture]
+public class GetAllApplicationsQueryTests : PlatformUsersContextTestBase
+{
+    private IOptions<AppSettings> _options { get; set; }
+
+    [OneTimeSetUp]
+    public virtual async Task FixtureSetup()
+    {
+        _options = Testing.GetAppSettings();
+        _options.Value.PreventDuplicateApplications = false;
+        LoadApplications(3);
+        await Task.Yield();
+    }
+
+    [Test]
+    public void ShouldGetAllApplications()
+    {
+        Transaction(usersContext =>
+        {
+            var query = new GetAllApplicationsQuery(usersContext, _options);
+            var result = query.Execute(
+                new CommonQueryParams(null, null, null, null), null, null, null);
+
+            result.Count.ShouldBeGreaterThan(0);
+        });
+    }
+
+    [Test]
+    public void ShouldGetAllApplications_With_Offset_and_Limit()
+    {
+        var offset = 1;
+        var limit = 2;
+        Transaction(usersContext =>
+        {
+            var query = new GetAllApplicationsQuery(usersContext, _options);
+            var result = query.Execute(
+                new CommonQueryParams(offset, limit, null, null), null, null, null);
+
+            result.Count.ShouldBeGreaterThan(0);
+            result.Count.ShouldBe(2);
+        });
+    }
+
+    private void LoadApplications(int count = 1)
+    {
+        for (int i = 0; i < count; i++)
+        {
+            var vendor = new Vendor { VendorName = $"test vendor {Guid.NewGuid().ToString()}" };
+            var odsInstance = new OdsInstance
+            {
+                Name = $"Test Instance {Guid.NewGuid().ToString()}",
+                InstanceType = "Ods",
+                ConnectionString = "Data Source=(local);Initial Catalog=EdFi_Ods;Integrated Security=True;Encrypt=False"
+            };
+
+            var application = new Application
+            {
+                ApplicationName = $"test application {Guid.NewGuid().ToString()}",
+                ClaimSetName = "test claim set",
+                Vendor = vendor,
+                OperationalContextUri = OperationalContext.DefaultOperationalContextUri,
+            };
+            var user = new VendorUser
+            {
+                Email = "",
+                FullName = application.ApplicationName,
+                Vendor = vendor
+            };
+
+            var apiClient = new ApiClient
+            {
+                Application = application,
+                Key = "key",
+                Secret = "secret",
+                Name = application.ApplicationName,
+                IsApproved = true,
+                UseSandbox = false,
+                KeyStatus = "Active",
+                User = user,
+            };
+
+            var apiClientOdsIntance = new ApiClientOdsInstance
+            {
+                ApiClient = apiClient,
+                OdsInstance = odsInstance,
+            };
+
+            Save(odsInstance, vendor, application, apiClient, apiClientOdsIntance);
+        }
+    }
+}

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API Docker-multitenant-mssql.postman_environment.json

@@ -43,6 +43,18 @@
 			"value": "Tenant2",
 			"type": "default",
 			"enabled": true
+		},
+		{
+            "key": "sortByProperty",
+            "value": "function sortByProperty(objArray, prop, direction){ if (arguments.length<2) throw new Error(\"ARRAY, AND OBJECT PROPERTY MINIMUM ARGUMENTS, OPTIONAL DIRECTION\"); if (!Array.isArray(objArray)) throw new Error(\"FIRST ARGUMENT NOT AN ARRAY\"); const clone = objArray.slice(0); const direct = arguments.length>2 ? arguments[2] : 1; const propPath = (prop.constructor===Array) ? prop : prop.split(\".\"); clone.sort(function(a,b){ for (let p in propPath){ if (a[propPath[p]] && b[propPath[p]]){ a = a[propPath[p]]; b = b[propPath[p]]; } } a = a.match(/^\\d+$/) ? +a : a; b = b.match(/^\\d+$/) ? +b : b; return ( (a < b) ? -1*direct : ((a > b) ? 1*direct : 0) ); }); return clone; }",
+            "type": "default",
+            "enabled": true
+        },
+        {
+			"key": "jsHelper",
+			"value": "(function () { const rndChar = function (str) { return str.charAt(Math.floor(Math.random() * str.length)); }; const shfChar = function (str) { const array = str.split(''); for (let i = array.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)); [array[i], array[j]] = [array[j], array[i]]; } return array.join(''); }; return { generateClientSecret: function(){ const minLength = 32; const maxLength = 128; let result = ''; const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const specialCharacters = '!@#$%^&*()_+{}:\"<>?|[];\\',./`~'; const length = Math.floor(Math.random() * (maxLength - minLength + 1)) + minLength; result += rndChar('abcdefghijklmnopqrstuvwxyz'); result += rndChar('ABCDEFGHIJKLMNOPQRSTUVWXYZ'); result += rndChar('0123456789'); result += rndChar(specialCharacters); for (let i = result.length; i < length; i++) { const charactersPlusSpecial = characters + specialCharacters; result += charactersPlusSpecial.charAt(Math.floor(Math.random() * charactersPlusSpecial.length)); } return shfChar(result); }, randomChar : rndChar, shuffleString: shfChar } })",
+			"type": "default",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API Docker-multitenant-pgsql.postman_environment.json

@@ -43,6 +43,18 @@
 			"value": "Tenant2",
 			"type": "default",
 			"enabled": true
+		},
+		{
+            "key": "sortByProperty",
+            "value": "function sortByProperty(objArray, prop, direction){ if (arguments.length<2) throw new Error(\"ARRAY, AND OBJECT PROPERTY MINIMUM ARGUMENTS, OPTIONAL DIRECTION\"); if (!Array.isArray(objArray)) throw new Error(\"FIRST ARGUMENT NOT AN ARRAY\"); const clone = objArray.slice(0); const direct = arguments.length>2 ? arguments[2] : 1; const propPath = (prop.constructor===Array) ? prop : prop.split(\".\"); clone.sort(function(a,b){ for (let p in propPath){ if (a[propPath[p]] && b[propPath[p]]){ a = a[propPath[p]]; b = b[propPath[p]]; } } a = a.match(/^\\d+$/) ? +a : a; b = b.match(/^\\d+$/) ? +b : b; return ( (a < b) ? -1*direct : ((a > b) ? 1*direct : 0) ); }); return clone; }",
+            "type": "default",
+            "enabled": true
+        },
+        {
+			"key": "jsHelper",
+			"value": "(function () { const rndChar = function (str) { return str.charAt(Math.floor(Math.random() * str.length)); }; const shfChar = function (str) { const array = str.split(''); for (let i = array.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)); [array[i], array[j]] = [array[j], array[i]]; } return array.join(''); }; return { generateClientSecret: function(){ const minLength = 32; const maxLength = 128; let result = ''; const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const specialCharacters = '!@#$%^&*()_+{}:\"<>?|[];\\',./`~'; const length = Math.floor(Math.random() * (maxLength - minLength + 1)) + minLength; result += rndChar('abcdefghijklmnopqrstuvwxyz'); result += rndChar('ABCDEFGHIJKLMNOPQRSTUVWXYZ'); result += rndChar('0123456789'); result += rndChar(specialCharacters); for (let i = result.length; i < length; i++) { const charactersPlusSpecial = characters + specialCharacters; result += charactersPlusSpecial.charAt(Math.floor(Math.random() * charactersPlusSpecial.length)); } return shfChar(result); }, randomChar : rndChar, shuffleString: shfChar } })",
+			"type": "default",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API Docker-single-mssql.postman_environment.json

@@ -31,6 +31,18 @@
 			"value": "false",
 			"type": "default",
 			"enabled": true
+		},
+        {
+            "key": "sortByProperty",
+            "value": "function sortByProperty(objArray, prop, direction){ if (arguments.length<2) throw new Error(\"ARRAY, AND OBJECT PROPERTY MINIMUM ARGUMENTS, OPTIONAL DIRECTION\"); if (!Array.isArray(objArray)) throw new Error(\"FIRST ARGUMENT NOT AN ARRAY\"); const clone = objArray.slice(0); const direct = arguments.length>2 ? arguments[2] : 1; const propPath = (prop.constructor===Array) ? prop : prop.split(\".\"); clone.sort(function(a,b){ for (let p in propPath){ if (a[propPath[p]] && b[propPath[p]]){ a = a[propPath[p]]; b = b[propPath[p]]; } } a = a.match(/^\\d+$/) ? +a : a; b = b.match(/^\\d+$/) ? +b : b; return ( (a < b) ? -1*direct : ((a > b) ? 1*direct : 0) ); }); return clone; }",
+            "type": "default",
+            "enabled": true
+        },
+        {
+			"key": "jsHelper",
+			"value": "(function () { const rndChar = function (str) { return str.charAt(Math.floor(Math.random() * str.length)); }; const shfChar = function (str) { const array = str.split(''); for (let i = array.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)); [array[i], array[j]] = [array[j], array[i]]; } return array.join(''); }; return { generateClientSecret: function(){ const minLength = 32; const maxLength = 128; let result = ''; const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const specialCharacters = '!@#$%^&*()_+{}:\"<>?|[];\\',./`~'; const length = Math.floor(Math.random() * (maxLength - minLength + 1)) + minLength; result += rndChar('abcdefghijklmnopqrstuvwxyz'); result += rndChar('ABCDEFGHIJKLMNOPQRSTUVWXYZ'); result += rndChar('0123456789'); result += rndChar(specialCharacters); for (let i = result.length; i < length; i++) { const charactersPlusSpecial = characters + specialCharacters; result += charactersPlusSpecial.charAt(Math.floor(Math.random() * charactersPlusSpecial.length)); } return shfChar(result); }, randomChar : rndChar, shuffleString: shfChar } })",
+			"type": "default",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API Docker-single-pgsql.postman_environment.json

@@ -31,6 +31,18 @@
 			"value": "false",
 			"type": "default",
 			"enabled": true
+		},
+        {
+            "key": "sortByProperty",
+            "value": "function sortByProperty(objArray, prop, direction){ if (arguments.length<2) throw new Error(\"ARRAY, AND OBJECT PROPERTY MINIMUM ARGUMENTS, OPTIONAL DIRECTION\"); if (!Array.isArray(objArray)) throw new Error(\"FIRST ARGUMENT NOT AN ARRAY\"); const clone = objArray.slice(0); const direct = arguments.length>2 ? arguments[2] : 1; const propPath = (prop.constructor===Array) ? prop : prop.split(\".\"); clone.sort(function(a,b){ for (let p in propPath){ if (a[propPath[p]] && b[propPath[p]]){ a = a[propPath[p]]; b = b[propPath[p]]; } } a = a.match(/^\\d+$/) ? +a : a; b = b.match(/^\\d+$/) ? +b : b; return ( (a < b) ? -1*direct : ((a > b) ? 1*direct : 0) ); }); return clone; }",
+            "type": "default",
+            "enabled": true
+        },
+        {
+			"key": "jsHelper",
+			"value": "(function () { const rndChar = function (str) { return str.charAt(Math.floor(Math.random() * str.length)); }; const shfChar = function (str) { const array = str.split(''); for (let i = array.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)); [array[i], array[j]] = [array[j], array[i]]; } return array.join(''); }; return { generateClientSecret: function(){ const minLength = 32; const maxLength = 128; let result = ''; const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const specialCharacters = '!@#$%^&*()_+{}:\"<>?|[];\\',./`~'; const length = Math.floor(Math.random() * (maxLength - minLength + 1)) + minLength; result += rndChar('abcdefghijklmnopqrstuvwxyz'); result += rndChar('ABCDEFGHIJKLMNOPQRSTUVWXYZ'); result += rndChar('0123456789'); result += rndChar(specialCharacters); for (let i = result.length; i < length; i++) { const charactersPlusSpecial = characters + specialCharacters; result += charactersPlusSpecial.charAt(Math.floor(Math.random() * charactersPlusSpecial.length)); } return shfChar(result); }, randomChar : rndChar, shuffleString: shfChar } })",
+			"type": "default",
+			"enabled": true
 		}
 	],
 	"_postman_variable_scope": "environment",