Update creating sessions

adamayoung · Sep 16, 2024 · c5ee3bc · c5ee3bc
1 parent 0cc1102
commit c5ee3bc
Show file tree

Hide file tree

Showing 18 changed files with 118 additions and 111 deletions.
diff --git a/Tests/TMDbIntegrationTests/AccountIntegrationTests.swift b/Tests/TMDbIntegrationTests/AccountIntegrationTests.swift
@@ -26,21 +26,27 @@ import Testing
     .tags(.account),
     .enabled(if: CredentialHelper.shared.hasAPIKey && CredentialHelper.shared.hasCredential)
 )
-struct AccountIntegrationTests {
+final class AccountIntegrationTests {
 
     var accountService: (any AccountService)!
     var authenticationService: (any AuthenticationService)!
     var session: Session!
 
     init() async throws {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         let tmdbClient = TMDbClient(apiKey: apiKey)
-        let credential = CredentialHelper.shared.tmdbCredential()
 
         self.authenticationService = tmdbClient.authentication
         self.accountService = tmdbClient.account
+        self.session = try await TMDbSessionHelper.shared.createSession()
+    }
 
-        self.session = try await authenticationService.createSession(withCredential: credential)
+    deinit {
+        if let thisSession = session {
+            Task {
+                try await TMDbSessionHelper.shared.delete(session: thisSession)
+            }
+        }
     }
 
     @Test("details")

diff --git a/Tests/TMDbIntegrationTests/AuthenticationIntegrationTests.swift b/Tests/TMDbIntegrationTests/AuthenticationIntegrationTests.swift
@@ -30,7 +30,7 @@ struct AuthenticationIntegrationTests {
     var authenticationService: (any AuthenticationService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.authenticationService = TMDbClient(apiKey: apiKey).authentication
     }
 
@@ -55,7 +55,7 @@ struct AuthenticationIntegrationTests {
         .enabled(if: CredentialHelper.shared.hasCredential)
     )
     func createAndDeleteSessionWithCredential() async throws {
-        let credential = CredentialHelper.shared.tmdbCredential()
+        let credential = CredentialHelper.shared.tmdbCredential
 
         let session = try await authenticationService.createSession(withCredential: credential)
 

diff --git a/Tests/TMDbIntegrationTests/CertificationIntegrationTests.swift b/Tests/TMDbIntegrationTests/CertificationIntegrationTests.swift
@@ -30,7 +30,7 @@ struct CertificationIntegrationTests {
     var certificationService: (any CertificationService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.certificationService = TMDbClient(apiKey: apiKey).certifications
     }
 

diff --git a/Tests/TMDbIntegrationTests/CompanyIntegrationTests.swift b/Tests/TMDbIntegrationTests/CompanyIntegrationTests.swift
@@ -30,7 +30,7 @@ struct CompanyIntegrationTests {
     var companyService: (any CompanyService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.companyService = TMDbClient(apiKey: apiKey).companies
     }
 

diff --git a/Tests/TMDbIntegrationTests/ConfigurationIntegrationTests.swift b/Tests/TMDbIntegrationTests/ConfigurationIntegrationTests.swift
@@ -30,7 +30,7 @@ struct ConfigurationIntegrationTests {
     var configurationService: (any ConfigurationService)!
 
     init() throws {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.configurationService = TMDbClient(apiKey: apiKey).configurations
     }
 

diff --git a/Tests/TMDbIntegrationTests/DiscoverIntegrationTests.swift b/Tests/TMDbIntegrationTests/DiscoverIntegrationTests.swift
@@ -30,7 +30,7 @@ struct DiscoverIntegrationTests {
     var discoverService: (any DiscoverService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.discoverService = TMDbClient(apiKey: apiKey).discover
     }
 

diff --git a/Tests/TMDbIntegrationTests/GenreIntegrationTests.swift b/Tests/TMDbIntegrationTests/GenreIntegrationTests.swift
@@ -30,7 +30,7 @@ struct GenreIntegrationTests {
     var genreService: (any GenreService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.genreService = TMDbClient(apiKey: apiKey).genres
     }
 

diff --git a/Tests/TMDbIntegrationTests/MovieIntegrationTests.swift b/Tests/TMDbIntegrationTests/MovieIntegrationTests.swift
@@ -30,7 +30,7 @@ struct MovieIntegrationTests {
     var movieService: (any MovieService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.movieService = TMDbClient(apiKey: apiKey).movies
     }
 

diff --git a/Tests/TMDbIntegrationTests/PersonIntegrationTests.swift b/Tests/TMDbIntegrationTests/PersonIntegrationTests.swift
@@ -30,7 +30,7 @@ struct PersonIntegrationTests {
     var personService: (any PersonService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.personService = TMDbClient(apiKey: apiKey).people
     }
 

diff --git a/Tests/TMDbIntegrationTests/SearchIntegrationTests.swift b/Tests/TMDbIntegrationTests/SearchIntegrationTests.swift
@@ -30,7 +30,7 @@ struct SearchIntegrationTests {
     var searchService: (any SearchService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.searchService = TMDbClient(apiKey: apiKey).search
     }
 

diff --git a/Tests/TMDbIntegrationTests/TVEpisodeServiceTests.swift b/Tests/TMDbIntegrationTests/TVEpisodeServiceTests.swift
@@ -30,7 +30,7 @@ struct TVEpisodeServiceTests {
     var tvEpisodeService: (any TVEpisodeService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.tvEpisodeService = TMDbClient(apiKey: apiKey).tvEpisodes
     }
 

diff --git a/Tests/TMDbIntegrationTests/TVSeasonIntegrationTests.swift b/Tests/TMDbIntegrationTests/TVSeasonIntegrationTests.swift
@@ -30,7 +30,7 @@ struct TVSeasonIntegrationTests {
     var tvSeasonService: (any TVSeasonService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.tvSeasonService = TMDbClient(apiKey: apiKey).tvSeasons
     }
 

diff --git a/Tests/TMDbIntegrationTests/TVSeriesServiceTests.swift b/Tests/TMDbIntegrationTests/TVSeriesServiceTests.swift
@@ -30,7 +30,7 @@ struct TVSeriesServiceTests {
     var tvSeriesService: (any TVSeriesService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.tvSeriesService = TMDbClient(apiKey: apiKey).tvSeries
     }
 

diff --git a/Tests/TMDbIntegrationTests/TrendingIntegrationTests.swift b/Tests/TMDbIntegrationTests/TrendingIntegrationTests.swift
@@ -30,7 +30,7 @@ struct TrendingIntegrationTests {
     var trendingService: (any TrendingService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.trendingService = TMDbClient(apiKey: apiKey).trending
     }
 

diff --git a/Tests/TMDbIntegrationTests/Utility/CredentialHelper.swift b/Tests/TMDbIntegrationTests/Utility/CredentialHelper.swift
@@ -20,36 +20,36 @@
 import Foundation
 import TMDb
 
-struct CredentialHelper {
+final class CredentialHelper {
 
     static let shared = CredentialHelper()
 
-    var hasCredential: Bool {
-        let credential = tmdbCredential()
-
-        return !credential.username.isEmpty && !credential.password.isEmpty
-    }
-
-    var hasAPIKey: Bool {
-        !tmdbAPIKey().isEmpty
-    }
-
     private let processInfo: ProcessInfo
 
     private init(processInto: ProcessInfo = ProcessInfo.processInfo) {
         self.processInfo = processInto
     }
 
-    func tmdbCredential() -> Credential {
+    var hasCredential: Bool {
+        let credential = self.tmdbCredential
+
+        return !credential.username.isEmpty && !credential.password.isEmpty
+    }
+
+    lazy var tmdbCredential: Credential = {
         let username = processInfo.environment["TMDB_USERNAME"] ?? ""
         let password = processInfo.environment["TMDB_PASSWORD"] ?? ""
         let credential = Credential(username: username, password: password)
 
         return credential
+    }()
+
+    var hasAPIKey: Bool {
+        !self.tmdbAPIKey.isEmpty
     }
 
-    func tmdbAPIKey() -> String {
+    lazy var tmdbAPIKey: String = {
         processInfo.environment["TMDB_API_KEY"] ?? ""
-    }
+    }()
 
 }
diff --git a/Tests/TMDbIntegrationTests/Utility/TMDbSessionHelper.swift b/Tests/TMDbIntegrationTests/Utility/TMDbSessionHelper.swift
@@ -0,0 +1,79 @@
+//
+//  File.swift
+//  TMDb
+//
+//  Created by Adam Young on 16/09/2024.
+//
+
+import Foundation
+import TMDb
+
+actor TMDbSessionHelper {
+
+    static let shared = TMDbSessionHelper()
+
+    private let credentialHelper: CredentialHelper
+
+    private var sessionCache: CacheEntry?
+
+    private init(credentialHelper: CredentialHelper = .shared) {
+        self.credentialHelper = credentialHelper
+    }
+
+//    func session() async throws -> Session {
+//        if let sessionCache {
+//            switch sessionCache {
+//            case .ready(let session):
+//                return session
+//
+//            case .inProgress(let task):
+//                return try await task.value
+//            }
+//        }
+//
+//        let apiKey = CredentialHelper.shared.tmdbAPIKey
+//        let tmdbClient = TMDbClient(apiKey: apiKey)
+//        let credential = credentialHelper.tmdbCredential
+//
+//        let task = Task {
+//            try await tmdbClient.authentication.createSession(withCredential: credential)
+//        }
+//
+//        sessionCache = .inProgress(task)
+//
+//        do {
+//            let session = try await task.value
+//            sessionCache = .ready(session)
+//            return session
+//        } catch {
+//            sessionCache = nil
+//            throw error
+//        }
+//    }
+
+    func createSession() async throws -> Session {
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
+        let tmdbClient = TMDbClient(apiKey: apiKey)
+        let credential = credentialHelper.tmdbCredential
+
+        return try await tmdbClient.authentication.createSession(withCredential: credential)
+
+    }
+
+    func delete(session: Session) async throws {
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
+        let tmdbClient = TMDbClient(apiKey: apiKey)
+
+        try await tmdbClient.authentication.deleteSession(session)
+    }
+
+}
+
+extension TMDbSessionHelper {
+
+    private enum CacheEntry {
+        case inProgress(Task<Session, Error>)
+        case ready(Session)
+    }
+
+}
diff --git a/Tests/TMDbIntegrationTests/Utility/XCTestCase+ConfigureTMDb.swift b/Tests/TMDbIntegrationTests/Utility/XCTestCase+ConfigureTMDb.swift
diff --git a/Tests/TMDbIntegrationTests/WatchProviderIntegrationTests.swift b/Tests/TMDbIntegrationTests/WatchProviderIntegrationTests.swift
@@ -30,7 +30,7 @@ struct WatchProviderIntegrationTests {
     var watchProviderService: (any WatchProviderService)!
 
     init() {
-        let apiKey = CredentialHelper.shared.tmdbAPIKey()
+        let apiKey = CredentialHelper.shared.tmdbAPIKey
         self.watchProviderService = TMDbClient(apiKey: apiKey).watchProviders
     }