Skip to content

Commit da99e04

Browse files
authored
Replace Blog with Article (#526)
1 parent 3d3c038 commit da99e04

File tree

5 files changed

+58
-58
lines changed

5 files changed

+58
-58
lines changed

Amplify.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
210922572359693900CEC295 /* BasicAnalyticsEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210922562359693800CEC295 /* BasicAnalyticsEvent.swift */; };
1313
2109225A23596BCD00CEC295 /* AnalyticsCategoryBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2109225923596BCD00CEC295 /* AnalyticsCategoryBehavior.swift */; };
1414
210B3E34245CB73400F43848 /* AuthRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210B3E33245CB73400F43848 /* AuthRule.swift */; };
15-
210B3E36245CB86500F43848 /* Blog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210B3E35245CB86500F43848 /* Blog.swift */; };
16-
210B3E39245CB88D00F43848 /* Blog+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210B3E38245CB88D00F43848 /* Blog+Schema.swift */; };
1715
210DBC122332B3C0009B9E51 /* StorageDownloadFileOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210DBC112332B3C0009B9E51 /* StorageDownloadFileOperation.swift */; };
1816
210DBC142332B3C6009B9E51 /* StorageGetURLOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210DBC132332B3C6009B9E51 /* StorageGetURLOperation.swift */; };
1917
210DBC162332B3CB009B9E51 /* StorageDownloadDataOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210DBC152332B3CB009B9E51 /* StorageDownloadDataOperation.swift */; };
@@ -71,6 +69,8 @@
7169
21420AA0237222A900FA140C /* AWSAuthorizationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21420A8D237222A900FA140C /* AWSAuthorizationType.swift */; };
7270
2144226C234BDD9B009357F7 /* StorageUploadFileRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2144226B234BDD9B009357F7 /* StorageUploadFileRequest.swift */; };
7371
2144226E234BDE23009357F7 /* StorageUploadFileOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2144226D234BDE23009357F7 /* StorageUploadFileOperation.swift */; };
72+
214F49CD24898E8500DA616C /* Article.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214F49CB24898E8400DA616C /* Article.swift */; };
73+
214F49CE24898E8500DA616C /* Article+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214F49CC24898E8500DA616C /* Article+Schema.swift */; };
7474
21558E3E237BB4BF0032A5BB /* GraphQLRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21558E3D237BB4BF0032A5BB /* GraphQLRequest.swift */; };
7575
21558E40237CB8640032A5BB /* GraphQLError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21558E3F237CB8640032A5BB /* GraphQLError.swift */; };
7676
216879FE23636A0A004A056E /* RepeatingTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 216879FD23636A0A004A056E /* RepeatingTimer.swift */; };
@@ -635,8 +635,6 @@
635635
210922562359693800CEC295 /* BasicAnalyticsEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicAnalyticsEvent.swift; sourceTree = "<group>"; };
636636
2109225923596BCD00CEC295 /* AnalyticsCategoryBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsCategoryBehavior.swift; sourceTree = "<group>"; };
637637
210B3E33245CB73400F43848 /* AuthRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRule.swift; sourceTree = "<group>"; };
638-
210B3E35245CB86500F43848 /* Blog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Blog.swift; sourceTree = "<group>"; };
639-
210B3E38245CB88D00F43848 /* Blog+Schema.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Blog+Schema.swift"; sourceTree = "<group>"; };
640638
210DBC112332B3C0009B9E51 /* StorageDownloadFileOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageDownloadFileOperation.swift; sourceTree = "<group>"; };
641639
210DBC132332B3C6009B9E51 /* StorageGetURLOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageGetURLOperation.swift; sourceTree = "<group>"; };
642640
210DBC152332B3CB009B9E51 /* StorageDownloadDataOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageDownloadDataOperation.swift; sourceTree = "<group>"; };
@@ -706,6 +704,8 @@
706704
21420A8D237222A900FA140C /* AWSAuthorizationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AWSAuthorizationType.swift; sourceTree = "<group>"; };
707705
2144226B234BDD9B009357F7 /* StorageUploadFileRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageUploadFileRequest.swift; sourceTree = "<group>"; };
708706
2144226D234BDE23009357F7 /* StorageUploadFileOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageUploadFileOperation.swift; sourceTree = "<group>"; };
707+
214F49CB24898E8400DA616C /* Article.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Article.swift; sourceTree = "<group>"; };
708+
214F49CC24898E8500DA616C /* Article+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Article+Schema.swift"; sourceTree = "<group>"; };
709709
21558E3D237BB4BF0032A5BB /* GraphQLRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLRequest.swift; sourceTree = "<group>"; };
710710
21558E3F237CB8640032A5BB /* GraphQLError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLError.swift; sourceTree = "<group>"; };
711711
215F4BCAAB89FA54AA121BDE /* Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSPinpointAnalyticsPlugin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSPinpointAnalyticsPlugin.release.xcconfig"; path = "Target Support Files/Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSPinpointAnalyticsPlugin/Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSPinpointAnalyticsPlugin.release.xcconfig"; sourceTree = "<group>"; };
@@ -2184,8 +2184,8 @@
21842184
children = (
21852185
B952182F237E21B900F53237 /* schema.graphql */,
21862186
FAF512AD23986791001ADF4E /* AmplifyModels.swift */,
2187-
210B3E35245CB86500F43848 /* Blog.swift */,
2188-
210B3E38245CB88D00F43848 /* Blog+Schema.swift */,
2187+
214F49CB24898E8400DA616C /* Article.swift */,
2188+
214F49CC24898E8500DA616C /* Article+Schema.swift */,
21892189
B9521830237E21B900F53237 /* Comment.swift */,
21902190
B952182E237E21B900F53237 /* Comment+Schema.swift */,
21912191
FAA2E8BB239FFC7700E420EA /* MockModels.swift */,
@@ -4395,6 +4395,7 @@
43954395
isa = PBXSourcesBuildPhase;
43964396
buildActionMask = 2147483647;
43974397
files = (
4398+
214F49CD24898E8500DA616C /* Article.swift in Sources */,
43984399
B9FAA116238799D3009414B4 /* Author.swift in Sources */,
43994400
B9521833237E21BA00F53237 /* Comment+Schema.swift in Sources */,
44004401
FA176ED7238503C200C5C5F9 /* HubListenerTestUtilities.swift in Sources */,
@@ -4417,12 +4418,10 @@
44174418
FACA36152327FC39000E74F6 /* MessageReporter.swift in Sources */,
44184419
FAF512AE23986791001ADF4E /* AmplifyModels.swift in Sources */,
44194420
B9FAA11C23879B35009414B4 /* Book.swift in Sources */,
4420-
210B3E39245CB88D00F43848 /* Blog+Schema.swift in Sources */,
44214421
B9FAA11423878CEA009414B4 /* UserProfile+Schema.swift in Sources */,
44224422
FACA361D2327FC84000E74F6 /* MockAPICategoryPlugin.swift in Sources */,
44234423
B9FAA11023878C5E009414B4 /* UserProfile.swift in Sources */,
44244424
B9AA09F12473CA29000E6FBB /* PostStatus.swift in Sources */,
4425-
210B3E36245CB86500F43848 /* Blog.swift in Sources */,
44264425
B9FAA12023879BD0009414B4 /* BookAuthor+Schema.swift in Sources */,
44274426
21F40A4023A295470074678E /* TestCommonConstants.swift in Sources */,
44284427
B9521835237E21BA00F53237 /* Comment.swift in Sources */,
@@ -4431,6 +4430,7 @@
44314430
B9FAA10E23878BF3009414B4 /* UserAccount.swift in Sources */,
44324431
21F40A3C23A2952C0074678E /* AuthHelper.swift in Sources */,
44334432
B4F3E9FA24314ECC00F23296 /* MockAuthCategoryPlugin.swift in Sources */,
4433+
214F49CE24898E8500DA616C /* Article+Schema.swift in Sources */,
44344434
FA1846EE23998E44009B9D01 /* MockAPIResponders.swift in Sources */,
44354435
);
44364436
runOnlyForDeploymentPostprocessing = 0;

