Add namespace and namespaceAvailableAfter to precompile method

Author: winsmith

Sources/DataTransferObjects/Query/CustomQuery+CompileDown.swift

@@ -15,7 +15,12 @@ public extension CustomQuery {
     /// @warn Both precompile AND compileToRunnableQuery need to be run before a query can safely be handed to Druid!
     ///
     /// @see compileToRunnableQuery
-    func precompile(namespace: String? = nil, organizationAppIDs: [UUID], isSuperOrg: Bool) throws -> CustomQuery {
+    func precompile(
+        namespace: String? = nil,
+        namespaceAvailableAfter: Date? = nil,
+        organizationAppIDs: [UUID],
+        isSuperOrg: Bool
+    ) throws -> CustomQuery {
         guard (compilationStatus ?? .notCompiled) == .notCompiled else {
             throw QueryGenerationError.compilationStatusError
         }
@@ -36,7 +41,13 @@ public extension CustomQuery {
         }
 
         // Apply base filters and data source
-        query = try Self.applyBaseFilters(namespace: namespace, query: query, organizationAppIDs: organizationAppIDs, isSuperOrg: isSuperOrg)
+        query = try Self.applyBaseFilters(
+            namespace: namespace,
+            namespaceAvailableAfter: namespaceAvailableAfter,
+            query: query,
+            organizationAppIDs: organizationAppIDs,
+            isSuperOrg: isSuperOrg
+        )
 
         // Update compilationStatus so the next steps in the pipeline are sure the query has been precompiled
         query.compilationStatus = .precompiled
@@ -136,7 +147,13 @@ public extension CustomQuery {
 }
 
 extension CustomQuery {
-    static func applyBaseFilters(namespace: String?, query: CustomQuery, organizationAppIDs: [UUID]?, isSuperOrg: Bool) throws -> CustomQuery {
+    static func applyBaseFilters(
+        namespace: String?,
+        namespaceAvailableAfter: Date?,
+        query: CustomQuery,
+        organizationAppIDs: [UUID]?,
+        isSuperOrg: Bool
+    ) throws -> CustomQuery {
         // make an editable copy of the query
         var query = query
 
@@ -173,9 +190,20 @@ extension CustomQuery {
                 "com.telemetrydeck.compacted"
             ]
 
+            // Calculate earliest interval date, to compare against namespaceAvailableAfter
+            var earliestIntervalDate = Date.distantFuture
+            for interval in query.intervals ?? [] {
+                earliestIntervalDate = min(interval.beginningDate, earliestIntervalDate)
+            }
+            for relativeInterval in query.relativeIntervals ?? [] {
+                let interval = QueryTimeInterval.from(relativeTimeInterval: relativeInterval)
+                earliestIntervalDate = min(interval.beginningDate, earliestIntervalDate)
+            }
+
+            // Decide the data source based on the data source property and namespaces
             if let dataSource = query.dataSource, allowedDataSourceNames.contains(dataSource.name) {
                 query.dataSource = .init(dataSource.name)
-            } else if let namespace {
+            } else if let namespace, (namespaceAvailableAfter ?? Date.distantPast) < earliestIntervalDate {
                 query.dataSource = .init(namespace)
             } else {
                 query.dataSource = .init("telemetry-signals")

Tests/QueryGenerationTests/CompileDownTests.swift

@@ -287,4 +287,38 @@ final class CompileDownTests: XCTestCase {
         let compiledQuery = try precompiledQuery.compileToRunnableQuery()
         XCTAssertEqual(compiledQuery.dataSource?.name, "com.telemetrydeck.test")
     }
+
+    func testNamespaceWithAvailabilityDateInTheFuture() throws {
+        let intervals: [QueryTimeInterval] = [
+            .init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
+        ]
+
+        var query = CustomQuery(queryType: .timeseries, intervals: intervals, granularity: .day)
+        query.dataSource = nil
+        let precompiledQuery = try query.precompile(
+            namespace: "some-unknown-namespace",
+            namespaceAvailableAfter: Date(iso8601String: "2024-12-01T00:00:00.000Z")!,
+            organizationAppIDs: [appID1, appID2],
+            isSuperOrg: false
+        )
+        let compiledQuery = try precompiledQuery.compileToRunnableQuery()
+        XCTAssertEqual(compiledQuery.dataSource?.name, "telemetry-signals")
+    }
+
+    func testNamespaceWithAvailabilityDateInThePast() throws {
+        let intervals: [QueryTimeInterval] = [
+            .init(beginningDate: Date(iso8601String: "2023-04-01T00:00:00.000Z")!, endDate: Date(iso8601String: "2023-05-31T00:00:00.000Z")!),
+        ]
+
+        var query = CustomQuery(queryType: .timeseries, intervals: intervals, granularity: .day)
+        query.dataSource = nil
+        let precompiledQuery = try query.precompile(
+            namespace: "some-unknown-namespace",
+            namespaceAvailableAfter: Date(iso8601String: "2022-12-01T00:00:00.000Z")!,
+            organizationAppIDs: [appID1, appID2],
+            isSuperOrg: false
+        )
+        let compiledQuery = try precompiledQuery.compileToRunnableQuery()
+        XCTAssertEqual(compiledQuery.dataSource?.name, "some-unknown-namespace")
+    }
 }