Tidy, move recent documents to query scope

2017-07-06 22:02:55 -07:00
parent f08ca8d460
commit b854c2ca53
7 changed files with 46 additions and 64 deletions
--- a/server/models/Document.js
+++ b/server/models/Document.js
@ -116,6 +116,7 @@ const Document = sequelize.define(
    classMethods: {
      associate: models => {
        Document.belongsTo(models.Collection, {
+          as: 'collection',
          foreignKey: 'atlasId',
        });
        Document.belongsTo(models.User, {
@ -133,7 +134,7 @@ const Document = sequelize.define(
          'defaultScope',
          {
            include: [
-              { model: models.Collection },
+              { model: models.Collection, as: 'collection' },
              { model: models.User, as: 'createdBy' },
              { model: models.User, as: 'updatedBy' },
            ],