AmplifyPlugins/Core/AWSPluginsCoreTests/Model/GraphQLRequest/GraphQLRequestAuthRuleTests.swift

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ import XCTest
1313
class GraphQLRequestAuthRuleTests: XCTestCase {
1414

1515
override func setUp() {
16-
ModelRegistry.register(modelType: Blog.self)
16+
ModelRegistry.register(modelType: Article.self)
1717
}
1818

1919
override func tearDown() {
2020
ModelRegistry.reset()
2121
}
2222

2323
func testQueryGraphQLRequest() throws {
24-
let blog = Blog(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
25-
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: blog.modelName, operationType: .query)
24+
let article = Article(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
25+
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: article.modelName, operationType: .query)
2626
documentBuilder.add(decorator: DirectiveNameDecorator(type: .get))
27-
documentBuilder.add(decorator: ModelIdDecorator(id: blog.id))
27+
documentBuilder.add(decorator: ModelIdDecorator(id: article.id))
2828
documentBuilder.add(decorator: ConflictResolutionDecorator())
2929
documentBuilder.add(decorator: AuthRuleDecorator(.query))
3030
let document = documentBuilder.build()
3131
let documentStringValue = """
32-
query GetBlog($id: ID!) {
33-
getBlog(id: $id) {
32+
query GetArticle($id: ID!) {
33+
getArticle(id: $id) {
3434
id
3535
authorNotes
3636
content
@@ -44,7 +44,7 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
4444
}
4545
"""
4646

47-
let request = GraphQLRequest<MutationSyncResult?>.query(modelName: blog.modelName, byId: blog.id)
47+
let request = GraphQLRequest<MutationSyncResult?>.query(modelName: article.modelName, byId: article.id)
4848

4949
XCTAssertEqual(document.stringValue, request.document)
5050
XCTAssertEqual(documentStringValue, request.document)
@@ -53,20 +53,20 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
5353
XCTFail("The request doesn't contain variables")
5454
return
5555
}
56-
XCTAssertEqual(variables["id"] as? String, blog.id)
56+
XCTAssertEqual(variables["id"] as? String, article.id)
5757
}
5858

5959
func testCreateMutationGraphQLRequest() throws {
60-
let blog = Blog(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
61-
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: blog.modelName, operationType: .mutation)
60+
let article = Article(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
61+
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: article.modelName, operationType: .mutation)
6262
documentBuilder.add(decorator: DirectiveNameDecorator(type: .create))
63-
documentBuilder.add(decorator: ModelDecorator(model: blog))
63+
documentBuilder.add(decorator: ModelDecorator(model: article))
6464
documentBuilder.add(decorator: ConflictResolutionDecorator())
6565
documentBuilder.add(decorator: AuthRuleDecorator(.mutation))
6666
let document = documentBuilder.build()
6767
let documentStringValue = """
68-
mutation CreateBlog($input: CreateBlogInput!) {
69-
createBlog(input: $input) {
68+
mutation CreateArticle($input: CreateArticleInput!) {
69+
createArticle(input: $input) {
7070
id
7171
authorNotes
7272
content
@@ -79,7 +79,7 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
7979
}
8080
}
8181
"""
82-
let request = GraphQLRequest<MutationSyncResult>.createMutation(of: blog)
82+
let request = GraphQLRequest<MutationSyncResult>.createMutation(of: article)
8383

8484
XCTAssertEqual(document.stringValue, request.document)
8585
XCTAssertEqual(documentStringValue, request.document)
@@ -93,21 +93,21 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
9393
XCTFail("The document variables property doesn't contain a valid input")
9494
return
9595
}
96-
XCTAssert(input["content"] as? String == blog.content)
96+
XCTAssert(input["content"] as? String == article.content)
9797
XCTAssertFalse(input.keys.contains("owner"))
9898
}
9999

100100
func testUpdateMutationGraphQLRequest() throws {
101-
let blog = Blog(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
102-
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: blog.modelName, operationType: .mutation)
101+
let article = Article(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
102+
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: article.modelName, operationType: .mutation)
103103
documentBuilder.add(decorator: DirectiveNameDecorator(type: .update))
104-
documentBuilder.add(decorator: ModelDecorator(model: blog))
104+
documentBuilder.add(decorator: ModelDecorator(model: article))
105105
documentBuilder.add(decorator: ConflictResolutionDecorator())
106106
documentBuilder.add(decorator: AuthRuleDecorator(.mutation))
107107
let document = documentBuilder.build()
108108
let documentStringValue = """
109-
mutation UpdateBlog($input: UpdateBlogInput!) {
110-
updateBlog(input: $input) {
109+
mutation UpdateArticle($input: UpdateArticleInput!) {
110+
updateArticle(input: $input) {
111111
id
112112
authorNotes
113113
content
@@ -120,7 +120,7 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
120120
}
121121
}
122122
"""
123-
let request = GraphQLRequest<MutationSyncResult>.updateMutation(of: blog)
123+
let request = GraphQLRequest<MutationSyncResult>.updateMutation(of: article)
124124

125125
XCTAssertEqual(document.stringValue, request.document)
126126
XCTAssertEqual(documentStringValue, request.document)
@@ -133,21 +133,21 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
133133
XCTFail("The document variables property doesn't contain a valid input")
134134
return
135135
}
136-
XCTAssert(input["content"] as? String == blog.content)
136+
XCTAssert(input["content"] as? String == article.content)
137137
XCTAssertFalse(input.keys.contains("owner"))
138138
}
139139

140140
func testDeleteMutationGraphQLRequest() throws {
141-
let blog = Blog(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
142-
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: blog.modelName, operationType: .mutation)
141+
let article = Article(content: "content", createdAt: .now(), owner: nil, authorNotes: nil)
142+
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelName: article.modelName, operationType: .mutation)
143143
documentBuilder.add(decorator: DirectiveNameDecorator(type: .delete))
144-
documentBuilder.add(decorator: ModelIdDecorator(id: blog.id))
144+
documentBuilder.add(decorator: ModelIdDecorator(id: article.id))
145145
documentBuilder.add(decorator: ConflictResolutionDecorator())
146146
documentBuilder.add(decorator: AuthRuleDecorator(.mutation))
147147
let document = documentBuilder.build()
148148
let documentStringValue = """
149-
mutation DeleteBlog($input: DeleteBlogInput!) {
150-
deleteBlog(input: $input) {
149+
mutation DeleteArticle($input: DeleteArticleInput!) {
150+
deleteArticle(input: $input) {
151151
id
152152
authorNotes
153153
content
@@ -161,7 +161,7 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
161161
}
162162
"""
163163

164-
let request = GraphQLRequest<MutationSyncResult>.deleteMutation(modelName: blog.modelName, id: blog.id)
164+
let request = GraphQLRequest<MutationSyncResult>.deleteMutation(modelName: article.modelName, id: article.id)
165165

166166
XCTAssertEqual(document.stringValue, request.document)
167167
XCTAssertEqual(documentStringValue, request.document)
@@ -174,22 +174,22 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
174174
XCTFail("The document variables property doesn't contain a valid input")
175175
return
176176
}
177-
XCTAssertEqual(input["id"] as? String, blog.id)
177+
XCTAssertEqual(input["id"] as? String, article.id)
178178
XCTAssertFalse(input.keys.contains("owner"))
179179
XCTAssertFalse(input.keys.contains("authorNotes"))
180180
}
181181

