From 1871f2ed519db7e893914dc3420f88a17cb17ddc Mon Sep 17 00:00:00 2001 From: schneefux Date: Fri, 31 Mar 2017 18:54:57 +0200 Subject: insert assets, squish concurrency bugs --- model.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'model.js') diff --git a/model.js b/model.js index 0ff813e..867643b 100644 --- a/model.js +++ b/model.js @@ -5,18 +5,24 @@ var JsonField = require("sequelize-json"); module.exports = (seq, Seq) => { let Match = seq.import("./models/match.js"), + Asset = seq.import("./models/asset.js"), Roster = seq.import("./models/roster.js"), + //Team = seq.import("./models/team.js"), Participant = seq.import("./models/participant.js"), - Player = seq.import("./models/player.js"); + ParticipantItemUse = seq.import("./models/participant_item_use.js"), + Player = seq.import("./models/player.js"), + Item = seq.import("./models/item.js"); - //Match.hasMany(Asset, {as: "Assets"}); - //Asset.belongsTo(Match); + Match.hasMany(Asset, {as: "Assets"}); + Asset.belongsTo(Match); Roster.belongsTo(Match, { foreignKey: "match_api_id", targetKey: "api_id" }); //Roster.hasOne(Team, {as: "Team"}); //Team.belongsTo(Roster); Participant.belongsTo(Roster, { foreignKey: "roster_api_id", targetKey: "api_id" }); Participant.hasOne(Player, { foreignKey: "player_api_id", targetKey: "api_id" }); + ParticipantItemUse.belongsTo(Participant, { foreignKey: "participant_api_id", targetKey: "api_id" }); + ParticipantItemUse.hasOne(Item); //return {Match, Roster, Team, Participant, Player, Asset}; - return {Match, Roster, Participant, Player}; + return {Match, Roster, Participant, ParticipantItemUse, Player, Asset, Item}; }; -- cgit v1.3.1