Skip to content

Commit

Permalink
SPT-1998 fix pr
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrandrewsmith
mrandrewsmith committed May 7, 2024
1 parent 8315986 commit da998b5
Show file tree
Hide file tree
Showing 33 changed files with 35 additions and 82 deletions.
103 changes: 30 additions & 73 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
4F1DDBD3207B2D2500E0CEB4 /* PaginationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1DDBD2207B2D2500E0CEB4 /* PaginationPresenter.swift */; };
4FA424222075D346004AEDF6 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FA424202075D346004AEDF6 /* Message.swift */; };
4FA424232075D346004AEDF6 /* Message.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4FA424212075D346004AEDF6 /* Message.xib */; };
504E74BC2BE37EA400CFEB2E /* MockServer in Frameworks */ = {isa = PBXBuildFile; productRef = 504E74BB2BE37EA400CFEB2E /* MockServer */; };
504E74BE2BE37EA800CFEB2E /* Models in Frameworks */ = {isa = PBXBuildFile; productRef = 504E74BD2BE37EA800CFEB2E /* Models */; };
504E74C02BE37EAB00CFEB2E /* Services in Frameworks */ = {isa = PBXBuildFile; productRef = 504E74BF2BE37EAB00CFEB2E /* Services */; };
50816A1D2BC6E6DE00A43F3D /* NodeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 50816A1C2BC6E6DE00A43F3D /* NodeKit */; };
50816B2B2BC70ACB00A43F3D /* NodeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 50816B2A2BC70ACB00A43F3D /* NodeKit */; };
5097DF3F2BCD614A00D422EE /* NodeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF3E2BCD614A00D422EE /* NodeKit */; };
5097DF422BCD624700D422EE /* NodeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF412BCD624700D422EE /* NodeKit */; };
5097DF442BCD624700D422EE /* NodeKitMock in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF432BCD624700D422EE /* NodeKitMock */; };
5097DF492BCD62AA00D422EE /* NodeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF482BCD62AA00D422EE /* NodeKit */; };
5097DF4B2BCD62AA00D422EE /* NodeKitMock in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF4A2BCD62AA00D422EE /* NodeKitMock */; };
5097DF502BCD641D00D422EE /* LoginRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5097DF4F2BCD641D00D422EE /* LoginRouter.swift */; };
5097DF522BCD65E600D422EE /* FeatureListConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5097DF512BCD65E600D422EE /* FeatureListConfigurator.swift */; };
5097DF562BCD666000D422EE /* FeatureListViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5097DF552BCD666000D422EE /* FeatureListViewController.storyboard */; };
Expand All @@ -41,10 +39,6 @@
5097DF852BCDA58C00D422EE /* GroupViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5097DF842BCDA58C00D422EE /* GroupViewController.storyboard */; };
5097DF872BCDA5A300D422EE /* GroupPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5097DF862BCDA5A300D422EE /* GroupPresenter.swift */; };
5097DF892BCDA5B900D422EE /* GroupConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5097DF882BCDA5B900D422EE /* GroupConfigurator.swift */; };
5097DF9D2BCDAB2500D422EE /* Models in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF9C2BCDAB2500D422EE /* Models */; };
5097DFA02BCDAD9500D422EE /* Services in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DF9F2BCDAD9500D422EE /* Services */; };
5097DFA32BCDADAB00D422EE /* Services in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DFA22BCDADAB00D422EE /* Services */; };
5097DFA62BCDB0BE00D422EE /* MockServer in Frameworks */ = {isa = PBXBuildFile; productRef = 5097DFA52BCDB0BE00D422EE /* MockServer */; };
5097DFB22BCE00AB00D422EE /* GroupViewModelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5097DFB12BCE00AB00D422EE /* GroupViewModelProvider.swift */; };
50B569802BD183F00054DC09 /* Utils in Frameworks */ = {isa = PBXBuildFile; productRef = 50B5697F2BD183F00054DC09 /* Utils */; };
50B569832BD184150054DC09 /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = 50B569822BD184150054DC09 /* Nuke */; };
Expand All @@ -68,6 +62,9 @@
4F1DDBD2207B2D2500E0CEB4 /* PaginationPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaginationPresenter.swift; sourceTree = "<group>"; };
4FA424202075D346004AEDF6 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
4FA424212075D346004AEDF6 /* Message.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Message.xib; sourceTree = "<group>"; };
509656A72BE37DD700808890 /* Services */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Services; path = Modules/Services; sourceTree = "<group>"; };
509656A82BE37DD700808890 /* Models */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Models; path = Modules/Models; sourceTree = "<group>"; };
509656A92BE37DD700808890 /* MockServer */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MockServer; path = Modules/MockServer; sourceTree = "<group>"; };
5097DF4F2BCD641D00D422EE /* LoginRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginRouter.swift; sourceTree = "<group>"; };
5097DF512BCD65E600D422EE /* FeatureListConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureListConfigurator.swift; sourceTree = "<group>"; };
5097DF552BCD666000D422EE /* FeatureListViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = FeatureListViewController.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -108,29 +105,33 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5097DFA02BCDAD9500D422EE /* Services in Frameworks */,
504E74BE2BE37EA800CFEB2E /* Models in Frameworks */,
504E74BC2BE37EA400CFEB2E /* MockServer in Frameworks */,
50B569852BD184AD0054DC09 /* NukeExtensions in Frameworks */,
5097DF9D2BCDAB2500D422EE /* Models in Frameworks */,
50816B2B2BC70ACB00A43F3D /* NodeKit in Frameworks */,
5097DFA62BCDB0BE00D422EE /* MockServer in Frameworks */,
50C445A82BC8202700C515E6 /* ReactiveDataDisplayManager in Frameworks */,
5097DF492BCD62AA00D422EE /* NodeKit in Frameworks */,
5097DF442BCD624700D422EE /* NodeKitMock in Frameworks */,
5097DF3F2BCD614A00D422EE /* NodeKit in Frameworks */,
50C445A22BC81FB300C515E6 /* SwiftMessages in Frameworks */,
50B569832BD184150054DC09 /* Nuke in Frameworks */,
50B5698C2BD18F040054DC09 /* SnapKit in Frameworks */,
50816A1D2BC6E6DE00A43F3D /* NodeKit in Frameworks */,
5097DF422BCD624700D422EE /* NodeKit in Frameworks */,
504E74C02BE37EAB00CFEB2E /* Services in Frameworks */,
50B569802BD183F00054DC09 /* Utils in Frameworks */,
5097DFA32BCDADAB00D422EE /* Services in Frameworks */,
5097DF4B2BCD62AA00D422EE /* NodeKitMock in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
509656A62BE37DCC00808890 /* Modules */ = {
isa = PBXGroup;
children = (
509656A92BE37DD700808890 /* MockServer */,
509656A82BE37DD700808890 /* Models */,
509656A72BE37DD700808890 /* Services */,
);
name = Modules;
sourceTree = "<group>";
};
5097DF4C2BCD63AA00D422EE /* Flows */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -248,6 +249,7 @@
B96CD4401FDC5B1600F5A107 = {
isa = PBXGroup;
children = (
509656A62BE37DCC00808890 /* Modules */,
B96CD44B1FDC5B1600F5A107 /* Example */,
B96CD44A1FDC5B1600F5A107 /* Products */,
50C445B52BC8363F00C515E6 /* Frameworks */,
Expand Down Expand Up @@ -305,22 +307,16 @@
name = Example;
packageProductDependencies = (
50816A1C2BC6E6DE00A43F3D /* NodeKit */,
50816B2A2BC70ACB00A43F3D /* NodeKit */,
50C445A12BC81FB300C515E6 /* SwiftMessages */,
50C445A72BC8202700C515E6 /* ReactiveDataDisplayManager */,
5097DF3E2BCD614A00D422EE /* NodeKit */,
5097DF412BCD624700D422EE /* NodeKit */,
5097DF432BCD624700D422EE /* NodeKitMock */,
5097DF482BCD62AA00D422EE /* NodeKit */,
5097DF4A2BCD62AA00D422EE /* NodeKitMock */,
5097DF9C2BCDAB2500D422EE /* Models */,
5097DF9F2BCDAD9500D422EE /* Services */,
5097DFA22BCDADAB00D422EE /* Services */,
5097DFA52BCDB0BE00D422EE /* MockServer */,
50B5697F2BD183F00054DC09 /* Utils */,
50B569822BD184150054DC09 /* Nuke */,
50B569842BD184AD0054DC09 /* NukeExtensions */,
50B5698B2BD18F040054DC09 /* SnapKit */,
504E74BB2BE37EA400CFEB2E /* MockServer */,
504E74BD2BE37EA800CFEB2E /* Models */,
504E74BF2BE37EAB00CFEB2E /* Services */,
);
productName = Example;
productReference = B96CD4491FDC5B1600F5A107 /* Example.app */;
Expand Down Expand Up @@ -355,9 +351,6 @@
50C445A02BC81FB300C515E6 /* XCRemoteSwiftPackageReference "SwiftMessages" */,
50C445A62BC8202600C515E6 /* XCRemoteSwiftPackageReference "ReactiveDataDisplayManager" */,
5097DF472BCD62AA00D422EE /* XCLocalSwiftPackageReference "../NodeKit" */,
5097DF9B2BCDAB2500D422EE /* XCLocalSwiftPackageReference "Models" */,
5097DFA12BCDADAB00D422EE /* XCLocalSwiftPackageReference "Services" */,
5097DFA42BCDB0BE00D422EE /* XCLocalSwiftPackageReference "MockServer" */,
50B5697E2BD183F00054DC09 /* XCRemoteSwiftPackageReference "iOS-Utils" */,
50B569812BD184150054DC09 /* XCRemoteSwiftPackageReference "Nuke" */,
50B5698A2BD18F040054DC09 /* XCRemoteSwiftPackageReference "SnapKit" */,
Expand Down Expand Up @@ -615,18 +608,6 @@
isa = XCLocalSwiftPackageReference;
relativePath = ../NodeKit;
};
5097DF9B2BCDAB2500D422EE /* XCLocalSwiftPackageReference "Models" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Models;
};
5097DFA12BCDADAB00D422EE /* XCLocalSwiftPackageReference "Services" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Services;
};
5097DFA42BCDB0BE00D422EE /* XCLocalSwiftPackageReference "MockServer" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = MockServer;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
Expand Down Expand Up @@ -673,50 +654,26 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
50816A1C2BC6E6DE00A43F3D /* NodeKit */ = {
504E74BB2BE37EA400CFEB2E /* MockServer */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKit;
productName = MockServer;
};
50816B2A2BC70ACB00A43F3D /* NodeKit */ = {
504E74BD2BE37EA800CFEB2E /* Models */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKit;
productName = Models;
};
5097DF3E2BCD614A00D422EE /* NodeKit */ = {
504E74BF2BE37EAB00CFEB2E /* Services */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKit;
productName = Services;
};
5097DF412BCD624700D422EE /* NodeKit */ = {
50816A1C2BC6E6DE00A43F3D /* NodeKit */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKit;
};
5097DF432BCD624700D422EE /* NodeKitMock */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKitMock;
};
5097DF482BCD62AA00D422EE /* NodeKit */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKit;
};
5097DF4A2BCD62AA00D422EE /* NodeKitMock */ = {
isa = XCSwiftPackageProductDependency;
productName = NodeKitMock;
};
5097DF9C2BCDAB2500D422EE /* Models */ = {
isa = XCSwiftPackageProductDependency;
productName = Models;
};
5097DF9F2BCDAD9500D422EE /* Services */ = {
isa = XCSwiftPackageProductDependency;
productName = Services;
};
5097DFA22BCDADAB00D422EE /* Services */ = {
isa = XCSwiftPackageProductDependency;
productName = Services;
};
5097DFA52BCDB0BE00D422EE /* MockServer */ = {
isa = XCSwiftPackageProductDependency;
productName = MockServer;
};
50B5697F2BD183F00054DC09 /* Utils */ = {
isa = XCSwiftPackageProductDependency;
package = 50B5697E2BD183F00054DC09 /* XCRemoteSwiftPackageReference "iOS-Utils" */;
Expand Down
0 ...ckServer/Auth/LoginResponseProvider.swift → ...ckServer/Auth/LoginResponseProvider.swift
View file
File renamed without changes.
0 ...kServer/Error/ErrorResponseProvider.swift → ...kServer/Error/ErrorResponseProvider.swift
View file
File renamed without changes.
0 ...kServer/Group/GroupResponseProvider.swift → ...kServer/Group/GroupResponseProvider.swift
View file
File renamed without changes.
0 ...le/MockServer/MockServer/MockServer.swift → ...es/MockServer/MockServer/MockServer.swift
View file
File renamed without changes.
0 ...gination/PaginationResponseProvider.swift → ...gination/PaginationResponseProvider.swift
View file
File renamed without changes.
0 ...ckServer/MockServer/ServerConstants.swift → ...ckServer/MockServer/ServerConstants.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Example/MockServer/Package.swift → Example/Modules/MockServer/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
)
],
dependencies: [
.package(path: "../../NodeKit"),
.package(path: "../../../NodeKit"),
.package(path: "../Models")
],
targets: [
Expand Down
0 ...els/Requests/Auth/AuthRequestEntity.swift → ...els/Requests/Auth/AuthRequestEntity.swift
View file
File renamed without changes.
0 ...dels/Requests/Auth/AuthRequestEntry.swift → ...dels/Requests/Auth/AuthRequestEntry.swift
View file
File renamed without changes.
0 .../Pagination/PaginationRequestEntity.swift → .../Pagination/PaginationRequestEntity.swift
View file
File renamed without changes.
0 ...s/Pagination/PaginationRequestEntry.swift → ...s/Pagination/PaginationRequestEntry.swift
View file
File renamed without changes.
0 ...ponses/Auth/AuthTokenResponseEntity.swift → ...ponses/Auth/AuthTokenResponseEntity.swift
View file
File renamed without changes.
0 ...sponses/Auth/AuthTokenResponseEntry.swift → ...sponses/Auth/AuthTokenResponseEntry.swift
View file
File renamed without changes.
0 ...onses/Group/GroupBodyResponseEntity.swift → ...onses/Group/GroupBodyResponseEntity.swift
View file
File renamed without changes.
0 ...ponses/Group/GroupBodyResponseEntry.swift → ...ponses/Group/GroupBodyResponseEntry.swift
View file
File renamed without changes.
0 ...ses/Group/GroupFooterResponseEntity.swift → ...ses/Group/GroupFooterResponseEntity.swift
View file
File renamed without changes.
0 ...nses/Group/GroupFooterResponseEntry.swift → ...nses/Group/GroupFooterResponseEntry.swift
View file
File renamed without changes.
0 ...ses/Group/GroupHeaderResponseEntity.swift → ...ses/Group/GroupHeaderResponseEntity.swift
View file
File renamed without changes.
0 ...nses/Group/GroupHeaderResponseEntry.swift → ...nses/Group/GroupHeaderResponseEntry.swift
View file
File renamed without changes.
0 ...Pagination/PaginationResponseEntity.swift → ...Pagination/PaginationResponseEntity.swift
View file
File renamed without changes.
0 .../Pagination/PaginationResponseEntry.swift → .../Pagination/PaginationResponseEntry.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Example/Models/Package.swift → Example/Modules/Models/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
)
],
dependencies: [
.package(path: "../../NodeKit")
.package(path: "../../../NodeKit")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Example/Services/Package.swift → Example/Modules/Services/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
],
dependencies: [
.package(path: "../Models"),
.package(path: "../../NodeKit")
.package(path: "../../../NodeKit")
],
targets: [
.target(
Expand Down
0 ...es/Services/AuthService/AuthService.swift → ...es/Services/AuthService/AuthService.swift
View file
File renamed without changes.
0 ...ervices/AuthService/AuthURLProvider.swift → ...ervices/AuthService/AuthURLProvider.swift
View file
File renamed without changes.
0 .../Services/GroupService/GroupService.swift → .../Services/GroupService/GroupService.swift
View file
File renamed without changes.
0 ...vices/GroupService/GroupURLProvider.swift → ...vices/GroupService/GroupURLProvider.swift
View file
File renamed without changes.
0 ...rvice/PaginationContentDataProvider.swift → ...rvice/PaginationContentDataProvider.swift
View file
File renamed without changes.
0 ...nationService/PaginationURLProvider.swift → ...nationService/PaginationURLProvider.swift
View file
File renamed without changes.
0 Example/Services/Services/URLProviders.swift → ...ules/Services/Services/URLProviders.swift
View file
File renamed without changes.
4 changes: 0 additions & 4 deletions NodeKit/NodeKit/Utils/AsyncIterator/AsyncPagerIterator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ public actor AsyncPagerIterator<Value>: AsyncIterator, StateStorable {
currentState.hasNext = data.len != 0 && data.len >= currentState.pageSize
return .success(data.value)
}
.mapError {
currentState.hasNext = false
return $0
}
}

/// Возвращает есть ли еще данные для текущего состояния.
Expand Down
4 changes: 2 additions & 2 deletions NodeKit/NodeKitTests/UnitTests/AsyncIterator/AsyncPagerIteratorTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ final class AsyncPagerIteratorTests: XCTestCase {
XCTAssertFalse(hasNext)
}

func testHasNext_whenFailure_thenHasNotNext() async throws {
func testHasNext_whenFailure_thenHasNext() async throws {
// given

dataProviderMock.stubbedProvideResult = .failure(MockError.firstError)
Expand All @@ -182,7 +182,7 @@ final class AsyncPagerIteratorTests: XCTestCase {

// then

XCTAssertFalse(hasNext)
XCTAssertTrue(hasNext)
}

func testRenew_thenZeroIndexReceived() async throws {
Expand Down

0 comments on commit da998b5

Please sign in to comment.