This repository was archived by the owner on Jan 22, 2026. It is now read-only.
Relationship types from relatedproxy's metadata. #96
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,48 @@ | ||
| { | ||
| "data": [ | ||
| { | ||
| "type": "employees", | ||
| "id": "1", | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/employees/1" | ||
| }, | ||
| "attributes": { | ||
| "name": "The Special" | ||
| }, | ||
| "relationships": { | ||
| "supervisor": { | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/employees/1/relationships/supervisor", | ||
| "related": "http://api.pixelhandler.com/api/v1/employees/1/supervisor" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "supervisors", | ||
| "id": "2", | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/supervisors/2" | ||
| }, | ||
| "attributes": { | ||
| "name": "The Boss" | ||
| }, | ||
| "relationships": { | ||
| "direct-reports": { | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/supervisors/2/relationships/direct-reports", | ||
| "related": "http://api.pixelhandler.com/api/v1/supervisors/2/direct-reports" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "meta": { | ||
| "page": { | ||
| "sort": "-date", | ||
| "total": 2, | ||
| "limit": "5", | ||
| "offset": "0" | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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,19 @@ | ||
| { | ||
| "data": { | ||
| "type": "employees", | ||
| "id": "1", | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/employees/1" | ||
| }, | ||
| "attributes": { | ||
| "name": "The Special" | ||
| }, | ||
| "relationships": { | ||
| "supervisor": { | ||
| "links": { | ||
| "related": "http://api.pixelhandler.com/api/v1/employees/1/supervisor" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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,20 @@ | ||
| { | ||
| "data": { | ||
| "type": "supervisors", | ||
| "id": "2", | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/supervisors/2" | ||
| }, | ||
| "attributes": { | ||
| "name": "The Boss" | ||
| }, | ||
| "relationships": { | ||
| "direct-reports": { | ||
| "links": { | ||
| "self": "http://api.pixelhandler.com/api/v1/supervisors/2/relationships/direct-reports", | ||
| "related": "http://api.pixelhandler.com/api/v1/supervisors/2/direct-reports" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ import { setup, teardown, mockServices } from 'dummy/tests/helpers/resources'; | |
| import postMock from 'fixtures/api/posts/1'; | ||
| import postsMock from 'fixtures/api/posts'; | ||
| import authorMock from 'fixtures/api/authors/1'; | ||
| import employeeMock from 'fixtures/api/employees/1'; | ||
| import supervisorMock from 'fixtures/api/supervisors/2'; | ||
|
|
||
| let sandbox; | ||
|
|
||
|
|
@@ -224,51 +226,27 @@ test('#findRelated', function(assert) { | |
| test('#findRelated is called with optional type for the resource', function (assert) { | ||
| assert.expect(4); | ||
|
Owner
There was a problem hiding this comment. moving these to fixtures is a good idea, thanks. |
||
| const done = assert.async(); | ||
|
|
||
| let supervisor = this.container.lookup('model:supervisor').create(supervisorMock.data); | ||
| let employee = this.container.lookup('model:employee').create(employeeMock.data); | ||
|
|
||
| let SupervisorAdapter = Adapter.extend({type: 'supervisors', url: '/supervisors'}); | ||
| SupervisorAdapter.reopenClass({isServiceFactory: true}); | ||
| let EmployeeAdapter = Adapter.extend({type: 'employees', url: '/employees'}); | ||
| EmployeeAdapter.reopenClass({isServiceFactory: true}); | ||
|
|
||
| this.registry.register('service:employees', EmployeeAdapter.extend({ | ||
| cacheLookup: function () { return employee; } | ||
| })); | ||
| let employeeService = this.container.lookup('service:employees'); | ||
| let stub = sandbox.stub(employeeService, 'findRelated', function () { | ||
| return RSVP.Promise.resolve(null); | ||
| }); | ||
|
|
||
| let url = supervisor.get('relationships.direct-reports.links.related'); | ||
| supervisor.get('directReports').then(() => { | ||
| assert.ok(stub.calledOnce, 'employees service findRelated method called once'); | ||
| assert.equal(stub.firstCall.args[0].resource, 'direct-reports', 'findRelated called with "direct-reports" resource'); | ||
|
Owner
There was a problem hiding this comment. @aars I like using 'direct-reports' better than using 'supervisor' this improves the test. |
||
| assert.equal(stub.firstCall.args[0].type, 'employees', 'findRelated called with employees type'); | ||
| assert.equal(stub.firstCall.args[1], url, 'findRelated called with url, ' + url); | ||
| done(); | ||
|
|
@@ -404,6 +382,30 @@ test('#createRelationship (to-one)', function(assert) { | |
| }); | ||
| }); | ||
|
|
||
| test('#createRelationship uses optional resource type', function (assert) { | ||
| assert.expect(2); | ||
| const done = assert.async(); | ||
|
|
||
| mockServices.call(this); | ||
| let adapter = this.subject({type: 'supervisors', url: '/supervisors'}); | ||
| sandbox.stub(adapter, 'fetch', function () { return RSVP.Promise.resolve(null); }); | ||
| let resource = this.container.lookup('model:supervisor').create(supervisorMock.data); | ||
| let promise = adapter.createRelationship(resource, 'directReports', '1'); | ||
|
|
||
| assert.ok(typeof promise.then === 'function', 'returns a thenable'); | ||
| promise.then(() => { | ||
| let jsonBody = JSON.stringify({data: [{type: 'employees', id: '1'}]}); | ||
| assert.ok( | ||
| adapter.fetch.calledWith( | ||
| supervisorMock.data.relationships['direct-reports'].links.self, | ||
| {method: 'POST', body: jsonBody} | ||
| ), | ||
| '#fetch called with url and options with data' | ||
| ); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| test('#deleteRelationship (to-many)', function(assert) { | ||
| assert.expect(2); | ||
| const done = assert.async(); | ||
|
|
@@ -452,6 +454,30 @@ test('#deleteRelationship (to-one)', function(assert) { | |
| }); | ||
| }); | ||
|
|
||
| test('#deleteRelationship uses optional resource type', function (assert) { | ||
| assert.expect(2); | ||
| const done = assert.async(); | ||
|
|
||
| mockServices.call(this); | ||
| let adapter = this.subject({type: 'supervisors', url: '/supervisors'}); | ||
| sandbox.stub(adapter, 'fetch', function () { return RSVP.Promise.resolve(null); }); | ||
| let resource = this.container.lookup('model:supervisor').create(supervisorMock.data); | ||
| let promise = adapter.deleteRelationship(resource, 'directReports', '1'); | ||
|
|
||
| assert.ok(typeof promise.then === 'function', 'returns a thenable'); | ||
| promise.then(() => { | ||
| let jsonBody = JSON.stringify({data: [{type: 'employees', id: '1'}]}); | ||
| assert.ok( | ||
| adapter.fetch.calledWith( | ||
| supervisorMock.data.relationships['direct-reports'].links.self, | ||
| {method: 'DELETE', body: jsonBody} | ||
| ), | ||
| '#fetch called with url and options with data' | ||
| ); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| test('#patchRelationship (to-many)', function(assert) { | ||
| assert.expect(2); | ||
| const done = assert.async(); | ||
|
|
@@ -502,6 +528,32 @@ test('#patchRelationship (to-one)', function(assert) { | |
| }); | ||
| }); | ||
|
|
||
| test('#patchRelationship uses optional resource type', function (assert) { | ||
| assert.expect(2); | ||
| const done = assert.async(); | ||
|
|
||
| mockServices.call(this); | ||
| let adapter = this.subject({type: 'supervisors', url: '/supervisors'}); | ||
| sandbox.stub(adapter, 'fetch', function () { return RSVP.Promise.resolve(null); }); | ||
| let resource = this.container.lookup('model:supervisor').create(supervisorMock.data); | ||
| resource.addRelationship('directReports', '1'); | ||
| let promise = adapter.patchRelationship(resource, 'directReports'); | ||
|
|
||
| assert.ok(typeof promise.then === 'function', 'returns a thenable'); | ||
| promise.then(() => { | ||
| let jsonBody = JSON.stringify({data: [{type: 'employees', id: '1'}]}); | ||
| assert.ok( | ||
| adapter.fetch.calledWith( | ||
| supervisorMock.data.relationships['direct-reports'].links.self, | ||
| {method: 'PATCH', body: jsonBody} | ||
| ), | ||
| '#fetch called with url and options with data' | ||
| ); | ||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| // Even though create- and deleteRelationship both use _payloadForRelationship, | ||
| // which does the casting of id to String, we test them seperately to ensure this | ||
| // is always tested, even when internals change. | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
@aars I'm curious if we need to set id in here as well. I forget if the id is already written during deserialization. Can merge w/o any change here but would be worth looking into just to confirm.
Uh oh!
There was an error while loading. Please reload this page.
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.
I'm not sure what you're referring to here. I'm not clear on what is happening after
then()here. What is the purpose ofif (resource.toString().match('JSONAPIResource') === null) {?I think I interpreted that as checking if the resource was new or somehow was expected to be the same as the response, but I don't see how I got that from this line.
I'm suddenly quite confused about this method.
createResourceshould only be called on new resources, but there is nothing preventing this. Should we? (I don't think so, since we don't really enforce "newness")return respdoing? I think the tests show thatrespis already aResourceinstance, sofetchmight already update the resource? Is it?!fetchSuccessHandlerreturning either a resource instance or simply json-data. I need to figure out where the raw json-data is used.if (resource.toString().match())line doing?createResourcecalled with resource that already has anid, but server ignores the id on POST (since that's not supposed to be used to update a resource), creates a new resource with the given properties, and returns them all with a differentid. If we then simply update theidon the givenresourcewe dun goofed.isNew? Error about attempting to create an existing resource. No POST for you.isNew? We POST since you asked nicely, but we error on receiving a mismatchingid.I'll dive into what
fetchis doing exactly and where resources are instantiated exactly.Also, I think I dun goofed myself by doingthis.get('url')here, that should of course bethis.fetchUrl(). Though that's what it did originally. But that's wrong, right? (needsfetchUrl)Ah no. I see now that
fetchcallsfetchUrl, nice.edit: Running all tests we never enter the
if (resource.toString().match('JSONAPIResource') === null) {situation. I'm now even more unclear on it's usage ;)