Refactoring the ModelChange API to use a real model instead of optionals #48
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // © 2016 LinkedIn Corp. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
|
|
||
| import Foundation | ||
|
|
||
| /** | ||
| This class is used to show which child models have changed. This object is usually in a dictionary: `[String: ModelChange]`. | ||
| The strings represent IDs and it shows what's changed in this ID. Either the ID has been deleted or updated. | ||
| If it's been updated, there are potentially several models that have updated if you are using projections. | ||
| */ | ||
| public enum ModelChange: Equatable { | ||
| /** | ||
| This indicates a model has been updated and lists the new models. | ||
| If you are using projections, there may be multiple models that represent this change. | ||
| Otherwise, there will just be one model here. | ||
| */ | ||
| case updated([ConsistencyManagerModel]) | ||
| /** | ||
| This indicates a model has been deleted. | ||
| */ | ||
| case deleted | ||
|
|
||
| public static func ==(lhs: ModelChange, rhs: ModelChange) -> Bool { | ||
| switch (lhs, rhs) { | ||
| case (.updated(let l), .updated(let r)): | ||
| guard l.count == r.count else { | ||
| return false | ||
| } | ||
| return zip(l, r).reduce(true) { isEqual, tuple in | ||
| return isEqual && tuple.0.isEqualToModel(tuple.1) | ||
| } | ||
| case (.deleted, .deleted): | ||
| return true | ||
|
There was a problem hiding this comment. Kind of weird that all deletes are considered equal. Maybe this data structure should capture the ID or the old model for deletes. There was a problem hiding this comment. This is so you can do: I'm not sure it should capture the old ID. I think the problem here is that this captures the whole change. It doesn't, it only specifies that something has changed. For instance, updates don't capture the old model, only the new model. |
||
| default: | ||
| return false | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // © 2016 LinkedIn Corp. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
|
|
||
| import XCTest | ||
| import ConsistencyManager | ||
|
|
||
| class ModelChangeTests: ConsistencyManagerTestCase { | ||
|
|
||
| func testDeleteEquality() { | ||
| XCTAssertEqual(ModelChange.deleted, ModelChange.deleted) | ||
| XCTAssertNotEqual(ModelChange.deleted, ModelChange.updated([])) | ||
| } | ||
|
|
||
| func testUpdatedEquality() { | ||
| let model = TestModel(id: "0", data: nil, children: [], requiredModel: TestRequiredModel(id: nil, data: 0)) | ||
| let otherModel = TestModel(id: "1", data: nil, children: [], requiredModel: TestRequiredModel(id: nil, data: 0)) | ||
|
|
||
| XCTAssertEqual(ModelChange.updated([model]), ModelChange.updated([model])) | ||
| XCTAssertNotEqual(ModelChange.updated([model]), ModelChange.updated([otherModel])) | ||
| XCTAssertNotEqual(ModelChange.updated([model]), ModelChange.updated([model, model])) | ||
| XCTAssertNotEqual(ModelChange.updated([model]), ModelChange.deleted) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
withUpdateslabel seems out of date now. Should either match the type (e.g.withModelChanges) or just bewithsince it now has a strong type (my preference is the latter).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed