Skip to content

Enable remoting for embedsOne relation #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 29, 2014
Merged

Enable remoting for embedsOne relation #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6827b71
Enable remoting for embedsOne relation
offlinehacker Aug 22, 2014
b5b0ecd
Fix tests
fabien Aug 22, 2014
1915524
Enable remoting for embedsOne relation
offlinehacker Aug 22, 2014
6cfd1bb
Fix tests
fabien Aug 22, 2014
dc4a8ae
Merge branch 'feature/embeds-one-remoting' of https://github.com/fabi…
fabien Aug 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/models/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,12 @@ Model.setup = function () {
for (var relationName in relations) {
var relation = relations[relationName];
if (relation.type === 'belongsTo') {
ModelCtor.belongsToRemoting(relationName, relation, define)
} else if (relation.type === 'hasOne') {
ModelCtor.hasOneRemoting(relationName, relation, define)
ModelCtor.belongsToRemoting(relationName, relation, define);
} else if (
relation.type === 'hasOne' ||
relation.type === 'embedsOne'
) {
ModelCtor.hasOneRemoting(relationName, relation, define);
} else if (
relation.type === 'hasMany' ||
relation.type === 'embedsMany' ||
Expand Down
61 changes: 60 additions & 1 deletion test/relations.integration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,65 @@ describe('relations - integration', function () {
});
});
});

describe('embedsOne', function() {

before(function defineGroupAndPosterModels() {
var group = app.model(
'group',
{ properties: { name: 'string' },
dataSource: 'db',
plural: 'groups'
}
);
var poster = app.model(
'poster',
{ properties: { url: 'string' }, dataSource: 'db' }
);
group.embedsOne(poster, { as: 'cover' });
});

before(function createImage(done) {
var test = this;
app.models.group.create({ name: 'Group 1' },
function(err, group) {
if (err) return done(err);
test.group = group;
group.cover.build({ url: 'http://image.url' });
group.save(done);
});
});

after(function(done) {
this.app.models.group.destroyAll(done);
});

it('includes the embedded models', function(done) {
var url = '/api/groups/' + this.group.id;

this.get(url)
.expect(200, function(err, res) {
expect(res.body.name).to.be.equal('Group 1');
expect(res.body.poster).to.be.eql(
{ url: 'http://image.url' }
);
done();
});
});

it('returns the embedded model', function(done) {
var url = '/api/groups/' + this.group.id + '/cover';

this.get(url)
.expect(200, function(err, res) {
expect(res.body).to.be.eql(
{ url: 'http://image.url' }
);
done();
});
});

});

describe('embedsMany', function() {

Expand Down Expand Up @@ -959,7 +1018,7 @@ describe('relations - integration', function () {

describe('nested relations', function() {

before(function defineProductAndCategoryModels() {
before(function defineModels() {
var Book = app.model(
'Book',
{ properties: { name: 'string' }, dataSource: 'db',
Expand Down