diff --git a/backend/models/community/folder.js b/backend/models/community/folder.js index 2c7d1f1..955499a 100644 --- a/backend/models/community/folder.js +++ b/backend/models/community/folder.js @@ -8,16 +8,12 @@ const Folder = sequelize.define('folder', { allowNull: false}, parentId: { type: DataTypes.INTEGER, - allowNull: true, - references: { - model: 'folder', - key: 'id'}}, + allowNull: true + }, userId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'user', - key: 'id'}}}, { + allowNull: false + }}, { tableName: 'folder', schema: 'community', underscored: true, diff --git a/backend/models/community/folder_image_visibility.js b/backend/models/community/folder_image_visibility.js index 600e1d9..d828f34 100644 --- a/backend/models/community/folder_image_visibility.js +++ b/backend/models/community/folder_image_visibility.js @@ -10,22 +10,11 @@ const FolderImageVisibility = sequelize.define('folder_image_visibility', { }, folderId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'folder', - key: 'id' - } + allowNull: false }, visibilityTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: { - schema: 'type', - tableName: 'image_visibility_type' - }, - key: 'id' - } + allowNull: false } }, { tableName: 'folder_image_visibility', diff --git a/backend/models/community/folder_visibility_user.js b/backend/models/community/folder_visibility_user.js index eda688d..a95bc3f 100644 --- a/backend/models/community/folder_visibility_user.js +++ b/backend/models/community/folder_visibility_user.js @@ -10,19 +10,11 @@ const FolderVisibilityUser = sequelize.define('folder_visibility_user', { }, folderId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'folder', - key: 'id' - } + allowNull: false }, visibilityUserId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'image_visibility_user', - key: 'id' - } + allowNull: false } }, { tableName: 'folder_visibility_user', diff --git a/backend/models/community/guestbook.js b/backend/models/community/guestbook.js index d306f26..3fa80f2 100644 --- a/backend/models/community/guestbook.js +++ b/backend/models/community/guestbook.js @@ -10,19 +10,11 @@ const GuestbookEntry = sequelize.define('guestbook_entry', { allowNull: false}, recipientId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: User, - key: 'id' - } + allowNull: false }, senderId: { type: DataTypes.INTEGER, - allowNull: true, - references: { - model: User, - key: 'id' - } + allowNull: true }, senderUsername: { type: DataTypes.STRING, diff --git a/backend/models/community/image.js b/backend/models/community/image.js index b654c3e..589a29c 100644 --- a/backend/models/community/image.js +++ b/backend/models/community/image.js @@ -18,16 +18,12 @@ const Image = sequelize.define('image', { unique: true}, folderId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'folder', - key: 'id'}}, + allowNull: false + }, userId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'user', - key: 'id'}}}, { + allowNull: false + }}, { tableName: 'image', schema: 'community', underscored: true, diff --git a/backend/models/community/image_image_visibility.js b/backend/models/community/image_image_visibility.js index 27ad316..8ac6da4 100644 --- a/backend/models/community/image_image_visibility.js +++ b/backend/models/community/image_image_visibility.js @@ -10,22 +10,11 @@ const ImageImageVisibility = sequelize.define('image_image_visibility', { }, imageId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'image', - key: 'id' - } + allowNull: false }, visibilityTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: { - schema: 'type', - tableName: 'image_visibility_type' - }, - key: 'id' - } + allowNull: false } }, { tableName: 'image_image_visibility', diff --git a/backend/models/community/user_param.js b/backend/models/community/user_param.js index 73699f8..6423a6e 100644 --- a/backend/models/community/user_param.js +++ b/backend/models/community/user_param.js @@ -7,19 +7,11 @@ import { encrypt, decrypt } from '../../utils/encryption.js'; const UserParam = sequelize.define('user_param', { userId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: User, - key: 'id', - }, + allowNull: false }, paramTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: UserParamType, - key: 'id', - }, + allowNull: false }, value: { type: DataTypes.STRING, diff --git a/backend/models/community/user_right.js b/backend/models/community/user_right.js index d2f8e58..fb7955c 100644 --- a/backend/models/community/user_right.js +++ b/backend/models/community/user_right.js @@ -6,19 +6,11 @@ import UserRightType from '../type/user_right.js'; const UserRight = sequelize.define('user_right', { userId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: User, - key: 'id' - } + allowNull: false }, rightTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: UserRightType, - key: 'id' - } + allowNull: false }}, { tableName: 'user_right', schema: 'community', diff --git a/backend/models/falukant/data/production.js b/backend/models/falukant/data/production.js index c443275..8785ee7 100644 --- a/backend/models/falukant/data/production.js +++ b/backend/models/falukant/data/production.js @@ -17,11 +17,6 @@ Production.init({ weatherTypeId: { type: DataTypes.INTEGER, allowNull: true, - references: { - model: WeatherType, - key: 'id', - schema: 'falukant_type' - }, comment: 'Wetter zum Zeitpunkt der Produktionserstellung' }, startTimestamp: { diff --git a/backend/models/falukant/data/region.js b/backend/models/falukant/data/region.js index 48842ed..2047167 100644 --- a/backend/models/falukant/data/region.js +++ b/backend/models/falukant/data/region.js @@ -10,20 +10,11 @@ RegionData.init({ allowNull: false}, regionTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: RegionType, - key: 'id', - schema: 'falukant_type' - } + allowNull: false }, parentId: { type: DataTypes.INTEGER, - allowNull: true, - references: { - model: 'region', - key: 'id', - schema: 'falukant_data'} + allowNull: true }, map: { type: DataTypes.JSONB, diff --git a/backend/models/falukant/data/region_distance.js b/backend/models/falukant/data/region_distance.js index bd034dd..76f58be 100644 --- a/backend/models/falukant/data/region_distance.js +++ b/backend/models/falukant/data/region_distance.js @@ -8,21 +8,11 @@ RegionDistance.init( { sourceRegionId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: RegionData, - key: 'id', - schema: 'falukant_data', - }, + allowNull: false }, targetRegionId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: RegionData, - key: 'id', - schema: 'falukant_data', - }, + allowNull: false }, transportMode: { // e.g. 'land', 'water', 'air' – should match VehicleType.transportMode diff --git a/backend/models/falukant/data/relationship.js b/backend/models/falukant/data/relationship.js index fec1a1e..75e51ff 100644 --- a/backend/models/falukant/data/relationship.js +++ b/backend/models/falukant/data/relationship.js @@ -8,18 +8,10 @@ Relationship.init( { character1Id: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: FalukantCharacter, - key: 'id'}, - onDelete: 'CASCADE'}, + allowNull: false}, character2Id: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: FalukantCharacter, - key: 'id'}, - onDelete: 'CASCADE'}, + allowNull: false}, relationshipTypeId: { type: DataTypes.INTEGER, allowNull: false, diff --git a/backend/models/falukant/data/user.js b/backend/models/falukant/data/user.js index 41460d9..c0747a7 100644 --- a/backend/models/falukant/data/user.js +++ b/backend/models/falukant/data/user.js @@ -8,13 +8,6 @@ FalukantUser.init({ userId: { type: DataTypes.INTEGER, allowNull: false, - references: { - model: { - tableName: 'user', - schema: 'community' - }, - key: 'id' - }, unique: true}, money: { type: DataTypes.DECIMAL(10, 2), @@ -38,12 +31,7 @@ FalukantUser.init({ defaultValue: 1}, mainBranchRegionId: { type: DataTypes.INTEGER, - allowNull: true, - references: { - model: RegionData, - key: 'id', - schema: 'falukant_data' - } + allowNull: true }, lastNobilityAdvanceAt: { type: DataTypes.DATE, diff --git a/backend/models/falukant/data/weather.js b/backend/models/falukant/data/weather.js index c38cdcf..3494fe0 100644 --- a/backend/models/falukant/data/weather.js +++ b/backend/models/falukant/data/weather.js @@ -10,21 +10,11 @@ Weather.init( regionId: { type: DataTypes.INTEGER, primaryKey: true, - allowNull: false, - references: { - model: RegionData, - key: 'id', - schema: 'falukant_data' - } + allowNull: false }, weatherTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: WeatherType, - key: 'id', - schema: 'falukant_type' - } + allowNull: false } }, { diff --git a/backend/models/falukant/predefine/promotional_gift_character_trait.js b/backend/models/falukant/predefine/promotional_gift_character_trait.js index d15eb8d..04e996a 100644 --- a/backend/models/falukant/predefine/promotional_gift_character_trait.js +++ b/backend/models/falukant/predefine/promotional_gift_character_trait.js @@ -10,13 +10,11 @@ PromotionalGiftCharacterTrait.init( giftId: { type: DataTypes.INTEGER, field: 'gift_id', - references: { model: PromotionalGift, key: 'id' }, allowNull: false }, traitId: { type: DataTypes.INTEGER, field: 'trait_id', - references: { model: CharacterTrait, key: 'id' }, allowNull: false }, suitability: { diff --git a/backend/models/falukant/predefine/promotional_gift_mood.js b/backend/models/falukant/predefine/promotional_gift_mood.js index 3e479e9..f7f291d 100644 --- a/backend/models/falukant/predefine/promotional_gift_mood.js +++ b/backend/models/falukant/predefine/promotional_gift_mood.js @@ -10,19 +10,11 @@ PromotionalGiftMood.init( giftId: { type: DataTypes.INTEGER, field: 'gift_id', - references: { - model: PromotionalGift, - key: 'id' - }, allowNull: false }, moodId: { type: DataTypes.INTEGER, field: 'mood_id', - references: { - model: Mood, - key: 'id' - }, allowNull: false }, suitability: { diff --git a/backend/models/falukant/type/product_weather_effect.js b/backend/models/falukant/type/product_weather_effect.js index 1b019f2..057a71b 100644 --- a/backend/models/falukant/type/product_weather_effect.js +++ b/backend/models/falukant/type/product_weather_effect.js @@ -9,21 +9,11 @@ ProductWeatherEffect.init( { productId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: ProductType, - key: 'id', - schema: 'falukant_type' - } + allowNull: false }, weatherTypeId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: WeatherType, - key: 'id', - schema: 'falukant_type' - } + allowNull: false }, qualityEffect: { type: DataTypes.INTEGER, diff --git a/backend/models/falukant/type/region.js b/backend/models/falukant/type/region.js index 7757a81..d95cbc9 100644 --- a/backend/models/falukant/type/region.js +++ b/backend/models/falukant/type/region.js @@ -9,11 +9,7 @@ RegionType.init({ allowNull: false}, parentId: { type: DataTypes.INTEGER, - allowNull: true, - references: { - model: 'region', - key: 'id', - schema: 'falukant_type'} + allowNull: true } }, { sequelize, diff --git a/backend/models/forum/forum_forum_permission.js b/backend/models/forum/forum_forum_permission.js index cf35b1e..06e1071 100644 --- a/backend/models/forum/forum_forum_permission.js +++ b/backend/models/forum/forum_forum_permission.js @@ -4,19 +4,11 @@ import { DataTypes } from 'sequelize'; const ForumForumPermission = sequelize.define('forum_forum_permission', { forumId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'forum', - key: 'id' - } + allowNull: false }, permissionId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'forum_permission', - key: 'id' - } + allowNull: false } }, { tableName: 'forum_forum_permission', diff --git a/backend/models/match3/level.js b/backend/models/match3/level.js index 2f478c7..dc57655 100644 --- a/backend/models/match3/level.js +++ b/backend/models/match3/level.js @@ -9,11 +9,7 @@ const Match3Level = sequelize.define('Match3Level', { }, campaignId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'match3_campaigns', - key: 'id' - } + allowNull: false }, name: { type: DataTypes.STRING(255), diff --git a/backend/models/match3/levelTileType.js b/backend/models/match3/levelTileType.js index 55535b2..b7da674 100644 --- a/backend/models/match3/levelTileType.js +++ b/backend/models/match3/levelTileType.js @@ -10,19 +10,11 @@ const Match3LevelTileType = sequelize.define('Match3LevelTileType', { levelId: { type: DataTypes.INTEGER, allowNull: false, - references: { - model: 'match3_levels', - key: 'id' - }, comment: 'Referenz auf den Level' }, tileTypeId: { type: DataTypes.INTEGER, allowNull: false, - references: { - model: 'match3_tile_types', - key: 'id' - }, comment: 'Referenz auf den Tile-Typ' }, weight: { diff --git a/backend/models/minigames/taxiHighscore.js b/backend/models/minigames/taxiHighscore.js index 1f01a28..9c27f13 100644 --- a/backend/models/minigames/taxiHighscore.js +++ b/backend/models/minigames/taxiHighscore.js @@ -9,14 +9,7 @@ const TaxiHighscore = sequelize.define('TaxiHighscore', { }, userId: { type: DataTypes.INTEGER, - allowNull: true, // Kann null sein, falls User gelöscht wird - references: { - model: { - tableName: 'user', - schema: 'community' - }, - key: 'id' - } + allowNull: true // Kann null sein, falls User gelöscht wird }, nickname: { type: DataTypes.STRING(100), @@ -44,13 +37,6 @@ const TaxiHighscore = sequelize.define('TaxiHighscore', { mapId: { type: DataTypes.INTEGER, allowNull: true, - references: { - model: { - tableName: 'taxi_map', - schema: 'taxi' - }, - key: 'id' - }, comment: 'ID der gespielten Map' }, mapName: { diff --git a/backend/models/type/interest_translation.js b/backend/models/type/interest_translation.js index 0677209..24647c7 100644 --- a/backend/models/type/interest_translation.js +++ b/backend/models/type/interest_translation.js @@ -13,13 +13,7 @@ const interestTranslation = sequelize.define('interest_translation_type', { }, interestsId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: Interest, - key: 'id' - }, - onUpdate: 'CASCADE', - onDelete: 'CASCADE' + allowNull: false }}, { tableName: 'interest_translation', schema: 'type', diff --git a/backend/models/type/user_param.js b/backend/models/type/user_param.js index 10d33c5..8240585 100644 --- a/backend/models/type/user_param.js +++ b/backend/models/type/user_param.js @@ -21,11 +21,7 @@ const UserParamType = sequelize.define('user_param_type', { }, settingsId: { type: DataTypes.INTEGER, - allowNull: false, - references: { - model: 'settings', - key: 'id' - } + allowNull: false }, orderId: { type: DataTypes.INTEGER,