182182
func testOnCreateSubscriptionGraphQLRequest() throws {
183-
let modelType = Blog.self as Model.Type
183+
let modelType = Article.self as Model.Type
184184
let ownerId = "111"
185185
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelType: modelType, operationType: .subscription)
186186
documentBuilder.add(decorator: DirectiveNameDecorator(type: .onCreate))
187187
documentBuilder.add(decorator: ConflictResolutionDecorator())
188188
documentBuilder.add(decorator: AuthRuleDecorator(.subscription(.onCreate, ownerId)))
189189
let document = documentBuilder.build()
190190
let documentStringValue = """
191-
subscription OnCreateBlog($owner: String!) {
192-
onCreateBlog(owner: $owner) {
191+
subscription OnCreateArticle($owner: String!) {
192+
onCreateArticle(owner: $owner) {
193193
id
194194
authorNotes
195195
content
@@ -221,15 +221,15 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
221221
}
222222

223223
func testOnUpdateSubscriptionGraphQLRequest() throws {
224-
let modelType = Blog.self as Model.Type
224+
let modelType = Article.self as Model.Type
225225
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelType: modelType, operationType: .subscription)
226226
documentBuilder.add(decorator: DirectiveNameDecorator(type: .onUpdate))
227227
documentBuilder.add(decorator: ConflictResolutionDecorator())
228228
documentBuilder.add(decorator: AuthRuleDecorator(.subscription(.onUpdate, "111")))
229229
let document = documentBuilder.build()
230230
let documentStringValue = """
231-
subscription OnUpdateBlog {
232-
onUpdateBlog {
231+
subscription OnUpdateArticle {
232+
onUpdateArticle {
233233
id
234234
authorNotes
235235
content
@@ -253,15 +253,15 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
253253
}
254254

255255
func testOnDeleteSubscriptionGraphQLRequest() throws {
256-
let modelType = Blog.self as Model.Type
256+
let modelType = Article.self as Model.Type
257257
var documentBuilder = ModelBasedGraphQLDocumentBuilder(modelType: modelType, operationType: .subscription)
258258
documentBuilder.add(decorator: DirectiveNameDecorator(type: .onDelete))
259259
documentBuilder.add(decorator: ConflictResolutionDecorator())
260260
documentBuilder.add(decorator: AuthRuleDecorator(.subscription(.onDelete, "111")))
261261
let document = documentBuilder.build()
262262
let documentStringValue = """
263-
subscription OnDeleteBlog {
264-
onDeleteBlog {
263+
subscription OnDeleteArticle {
264+
onDeleteArticle {
265265
id
266266
authorNotes
267267
content
@@ -285,7 +285,7 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
285285
}
286286

287287
func testSyncQueryGraphQLRequest() throws {
288-
let modelType = Blog.self as Model.Type
288+
let modelType = Article.self as Model.Type
289289
let nextToken = "nextToken"
290290
let limit = 100
291291
let lastSync = 123
@@ -296,8 +296,8 @@ class GraphQLRequestAuthRuleTests: XCTestCase {
296296
documentBuilder.add(decorator: AuthRuleDecorator(.query))
297297
let document = documentBuilder.build()
298298
let documentStringValue = """
299-
query SyncBlogs($lastSync: AWSTimestamp, $limit: Int, $nextToken: String) {
300-
syncBlogs(lastSync: $lastSync, limit: $limit, nextToken: $nextToken) {
299+
query SyncArticles($lastSync: AWSTimestamp, $limit: Int, $nextToken: String) {
300+
syncArticles(lastSync: $lastSync, limit: $limit, nextToken: $nextToken) {
301301
items {
302302
id
303303
authorNotes

0 commit comments

Comments
 (0)