optimize queries

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPGeoIPLocation.ps1

@@ -6,7 +6,7 @@ function Get-CIPPGeoIPLocation {
 
     $CacheGeoIPTable = Get-CippTable -tablename 'cachegeoip'
     $30DaysAgo = (Get-Date).AddDays(-30).ToString('yyyy-MM-ddTHH:mm:ssZ')
-    $Filter = "RowKey eq '$IP' and Timestamp ge datetime'$30DaysAgo'"
+    $Filter = "PartitionKey eq 'IP' and RowKey eq '$IP' and Timestamp ge datetime'$30DaysAgo'"
     $GeoIP = Get-CippAzDataTableEntity @CacheGeoIPTable -Filter $Filter
     if ($GeoIP) {
         return ($GeoIP.Data | ConvertFrom-Json)

Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1

@@ -110,7 +110,7 @@ function Test-CIPPAuditLogRules {
                     }
                     if (!$Trusted) {
                         $CacheLookupStartTime = Get-Date
-                        $Location = Get-AzDataTableEntity @LocationTable -Filter "RowKey eq '$($Data.clientIp)'" | Select-Object -ExcludeProperty Tenant
+                        $Location = Get-AzDataTableEntity @LocationTable -Filter "PartitionKey eq 'ip' and RowKey eq '$($Data.clientIp)'" | Select-Object -ExcludeProperty Tenant
                         $CacheLookupEndTime = Get-Date
                         $CacheLookupSeconds = ($CacheLookupEndTime - $CacheLookupStartTime).TotalSeconds
                         Write-Warning "Cache lookup for IP $($Data.clientip) took $CacheLookupSeconds seconds"