diff --git a/app/models/realEstate.js b/app/models/realEstate.js index 48c85d2..93b82c4 100644 --- a/app/models/realEstate.js +++ b/app/models/realEstate.js @@ -51,11 +51,5 @@ module.exports = (sequelize, DataTypes) => { renewedDate: DataTypes.DATE }); - RealEstate.associate = models => { - RealEstate.belongsToMany(models.SearchRequestMatch, { - through: "SearchRequestMatch" - }); - }; - return RealEstate; }; diff --git a/app/models/searchRequest.js b/app/models/searchRequest.js index 36f3537..431f708 100644 --- a/app/models/searchRequest.js +++ b/app/models/searchRequest.js @@ -64,11 +64,5 @@ module.exports = (sequelize, DataTypes) => { } }); - SearchRequest.associate = models => { - SearchRequest.belongsToMany(models.SearchRequestMatch, { - through: "SearchRequestMatch" - }); - }; - return SearchRequest; }; diff --git a/app/models/searchRequestMatch.js b/app/models/searchRequestMatch.js index 6f9d048..b9c4221 100644 --- a/app/models/searchRequestMatch.js +++ b/app/models/searchRequestMatch.js @@ -9,15 +9,6 @@ module.exports = (sequelize, DataTypes) => { autoIncrement: true, allowNull: false }, - searchRequestId: { - type: DataTypes.UUID, - allowNull: false, - primaryKey: true, - references: { - model: "SearchRequest", - key: "id" - } - }, realEstateId: { type: DataTypes.BIGINT, allowNull: false, @@ -29,6 +20,15 @@ module.exports = (sequelize, DataTypes) => { onUpdate: "CASCADE", onDelete: "SET NULL" }, + searchRequestId: { + type: DataTypes.UUID, + allowNull: false, + primaryKey: true, + references: { + model: "SearchRequest", + key: "id" + } + }, notified: { type: DataTypes.BOOLEAN, allowNull: false, @@ -43,5 +43,11 @@ module.exports = (sequelize, DataTypes) => { } ); + SearchRequestMatch.associate = models => { + SearchRequestMatch.hasMany(models.RealEstate, { + foreignKey: "id" + }); + }; + return SearchRequestMatch; };