feat(datastore): Add isLoaded public property in List+Model (#3296)

aws-amplify · Oct 19, 2023 · bdc9b4a · bdc9b4a
1 parent 195f0db
commit bdc9b4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Amplify/Categories/DataStore/Model/Lazy/List+Model.swift b/Amplify/Categories/DataStore/Model/Lazy/List+Model.swift
@@ -26,6 +26,15 @@ public class List<ModelType: Model>: Collection, Codable, ExpressibleByArrayLite
 
  /// The current state of lazily loaded list
  var loadedState: LoadedState
+
+ /// Boolean property to check if list is loaded
+ public var isLoaded: Bool {
+ if case .loaded = loadedState {
+ return true
+ }
+
+ return false
+ }
 
  /// The provider for fulfilling list behaviors
  let listProvider: AnyModelListProvider<Element>
@@ -61,6 +70,7 @@ public class List<ModelType: Model>: Collection, Codable, ExpressibleByArrayLite
  }
  }
 
+
  // MARK: - Initializers
 
  public init(listProvider: AnyModelListProvider<ModelType>) {

diff --git a/AmplifyPlugins/DataStore/Tests/AWSDataStorePluginTests/Core/ListTests.swift b/AmplifyPlugins/DataStore/Tests/AWSDataStorePluginTests/Core/ListTests.swift
@@ -8,9 +8,9 @@
 import Combine
 import XCTest
 
-@testable import Amplify
-@testable import AmplifyTestCommon
-@testable import AWSDataStorePlugin
+import Amplify
+import AmplifyTestCommon
+import AWSDataStorePlugin
 
 class ListTests: BaseDataStoreTests {
 
@@ -25,15 +25,9 @@ class ListTests: BaseDataStoreTests {
  let postId = preparePostDataForTest()
 
  func checkComments(_ comments: List<Comment>) async throws {
- guard case .notLoaded = comments.loadedState else {
- XCTFail("Should not be loaded")
- return
- }
+ XCTAssertFalse(comments.isLoaded)
  try await comments.fetch()
- guard case .loaded = comments.loadedState else {
- XCTFail("Should be loaded")
- return
- }
+ XCTAssertTrue(comments.isLoaded)
  XCTAssertEqual(comments.count, 2)
  expect.fulfill()
  }