From 5cb18f45feb6758c5298df3b255dd6476eb4cd38 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 22 Apr 2017 11:12:09 +0200 Subject: replace participant_item with csv --- model.js | 6 ------ models/item_participant.js | 37 ------------------------------------- models/participant_stats.js | 4 ++++ 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 models/item_participant.js diff --git a/model.js b/model.js index 5d525bf..aff7577 100644 --- a/model.js +++ b/model.js @@ -19,9 +19,6 @@ module.exports = (seq, Seq) => { Skilltier = seq.import("./models/skill_tier.js"), Build = seq.import("./models/build.js"), - // Telemetry - ItemParticipant = seq.import("./models/item_participant.js"), - // data stats ParticipantStats = seq.import("./models/participant_stats.js"), @@ -38,19 +35,16 @@ module.exports = (seq, Seq) => { Roster.belongsTo(Match, { foreignKey: "match_api_id", targetKey: "api_id" }); Participant.belongsTo(Roster, { foreignKey: "roster_api_id", targetKey: "api_id" }); - Participant.hasMany(ItemParticipant, { as: "items", foreignKey: "participant_api_id", sourceKey: "api_id" }); Participant.hasMany(ParticipantStats, { as: "participant_stats", foreignKey: "participant_api_id", sourceKey: "api_id" }); Participant.belongsTo(GameMode, { foreignKey: "game_mode_id" }); Participant.belongsTo(Hero, { foreignKey: "hero_id" }); Participant.belongsTo(Series, { foreignKey: "series_id" }); Participant.belongsTo(Role, { foreignKey: "role_id" }); ParticipantStats.belongsTo(Participant, { foreignKey: "participant_api_id", "targetKey": "api_id" }); - ItemParticipant.belongsTo(Item, { foreignKey: "item_id", targetKey: "id" }); return { Match, Roster, Participant, Player, Asset, Item, Hero, Series, GameMode, Role, Filter, Skilltier, Build, - ItemParticipant, ParticipantStats, PlayerPoint, GlobalPoint, Gamer, diff --git a/models/item_participant.js b/models/item_participant.js deleted file mode 100644 index ca8ef15..0000000 --- a/models/item_participant.js +++ /dev/null @@ -1,37 +0,0 @@ -/* jshint indent: 2 */ - -module.exports = function(sequelize, DataTypes) { - return sequelize.define('item_participant', { - id: { - type: DataTypes.INTEGER(10).UNSIGNED, - allowNull: false, - primaryKey: true, - autoIncrement: true - }, - participant_api_id: { - type: DataTypes.CHAR(36), - allowNull: false - }, - item_id: { - type: DataTypes.STRING(191), - allowNull: false - }, - number: { - type: DataTypes.INTEGER(5).UNSIGNED, - allowNull: false - }, - action: { - type: DataTypes.ENUM('grant','sell','use','final'), - allowNull: false - }, - time_from_start: { - type: DataTypes.INTEGER(5).UNSIGNED, - allowNull: true - } - }, { - tableName: 'item_participant', - timestamps: false, - underscored: true, - freezeTableName: true - }); -}; diff --git a/models/participant_stats.js b/models/participant_stats.js index 3512cdf..dca0d0e 100644 --- a/models/participant_stats.js +++ b/models/participant_stats.js @@ -21,6 +21,10 @@ module.exports = function(sequelize, DataTypes) { allowNull: false, defaultValue: "1" }, + items: { + type: DataTypes.STRING(255), + allowNull: false + }, participant_api_id: { type: DataTypes.CHAR(36), allowNull: false -- cgit v1.3.1