diff --git a/backend/models/chat/rights.js b/backend/models/chat/rights.js index a171e11..cf2a42d 100644 --- a/backend/models/chat/rights.js +++ b/backend/models/chat/rights.js @@ -17,6 +17,7 @@ const ChatRight = sequelize.define('ChatRight', { tableName: 'rights', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default ChatRight; diff --git a/backend/models/chat/room.js b/backend/models/chat/room.js index d02eec6..9a68239 100644 --- a/backend/models/chat/room.js +++ b/backend/models/chat/room.js @@ -11,20 +11,20 @@ const Room = sequelize.define('Room', { type: DataTypes.TEXT, allowNull: false, }, - ownerId: { + owner_id: { type: DataTypes.INTEGER, allowNull: true, // kann null sein, wenn system-owned }, - roomTypeId: { + room_type_id: { type: DataTypes.INTEGER, allowNull: true, }, - isPublic: { + is_public: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, }, - genderRestrictionId: { + gender_restriction_id: { type: DataTypes.INTEGER, allowNull: true, }, @@ -32,24 +32,24 @@ const Room = sequelize.define('Room', { type: DataTypes.STRING, allowNull: true, }, - minAge: { + min_age: { type: DataTypes.INTEGER, allowNull: true, }, - maxAge: { + max_age: { type: DataTypes.INTEGER, allowNull: true, }, - passwordHash: { + password_hash: { type: DataTypes.TEXT, allowNull: true, }, - friendsOfOwnerOnly: { + friends_of_owner_only: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false, }, - requiredUserRightId: { + required_user_right_id: { type: DataTypes.INTEGER, allowNull: true, }, @@ -62,7 +62,8 @@ const Room = sequelize.define('Room', { { name: 'idx_chat_room_owner', fields: ['owner_id'], - }, + , + freezeTableName: true}, ], }); diff --git a/backend/models/chat/room_type.js b/backend/models/chat/room_type.js index 3dfd64c..56924d6 100644 --- a/backend/models/chat/room_type.js +++ b/backend/models/chat/room_type.js @@ -17,6 +17,7 @@ const RoomType = sequelize.define('RoomType', { tableName: 'room_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default RoomType; diff --git a/backend/models/chat/user.js b/backend/models/chat/user.js index 6d73fe2..2bd29ef 100644 --- a/backend/models/chat/user.js +++ b/backend/models/chat/user.js @@ -36,6 +36,7 @@ const ChatUser = sequelize.define('ChatUser', { tableName: 'user', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default ChatUser; diff --git a/backend/models/chat/user_rights.js b/backend/models/chat/user_rights.js index e0b807d..c9c22ee 100644 --- a/backend/models/chat/user_rights.js +++ b/backend/models/chat/user_rights.js @@ -4,13 +4,13 @@ import ChatUser from './user.js'; import ChatRight from './rights.js'; const ChatUserRight = sequelize.define('ChatUserRight', { - chatUserId: { + chat_user_id: { type: DataTypes.INTEGER, allowNull: false, primaryKey: true, references: null, // Assoziation wird separat gesetzt }, - chatRightId: { + chat_right_id: { type: DataTypes.INTEGER, allowNull: false, primaryKey: true, @@ -21,6 +21,7 @@ const ChatUserRight = sequelize.define('ChatUserRight', { tableName: 'user_rights', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default ChatUserRight; diff --git a/backend/models/community/blog.js b/backend/models/community/blog.js index 4cc1050..67c9547 100644 --- a/backend/models/community/blog.js +++ b/backend/models/community/blog.js @@ -4,7 +4,7 @@ import { sequelize } from '../../utils/sequelize.js'; class Blog extends Model {} Blog.init({ - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, field: 'user_id' @@ -23,12 +23,12 @@ Blog.init({ allowNull: false, defaultValue: 'public', }, - ageMin: { + age_min: { type: DataTypes.INTEGER, allowNull: true, field: 'age_min' }, - ageMax: { + age_max: { type: DataTypes.INTEGER, allowNull: true, field: 'age_max' @@ -38,12 +38,12 @@ Blog.init({ type: DataTypes.STRING(10), allowNull: true, }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, field: 'created_at' }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, field: 'updated_at' @@ -55,6 +55,7 @@ Blog.init({ schema: 'community', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Blog; diff --git a/backend/models/community/blog_post.js b/backend/models/community/blog_post.js index 4460f1d..8240f43 100644 --- a/backend/models/community/blog_post.js +++ b/backend/models/community/blog_post.js @@ -4,12 +4,12 @@ import { sequelize } from '../../utils/sequelize.js'; class BlogPost extends Model {} BlogPost.init({ - blogId: { + blog_id: { type: DataTypes.INTEGER, allowNull: false, field: 'blog_id' }, - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, field: 'user_id' @@ -22,12 +22,12 @@ BlogPost.init({ type: DataTypes.TEXT, allowNull: false, }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, field: 'created_at' }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, field: 'updated_at' @@ -39,6 +39,7 @@ BlogPost.init({ schema: 'community', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default BlogPost; diff --git a/backend/models/community/diary.js b/backend/models/community/diary.js index 5773a73..6fb150b 100644 --- a/backend/models/community/diary.js +++ b/backend/models/community/diary.js @@ -4,7 +4,7 @@ import { sequelize } from '../../utils/sequelize.js'; class Diary extends Model { } Diary.init({ - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -12,11 +12,11 @@ Diary.init({ type: DataTypes.TEXT, allowNull: false, }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW, } @@ -27,6 +27,7 @@ Diary.init({ schema: 'community', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Diary; diff --git a/backend/models/community/diary_history.js b/backend/models/community/diary_history.js index 4ce8bcf..f6bec3a 100644 --- a/backend/models/community/diary_history.js +++ b/backend/models/community/diary_history.js @@ -4,23 +4,23 @@ import { sequelize } from '../../utils/sequelize.js'; class DiaryHistory extends Model { } DiaryHistory.init({ - diaryId: { + diary_id: { type: DataTypes.INTEGER, allowNull: false, }, - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, }, - oldText: { + old_text: { type: DataTypes.TEXT, allowNull: false, }, - oldCreatedAt: { + old_created_at: { type: DataTypes.DATE, allowNull: false, }, - oldUpdatedAt: { + old_updated_at: { type: DataTypes.DATE, allowNull: false, }, @@ -31,6 +31,7 @@ DiaryHistory.init({ schema: 'community', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default DiaryHistory; diff --git a/backend/models/community/folder.js b/backend/models/community/folder.js index 202de60..f990d97 100644 --- a/backend/models/community/folder.js +++ b/backend/models/community/folder.js @@ -7,7 +7,7 @@ const Folder = sequelize.define('folder', { type: DataTypes.STRING, allowNull: false, }, - parentId: { + parent_id: { type: DataTypes.INTEGER, allowNull: true, references: { @@ -15,7 +15,7 @@ const Folder = sequelize.define('folder', { key: 'id', }, }, - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -28,6 +28,7 @@ const Folder = sequelize.define('folder', { schema: 'community', underscored: true, timestamps: true, -}); +, + freezeTableName: true}); export default Folder; diff --git a/backend/models/community/folder_image_visibility.js b/backend/models/community/folder_image_visibility.js index 0ade275..2505d12 100644 --- a/backend/models/community/folder_image_visibility.js +++ b/backend/models/community/folder_image_visibility.js @@ -8,7 +8,7 @@ const FolderImageVisibility = sequelize.define('folder_image_visibility', { primaryKey: true, allowNull: false }, - folderId: { + folder_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -16,7 +16,7 @@ const FolderImageVisibility = sequelize.define('folder_image_visibility', { key: 'id' } }, - visibilityTypeId: { + visibility_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -32,6 +32,7 @@ const FolderImageVisibility = sequelize.define('folder_image_visibility', { schema: 'community', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default FolderImageVisibility; diff --git a/backend/models/community/folder_visibility_user.js b/backend/models/community/folder_visibility_user.js index 82d0561..a2593df 100644 --- a/backend/models/community/folder_visibility_user.js +++ b/backend/models/community/folder_visibility_user.js @@ -8,7 +8,7 @@ const FolderVisibilityUser = sequelize.define('folder_visibility_user', { primaryKey: true, allowNull: false }, - folderId: { + folder_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -16,7 +16,7 @@ const FolderVisibilityUser = sequelize.define('folder_visibility_user', { key: 'id' } }, - visibilityUserId: { + visibility_user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -29,6 +29,7 @@ const FolderVisibilityUser = sequelize.define('folder_visibility_user', { schema: 'community', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default FolderVisibilityUser; diff --git a/backend/models/community/friendship.js b/backend/models/community/friendship.js index 50e50fa..cbce643 100644 --- a/backend/models/community/friendship.js +++ b/backend/models/community/friendship.js @@ -32,6 +32,7 @@ const Friendship = sequelize.define('friendship', { schema: 'community', underscored: true, timestamps: true, -}); +, + freezeTableName: true}); export default Friendship; diff --git a/backend/models/community/guestbook.js b/backend/models/community/guestbook.js index 250fc42..4612d19 100644 --- a/backend/models/community/guestbook.js +++ b/backend/models/community/guestbook.js @@ -9,7 +9,7 @@ const GuestbookEntry = sequelize.define('guestbook_entry', { primaryKey: true, allowNull: false, }, - recipientId: { + recipient_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -17,7 +17,7 @@ const GuestbookEntry = sequelize.define('guestbook_entry', { key: 'id' } }, - senderId: { + sender_id: { type: DataTypes.INTEGER, allowNull: true, references: { @@ -25,15 +25,15 @@ const GuestbookEntry = sequelize.define('guestbook_entry', { key: 'id' } }, - senderUsername: { + sender_username: { type: DataTypes.STRING, allowNull: true, }, - contentHtml: { + content_html: { type: DataTypes.TEXT, allowNull: false, }, - imageUrl: { + image_url: { type: DataTypes.STRING, allowNull: true, }, @@ -42,6 +42,7 @@ const GuestbookEntry = sequelize.define('guestbook_entry', { schema: 'community', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default GuestbookEntry; diff --git a/backend/models/community/image.js b/backend/models/community/image.js index 2a768bf..f41a662 100644 --- a/backend/models/community/image.js +++ b/backend/models/community/image.js @@ -11,7 +11,7 @@ const Image = sequelize.define('image', { type: DataTypes.TEXT, allowNull: true, }, - originalFileName: { + original_file_name: { type: DataTypes.STRING, allowNull: false, }, @@ -20,7 +20,7 @@ const Image = sequelize.define('image', { allowNull: false, unique: true, }, - folderId: { + folder_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -28,7 +28,7 @@ const Image = sequelize.define('image', { key: 'id', }, }, - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -41,6 +41,7 @@ const Image = sequelize.define('image', { schema: 'community', underscored: true, timestamps: true, -}); +, + freezeTableName: true}); export default Image; diff --git a/backend/models/community/image_image_visibility.js b/backend/models/community/image_image_visibility.js index ac22561..2144bf4 100644 --- a/backend/models/community/image_image_visibility.js +++ b/backend/models/community/image_image_visibility.js @@ -8,7 +8,7 @@ const ImageImageVisibility = sequelize.define('image_image_visibility', { primaryKey: true, allowNull: false }, - imageId: { + image_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -16,7 +16,7 @@ const ImageImageVisibility = sequelize.define('image_image_visibility', { key: 'id' } }, - visibilityTypeId: { + visibility_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -32,6 +32,7 @@ const ImageImageVisibility = sequelize.define('image_image_visibility', { schema: 'community', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default ImageImageVisibility; diff --git a/backend/models/community/image_visibility_user.js b/backend/models/community/image_visibility_user.js index 58a2564..f2a2a08 100644 --- a/backend/models/community/image_visibility_user.js +++ b/backend/models/community/image_visibility_user.js @@ -21,6 +21,7 @@ const ImageVisibilityUser = sequelize.define('image_visibility_user', { timestamps: false, underscored: true, schema: 'community' -}); +, + freezeTableName: true}); export default ImageVisibilityUser; diff --git a/backend/models/community/interest.js b/backend/models/community/interest.js index 5173b26..9a52c75 100644 --- a/backend/models/community/interest.js +++ b/backend/models/community/interest.js @@ -6,6 +6,7 @@ const interest = sequelize.define('interest_type', { tableName: 'interest', schema: 'community', underscored: true -}); +, + freezeTableName: true}); export default interest; \ No newline at end of file diff --git a/backend/models/community/user.js b/backend/models/community/user.js index eb48b9d..2583860 100644 --- a/backend/models/community/user.js +++ b/backend/models/community/user.js @@ -36,7 +36,7 @@ const User = sequelize.define('user', { type: DataTypes.STRING, allowNull: false, }, - registrationDate: { + registration_date: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW @@ -45,11 +45,11 @@ const User = sequelize.define('user', { type: DataTypes.BOOLEAN, defaultValue: false }, - resetToken: { + reset_token: { type: DataTypes.UUID, allowNull: true }, - hashedId: { + hashed_id: { type: DataTypes.STRING, allowNull: true }, @@ -57,7 +57,7 @@ const User = sequelize.define('user', { type: DataTypes.BOOLEAN, defaultValue: true }, - authCode: { + auth_code: { type: DataTypes.STRING, allowNull: true } @@ -70,7 +70,8 @@ const User = sequelize.define('user', { const hashedId = crypto.createHash('sha256').update(user.id.toString()).digest('hex'); user.hashedId = hashedId; await user.save(); - } + , + freezeTableName: true} } }); diff --git a/backend/models/community/user_param.js b/backend/models/community/user_param.js index 72e0542..54989b1 100644 --- a/backend/models/community/user_param.js +++ b/backend/models/community/user_param.js @@ -5,7 +5,7 @@ import UserParamType from '../type/user_param.js'; import { encrypt, decrypt } from '../../utils/encryption.js'; const UserParam = sequelize.define('user_param', { - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -13,7 +13,7 @@ const UserParam = sequelize.define('user_param', { key: 'id', }, }, - paramTypeId: { + param_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -55,7 +55,8 @@ const UserParam = sequelize.define('user_param', { { unique: true, fields: ['user_id', 'param_type_id'], - }, + , + freezeTableName: true}, ], }); diff --git a/backend/models/community/user_param_visibility.js b/backend/models/community/user_param_visibility.js index 22dc115..da8a655 100644 --- a/backend/models/community/user_param_visibility.js +++ b/backend/models/community/user_param_visibility.js @@ -21,6 +21,7 @@ const UserParamVisibility = sequelize.define('user_param_visibility', { timestamps: false, underscored: true, schema: 'community' -}); +, + freezeTableName: true}); export default UserParamVisibility; diff --git a/backend/models/community/user_right.js b/backend/models/community/user_right.js index bf35225..d7a9fe6 100644 --- a/backend/models/community/user_right.js +++ b/backend/models/community/user_right.js @@ -4,7 +4,7 @@ import User from './user.js'; import UserRightType from '../type/user_right.js'; const UserRight = sequelize.define('user_right', { - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -12,7 +12,7 @@ const UserRight = sequelize.define('user_right', { key: 'id' } }, - rightTypeId: { + right_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -24,6 +24,7 @@ const UserRight = sequelize.define('user_right', { tableName: 'user_right', schema: 'community', underscored: true, -}); +, + freezeTableName: true}); export default UserRight; diff --git a/backend/models/falukant/data/branch.js b/backend/models/falukant/data/branch.js index 83aa2c2..2a731e7 100644 --- a/backend/models/falukant/data/branch.js +++ b/backend/models/falukant/data/branch.js @@ -4,15 +4,15 @@ import { sequelize } from '../../../utils/sequelize.js'; class Branch extends Model { } Branch.init({ - branchTypeId: { + branch_type_id: { type: DataTypes.INTEGER, allowNull: false, }, - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - falukantUserId: { + falukant_user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -27,7 +27,8 @@ Branch.init({ { unique: true, fields: ['region_id', 'falukant_user_id'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/data/buyable_house.js b/backend/models/falukant/data/buyable_house.js index 2797080..ed71f58 100644 --- a/backend/models/falukant/data/buyable_house.js +++ b/backend/models/falukant/data/buyable_house.js @@ -4,27 +4,27 @@ import { sequelize } from '../../../utils/sequelize.js'; class BuyableHouse extends Model { } BuyableHouse.init({ - roofCondition: { + roof_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - floorCondition: { + floor_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - wallCondition: { + wall_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - windowCondition: { + window_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - houseTypeId: { + house_type_id: { type: DataTypes.INTEGER, allowNull: false, } @@ -35,6 +35,7 @@ BuyableHouse.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default BuyableHouse; diff --git a/backend/models/falukant/data/buyable_stock.js b/backend/models/falukant/data/buyable_stock.js index d2473f3..64bfde7 100644 --- a/backend/models/falukant/data/buyable_stock.js +++ b/backend/models/falukant/data/buyable_stock.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class BuyableStock extends Model { } BuyableStock.init({ - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - stockTypeId: { + stock_type_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -23,6 +23,7 @@ BuyableStock.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default BuyableStock; diff --git a/backend/models/falukant/data/candidate.js b/backend/models/falukant/data/candidate.js index 6a564e7..7ade6db 100644 --- a/backend/models/falukant/data/candidate.js +++ b/backend/models/falukant/data/candidate.js @@ -25,6 +25,7 @@ Candidate.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Candidate; diff --git a/backend/models/falukant/data/character.js b/backend/models/falukant/data/character.js index 7a48e55..ed513c9 100644 --- a/backend/models/falukant/data/character.js +++ b/backend/models/falukant/data/character.js @@ -5,19 +5,19 @@ class FalukantCharacter extends Model {} FalukantCharacter.init( { - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: true, }, - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - firstName: { + first_name: { type: DataTypes.INTEGER, allowNull: false, }, - lastName: { + last_name: { type: DataTypes.INTEGER, allowNull: false, }, @@ -34,11 +34,11 @@ FalukantCharacter.init( allowNull: false, defaultValue: 100, }, - titleOfNobility: { + title_of_nobility: { type: DataTypes.INTEGER, allowNull: false, }, - moodId: { + mood_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 1, @@ -51,7 +51,8 @@ FalukantCharacter.init( schema: 'falukant_data', timestamps: true, underscored: true, - } + , + freezeTableName: true} ); export default FalukantCharacter; diff --git a/backend/models/falukant/data/child_relation.js b/backend/models/falukant/data/child_relation.js index ddbf5a9..8e21417 100644 --- a/backend/models/falukant/data/child_relation.js +++ b/backend/models/falukant/data/child_relation.js @@ -5,32 +5,32 @@ class ChildRelation extends Model {} ChildRelation.init( { - fatherCharacterId: { + father_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - motherCharacterId: { + mother_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - childCharacterId: { + child_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - fatherName: { + father_name: { type: DataTypes.STRING, allowNull: false, }, - motherName: { + mother_name: { type: DataTypes.STRING, allowNull: false, }, - nameSet: { + name_set: { type: DataTypes.BOOLEAN, allowNull: false, default: false, }, - isHeir: { + is_heir: { type: DataTypes.BOOLEAN, allowNull: true, default: false, diff --git a/backend/models/falukant/data/credit.js b/backend/models/falukant/data/credit.js index eef372f..442570a 100644 --- a/backend/models/falukant/data/credit.js +++ b/backend/models/falukant/data/credit.js @@ -11,17 +11,17 @@ Credit.init({ allowNull: false, }, // noch offener Kreditbetrag - remainingAmount: { + remaining_amount: { type: DataTypes.DECIMAL(14,2), allowNull: false, }, // Zinssatz als Prozentsatz (z.B. 3.5 für 3.5%) - interestRate: { + interest_rate: { type: DataTypes.DECIMAL(5,2), allowNull: false, }, // Verknüpfung auf FalukantUser - falukantUserId: { + falukant_user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -32,6 +32,7 @@ Credit.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Credit; diff --git a/backend/models/falukant/data/debtors_prism.js b/backend/models/falukant/data/debtors_prism.js index 0e08c57..2c41693 100644 --- a/backend/models/falukant/data/debtors_prism.js +++ b/backend/models/falukant/data/debtors_prism.js @@ -5,7 +5,7 @@ class DebtorsPrism extends Model {} DebtorsPrism.init({ // Verknüpfung auf FalukantCharacter - characterId: { + character_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -16,6 +16,7 @@ DebtorsPrism.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default DebtorsPrism; diff --git a/backend/models/falukant/data/director.js b/backend/models/falukant/data/director.js index 8ae2e99..51cb91e 100644 --- a/backend/models/falukant/data/director.js +++ b/backend/models/falukant/data/director.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class Director extends Model { } Director.init({ - directorCharacterId: { + director_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - employerUserId: { + employer_user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -21,22 +21,22 @@ Director.init({ allowNull: false, defaultValue: 100, }, - mayProduce: { + may_produce: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, }, - maySell: { + may_sell: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, }, - mayStartTransport: { + may_start_transport: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, }, - lastSalaryPayout: { + last_salary_payout: { type: DataTypes.DATE, allowNull: false, defaultValue: new Date(0) @@ -48,6 +48,7 @@ Director.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default Director; diff --git a/backend/models/falukant/data/director_proposal.js b/backend/models/falukant/data/director_proposal.js index e58c0f7..e70e769 100644 --- a/backend/models/falukant/data/director_proposal.js +++ b/backend/models/falukant/data/director_proposal.js @@ -4,15 +4,15 @@ import { sequelize } from '../../../utils/sequelize.js'; class DirectorProposal extends Model { } DirectorProposal.init({ - directorCharacterId: { + director_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - employerUserId: { + employer_user_id: { type: DataTypes.INTEGER, allowNull: false, }, - proposedIncome: { + proposed_income: { type: DataTypes.INTEGER, allowNull: false, }, @@ -23,6 +23,7 @@ DirectorProposal.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default DirectorProposal; diff --git a/backend/models/falukant/data/election.js b/backend/models/falukant/data/election.js index 785f911..7def4c3 100644 --- a/backend/models/falukant/data/election.js +++ b/backend/models/falukant/data/election.js @@ -10,11 +10,11 @@ Election.init({ primaryKey: true, autoIncrement: true, }, - officeTypeId: { + office_type_id: { type: DataTypes.INTEGER, allowNull: true, }, - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false }, @@ -22,7 +22,7 @@ Election.init({ type: DataTypes.DATE, allowNull: false, }, - postsToFill: { + posts_to_fill: { type: DataTypes.INTEGER, allowNull: false, }, @@ -33,6 +33,7 @@ Election.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Election; diff --git a/backend/models/falukant/data/election_result.js b/backend/models/falukant/data/election_result.js index 5d1e95f..e624c8c 100644 --- a/backend/models/falukant/data/election_result.js +++ b/backend/models/falukant/data/election_result.js @@ -29,6 +29,7 @@ ElectionResult.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default ElectionResult; diff --git a/backend/models/falukant/data/falukant_character_trait.js b/backend/models/falukant/data/falukant_character_trait.js index fa562a6..f6444f2 100644 --- a/backend/models/falukant/data/falukant_character_trait.js +++ b/backend/models/falukant/data/falukant_character_trait.js @@ -21,7 +21,8 @@ FalukantCharacterTrait.init( schema: 'falukant_data', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default FalukantCharacterTrait; diff --git a/backend/models/falukant/data/inventory.js b/backend/models/falukant/data/inventory.js index 08cf43d..89d251f 100644 --- a/backend/models/falukant/data/inventory.js +++ b/backend/models/falukant/data/inventory.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class Inventory extends Model { } Inventory.init({ - stockId: { + stock_id: { type: DataTypes.INTEGER, allowNull: false, }, - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -20,7 +20,7 @@ Inventory.init({ type: DataTypes.INTEGER, allowNull: false, }, - producedAt: { + produced_at: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW, @@ -32,6 +32,7 @@ Inventory.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default Inventory; diff --git a/backend/models/falukant/data/learning.js b/backend/models/falukant/data/learning.js index 3c73dcb..4abff9c 100644 --- a/backend/models/falukant/data/learning.js +++ b/backend/models/falukant/data/learning.js @@ -5,31 +5,31 @@ class Learning extends Model {} Learning.init( { - learningRecipientId: { + learning_recipient_id: { type: DataTypes.INTEGER, allowNull: false, }, - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: true, defaultValue: null, }, - learnAllProducts: { + learn_all_products: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false, }, - associatedFalukantUserId: { + associated_falukant_user_id: { type: DataTypes.INTEGER, allowNull: true, defaultValue: null, }, - associatedLearningCharacterId: { + associated_learning_character_id: { type: DataTypes.INTEGER, allowNull: true, defaultValue: null, }, - learningIsExecuted: { + learning_is_executed: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false, @@ -42,7 +42,8 @@ Learning.init( schema: 'falukant_data', timestamps: true, underscored: true, - } + , + freezeTableName: true} ); export default Learning; diff --git a/backend/models/falukant/data/marriage_proposal.js b/backend/models/falukant/data/marriage_proposal.js index fc645d4..fd217e7 100644 --- a/backend/models/falukant/data/marriage_proposal.js +++ b/backend/models/falukant/data/marriage_proposal.js @@ -5,12 +5,12 @@ class MarriageProposal extends Model {} MarriageProposal.init( { - requesterCharacterId: { + requester_character_id: { type: DataTypes.INTEGER, allowNull: false, onDelete: 'CASCADE', }, - proposedCharacterId: { + proposed_character_id: { type: DataTypes.INTEGER, allowNull: false, onDelete: 'CASCADE', @@ -28,7 +28,8 @@ MarriageProposal.init( schema: 'falukant_data', timestamps: true, underscored: true, - } + , + freezeTableName: true} ); export default MarriageProposal; diff --git a/backend/models/falukant/data/occupied_political_office.js b/backend/models/falukant/data/occupied_political_office.js index eed3586..7d5f541 100644 --- a/backend/models/falukant/data/occupied_political_office.js +++ b/backend/models/falukant/data/occupied_political_office.js @@ -25,6 +25,7 @@ OccupiedPoliticalOffice.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default OccupiedPoliticalOffice; diff --git a/backend/models/falukant/data/party.js b/backend/models/falukant/data/party.js index ef202f8..38197b4 100644 --- a/backend/models/falukant/data/party.js +++ b/backend/models/falukant/data/party.js @@ -4,27 +4,27 @@ import { sequelize } from '../../../utils/sequelize.js'; class Party extends Model {} Party.init({ - partyTypeId: { + party_type_id: { type: DataTypes.INTEGER, allowNull: false, field: 'party_type_id' }, - falukantUserId: { + falukant_user_id: { type: DataTypes.INTEGER, allowNull: false, field: 'falukant_user_id' }, - musicTypeId: { + music_type_id: { type: DataTypes.INTEGER, allowNull: false, field: 'music_type' }, - banquetteTypeId: { + banquette_type_id: { type: DataTypes.INTEGER, allowNull: false, field: 'banquette_type' }, - servantRatio: { + servant_ratio: { type: DataTypes.INTEGER, allowNull: false, field: 'servant_ratio' @@ -41,6 +41,7 @@ Party.init({ schema: 'falukant_data', timestamps: true, underscored: true, - }); + , + freezeTableName: true}); export default Party; \ No newline at end of file diff --git a/backend/models/falukant/data/partyInvitedNobility.js b/backend/models/falukant/data/partyInvitedNobility.js index ebc4124..a6e9714 100644 --- a/backend/models/falukant/data/partyInvitedNobility.js +++ b/backend/models/falukant/data/partyInvitedNobility.js @@ -4,12 +4,12 @@ import { sequelize } from '../../../utils/sequelize.js' class PartyInvitedNobility extends Model {} PartyInvitedNobility.init({ - partyId: { + party_id: { type: DataTypes.INTEGER, allowNull: false, field: 'party_id' }, - titleOfNobilityId: { + title_of_nobility_id: { type: DataTypes.INTEGER, allowNull: false, field: 'title_of_nobility_id' @@ -21,6 +21,7 @@ PartyInvitedNobility.init({ schema: 'falukant_data', timestamps: false, underscored: true -}) +, + freezeTableName: true}) export default PartyInvitedNobility diff --git a/backend/models/falukant/data/political_office.js b/backend/models/falukant/data/political_office.js index f916755..b1e9bc8 100644 --- a/backend/models/falukant/data/political_office.js +++ b/backend/models/falukant/data/political_office.js @@ -10,15 +10,15 @@ PoliticalOffice.init({ primaryKey: true, autoIncrement: true, }, - officeTypeId: { + office_type_id: { type: DataTypes.INTEGER, allowNull: false, }, - characterId: { + character_id: { type: DataTypes.INTEGER, allowNull: false, }, - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -29,6 +29,7 @@ PoliticalOffice.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default PoliticalOffice; diff --git a/backend/models/falukant/data/product_knowledge.js b/backend/models/falukant/data/product_knowledge.js index b40066f..46febaa 100644 --- a/backend/models/falukant/data/product_knowledge.js +++ b/backend/models/falukant/data/product_knowledge.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class Knowledge extends Model { } Knowledge.init({ - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, - characterId: { + character_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -27,7 +27,8 @@ Knowledge.init({ hooks: { beforeCreate: (knowledge) => { knowledge.knowledge = Math.floor(Math.random() * 61) + 20; - } + , + freezeTableName: true} } }); diff --git a/backend/models/falukant/data/production.js b/backend/models/falukant/data/production.js index e097e50..263390a 100644 --- a/backend/models/falukant/data/production.js +++ b/backend/models/falukant/data/production.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class Production extends Model { } Production.init({ - branchId: { + branch_id: { type: DataTypes.INTEGER, allowNull: false, }, - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -16,7 +16,7 @@ Production.init({ type: DataTypes.INTEGER, allowNull: false, }, - startTimestamp: { + start_timestamp: { type: DataTypes.DATE, allowNull: false, defaultValue: sequelize.literal('CURRENT_TIMESTAMP'), @@ -28,6 +28,7 @@ Production.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default Production; diff --git a/backend/models/falukant/data/region.js b/backend/models/falukant/data/region.js index 5da6c84..781036b 100644 --- a/backend/models/falukant/data/region.js +++ b/backend/models/falukant/data/region.js @@ -9,7 +9,7 @@ RegionData.init({ type: DataTypes.STRING, allowNull: false, }, - regionTypeId: { + region_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -18,7 +18,7 @@ RegionData.init({ schema: 'falukant_type' } }, - parentId: { + parent_id: { type: DataTypes.INTEGER, allowNull: true, references: { @@ -39,6 +39,7 @@ RegionData.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default RegionData; diff --git a/backend/models/falukant/data/relationship.js b/backend/models/falukant/data/relationship.js index f874f7d..786a7d4 100644 --- a/backend/models/falukant/data/relationship.js +++ b/backend/models/falukant/data/relationship.js @@ -24,7 +24,7 @@ Relationship.init( }, onDelete: 'CASCADE', }, - relationshipTypeId: { + relationship_type_id: { type: DataTypes.INTEGER, allowNull: false, onDelete: 'CASCADE', @@ -37,7 +37,7 @@ Relationship.init( type: DataTypes.STRING, allowNull: true, }, - nextStepProgress: { + next_step_progress: { type: DataTypes.INTEGER, allowNull: true, defaultValue: 0, @@ -50,7 +50,8 @@ Relationship.init( schema: 'falukant_data', timestamps: true, underscored: true, - } + , + freezeTableName: true} ); export default Relationship; diff --git a/backend/models/falukant/data/stock.js b/backend/models/falukant/data/stock.js index cc3f3d8..ac3c122 100644 --- a/backend/models/falukant/data/stock.js +++ b/backend/models/falukant/data/stock.js @@ -4,12 +4,12 @@ import { sequelize } from '../../../utils/sequelize.js'; class FalukantStock extends Model { } FalukantStock.init({ - branchId: { + branch_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 }, - stockTypeId: { + stock_type_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -24,6 +24,7 @@ FalukantStock.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default FalukantStock; diff --git a/backend/models/falukant/data/town_product_worth.js b/backend/models/falukant/data/town_product_worth.js index 8ebf547..b062027 100644 --- a/backend/models/falukant/data/town_product_worth.js +++ b/backend/models/falukant/data/town_product_worth.js @@ -4,15 +4,15 @@ import { sequelize } from '../../../utils/sequelize.js'; class TownProductWorth extends Model { } TownProductWorth.init({ - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - worthPercent: { + worth_percent: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0, @@ -27,7 +27,8 @@ TownProductWorth.init({ hooks: { beforeCreate: (worthPercent) => { worthPercent.worthPercent = Math.floor(Math.random() * 20) + 40; - } + , + freezeTableName: true} } }); diff --git a/backend/models/falukant/data/underground.js b/backend/models/falukant/data/underground.js index 7d37dca..38cc25b 100644 --- a/backend/models/falukant/data/underground.js +++ b/backend/models/falukant/data/underground.js @@ -4,15 +4,15 @@ import { sequelize } from '../../../utils/sequelize.js'; class Underground extends Model { } Underground.init({ - undergroundTypeId: { + underground_type_id: { type: DataTypes.STRING, allowNull: false, }, - performerId: { + performer_id: { type: DataTypes.INTEGER, allowNull: false, }, - victimId: { + victim_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -31,6 +31,7 @@ Underground.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Underground; diff --git a/backend/models/falukant/data/user.js b/backend/models/falukant/data/user.js index e4f3898..0afde73 100644 --- a/backend/models/falukant/data/user.js +++ b/backend/models/falukant/data/user.js @@ -5,7 +5,7 @@ import RegionData from './region.js'; class FalukantUser extends Model { } FalukantUser.init({ - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -22,17 +22,17 @@ FalukantUser.init({ allowNull: false, defaultValue: 0.00, }, - creditAmount: { + credit_amount: { type: DataTypes.DECIMAL(10, 2), allowNull: false, defaultValue: 0.00, }, - todayCreditTaken: { + today_credit_taken: { type: DataTypes.DECIMAL(10, 2), allowNull: false, defaultValue: 0.00, }, - creditInterestRate: { + credit_interest_rate: { type: DataTypes.DECIMAL(5, 2), allowNull: false, defaultValue: 0.00, @@ -42,7 +42,7 @@ FalukantUser.init({ allowNull: false, defaultValue: 1, }, - mainBranchRegionId: { + main_branch_region_id: { type: DataTypes.INTEGER, allowNull: true, references: { @@ -58,6 +58,7 @@ FalukantUser.init({ schema: 'falukant_data', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default FalukantUser; diff --git a/backend/models/falukant/data/user_house.js b/backend/models/falukant/data/user_house.js index 2004b85..6053560 100644 --- a/backend/models/falukant/data/user_house.js +++ b/backend/models/falukant/data/user_house.js @@ -4,32 +4,32 @@ import { sequelize } from '../../../utils/sequelize.js'; class UserHouse extends Model { } UserHouse.init({ - roofCondition: { + roof_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - floorCondition: { + floor_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - wallCondition: { + wall_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - windowCondition: { + window_condition: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 100 }, - houseTypeId: { + house_type_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 1 }, - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 1 @@ -41,6 +41,7 @@ UserHouse.init({ schema: 'falukant_data', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default UserHouse; diff --git a/backend/models/falukant/data/vote.js b/backend/models/falukant/data/vote.js index 993a37b..2da1868 100644 --- a/backend/models/falukant/data/vote.js +++ b/backend/models/falukant/data/vote.js @@ -11,11 +11,11 @@ Vote.init( primaryKey: true, autoIncrement: true, }, - electionId: { + election_id: { type: DataTypes.INTEGER, allowNull: false, }, - candidateId: { + candidate_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -24,7 +24,7 @@ Vote.init( allowNull: false, defaultValue: DataTypes.NOW, }, - falukantUserId: { + falukant_user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -40,7 +40,8 @@ Vote.init( { unique: true, fields: ['election_id', 'candidate_id'], - }, + , + freezeTableName: true}, ], } ); diff --git a/backend/models/falukant/log/dayproduction.js b/backend/models/falukant/log/dayproduction.js index 0adc013..ef8f777 100644 --- a/backend/models/falukant/log/dayproduction.js +++ b/backend/models/falukant/log/dayproduction.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class DayProduction extends Model { } DayProduction.init({ - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -16,16 +16,16 @@ DayProduction.init({ type: DataTypes.INTEGER, allowNull: false, }, - producerId: { + producer_id: { type: DataTypes.INTEGER, allowNull: false, }, - productionTimestamp: { + production_timestamp: { type: DataTypes.DATE, allowNull: false, defaultValue: sequelize.literal('CURRENT_TIMESTAMP'), }, - productionDate: { + production_date: { type: DataTypes.DATEONLY, allowNull: false, defaultValue: sequelize.literal('CURRENT_DATE'), @@ -41,7 +41,8 @@ DayProduction.init({ { unique: true, fields: ['producer_id', 'product_id', 'region_id', 'production_date'] - } + , + freezeTableName: true} ] }); diff --git a/backend/models/falukant/log/daysell.js b/backend/models/falukant/log/daysell.js index 9102809..89e4a9d 100644 --- a/backend/models/falukant/log/daysell.js +++ b/backend/models/falukant/log/daysell.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class DaySell extends Model { } DaySell.init({ - regionId: { + region_id: { type: DataTypes.INTEGER, allowNull: false, }, - productId: { + product_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -16,11 +16,11 @@ DaySell.init({ type: DataTypes.INTEGER, allowNull: false, }, - sellerId: { + seller_id: { type: DataTypes.INTEGER, allowNull: false, }, - sellTimestamp: { + sell_timestamp: { type: DataTypes.DATE, allowNull: false, defaultValue: sequelize.literal('CURRENT_TIMESTAMP'), @@ -36,7 +36,8 @@ DaySell.init({ { unique: true, fields: ['seller_id', 'product_id', 'region_id'] - } + , + freezeTableName: true} ] }); diff --git a/backend/models/falukant/log/election_history.js b/backend/models/falukant/log/election_history.js index 4e8c71e..97fa84a 100644 --- a/backend/models/falukant/log/election_history.js +++ b/backend/models/falukant/log/election_history.js @@ -4,19 +4,19 @@ import { sequelize } from '../../../utils/sequelize.js'; class ElectionHistory extends Model { } ElectionHistory.init({ - electionId: { + election_id: { type: DataTypes.INTEGER, allowNull: false, }, - politicalOfficeTypeId: { + political_office_type_id: { type: DataTypes.INTEGER, allowNull: false, }, - electionDate: { + election_date: { type: DataTypes.DATE, allowNull: false, }, - electionResult: { + election_result: { type: DataTypes.JSON, allowNull: false, } @@ -27,6 +27,7 @@ ElectionHistory.init({ schema: 'falukant_log', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default ElectionHistory; diff --git a/backend/models/falukant/log/health_activity.js b/backend/models/falukant/log/health_activity.js index bd70124..859d833 100644 --- a/backend/models/falukant/log/health_activity.js +++ b/backend/models/falukant/log/health_activity.js @@ -9,11 +9,11 @@ HealthActivity.init({ primaryKey: true, autoIncrement: true, }, - characterId: { + character_id: { type: DataTypes.INTEGER, allowNull: false, }, - activityTr: { + activity_tr: { type: DataTypes.STRING, allowNull: false, }, @@ -21,7 +21,7 @@ HealthActivity.init({ type: DataTypes.FLOAT, allowNull: false, }, - successPercentage: { + success_percentage: { type: DataTypes.INTEGER, allowNull: false } @@ -32,6 +32,7 @@ HealthActivity.init({ schema: 'falukant_log', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default HealthActivity; diff --git a/backend/models/falukant/log/moneyflow.js b/backend/models/falukant/log/moneyflow.js index 5e84886..e13074d 100644 --- a/backend/models/falukant/log/moneyflow.js +++ b/backend/models/falukant/log/moneyflow.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class MoneyFlow extends Model { } MoneyFlow.init({ - falukantUserId: { + falukant_user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -12,11 +12,11 @@ MoneyFlow.init({ type: DataTypes.STRING, allowNull: false, }, - moneyBefore: { + money_before: { type: DataTypes.DOUBLE, allowNull: false, }, - moneyAfter: { + money_after: { type: DataTypes.DOUBLE, allowNull: true, }, @@ -25,11 +25,11 @@ MoneyFlow.init({ allowNull: false, defaultValue: DataTypes.NOW }, - changeValue: { + change_value: { type: DataTypes.DOUBLE, allowNull: false, }, - changedBy: { + changed_by: { type: DataTypes.INTEGER, allowNull: true, }, @@ -40,6 +40,7 @@ MoneyFlow.init({ schema: 'falukant_log', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default MoneyFlow; diff --git a/backend/models/falukant/log/notification.js b/backend/models/falukant/log/notification.js index 6086864..70dd6bf 100644 --- a/backend/models/falukant/log/notification.js +++ b/backend/models/falukant/log/notification.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class Notification extends Model { } Notification.init({ - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, }, @@ -24,6 +24,7 @@ Notification.init({ schema: 'falukant_log', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default Notification; diff --git a/backend/models/falukant/log/political_office_history.js b/backend/models/falukant/log/political_office_history.js index 378c61d..d11385c 100644 --- a/backend/models/falukant/log/political_office_history.js +++ b/backend/models/falukant/log/political_office_history.js @@ -5,19 +5,19 @@ class PoliticalOfficeHistory extends Model { } PoliticalOfficeHistory.init( { - characterId: { + character_id: { type: DataTypes.INTEGER, allowNull: false, }, - officeTypeId: { + office_type_id: { type: DataTypes.INTEGER, allowNull: false, }, - startDate: { + start_date: { type: DataTypes.DATE, allowNull: false, }, - endDate: { + end_date: { type: DataTypes.DATE, allowNull: false, } @@ -29,7 +29,8 @@ PoliticalOfficeHistory.init( schema: 'falukant_log', timestamps: true, underscored: true, - } + , + freezeTableName: true} ); export default PoliticalOfficeHistory; diff --git a/backend/models/falukant/log/promotional_gift.js b/backend/models/falukant/log/promotional_gift.js index 5dd1272..a93f141 100644 --- a/backend/models/falukant/log/promotional_gift.js +++ b/backend/models/falukant/log/promotional_gift.js @@ -4,19 +4,19 @@ import { sequelize } from '../../../utils/sequelize.js'; class PromotionalGiftLog extends Model { }; PromotionalGiftLog.init({ - senderCharacterId: { + sender_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - recipientCharacterId: { + recipient_character_id: { type: DataTypes.INTEGER, allowNull: false, }, - giftId: { + gift_id: { type: DataTypes.INTEGER, allowNull: false, }, - changeValue: { + change_value: { type: DataTypes.INTEGER, allowNull: false, }, @@ -27,6 +27,7 @@ PromotionalGiftLog.init({ schema: 'falukant_log', timestamps: true, underscored: true, -}); +, + freezeTableName: true}); export default PromotionalGiftLog; \ No newline at end of file diff --git a/backend/models/falukant/predefine/firstname.js b/backend/models/falukant/predefine/firstname.js index 65561d5..9e87a17 100644 --- a/backend/models/falukant/predefine/firstname.js +++ b/backend/models/falukant/predefine/firstname.js @@ -19,7 +19,8 @@ const FalukantPredefineFirstname = sequelize.define('firstname', { { unique: true, fields: ['name', 'gender'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/predefine/lastname.js b/backend/models/falukant/predefine/lastname.js index 3c4a49d..cc19eba 100644 --- a/backend/models/falukant/predefine/lastname.js +++ b/backend/models/falukant/predefine/lastname.js @@ -16,7 +16,8 @@ const FalukantPredefineLastname = sequelize.define('lastname', { { unique: true, fields: ['name'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/predefine/political_office_benefit.js b/backend/models/falukant/predefine/political_office_benefit.js index 2ffb2f1..5f475b5 100644 --- a/backend/models/falukant/predefine/political_office_benefit.js +++ b/backend/models/falukant/predefine/political_office_benefit.js @@ -30,7 +30,8 @@ PoliticalOfficeBenefit.init({ schema: 'falukant_predefine', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); // Association PoliticalOfficeBenefit.belongsTo(PoliticalOfficeBenefitType, { diff --git a/backend/models/falukant/predefine/political_office_prerequisite.js b/backend/models/falukant/predefine/political_office_prerequisite.js index d8178b4..dd812f7 100644 --- a/backend/models/falukant/predefine/political_office_prerequisite.js +++ b/backend/models/falukant/predefine/political_office_prerequisite.js @@ -29,6 +29,7 @@ PoliticalOfficePrerequisite.init({ schema: 'falukant_predefine', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default PoliticalOfficePrerequisite; diff --git a/backend/models/falukant/predefine/promotional_gift_character_trait.js b/backend/models/falukant/predefine/promotional_gift_character_trait.js index 68b37a9..796b97f 100644 --- a/backend/models/falukant/predefine/promotional_gift_character_trait.js +++ b/backend/models/falukant/predefine/promotional_gift_character_trait.js @@ -39,7 +39,8 @@ PromotionalGiftCharacterTrait.init( schema: 'falukant_predefine', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default PromotionalGiftCharacterTrait; diff --git a/backend/models/falukant/predefine/promotional_gift_mood.js b/backend/models/falukant/predefine/promotional_gift_mood.js index 94998fd..42f82f8 100644 --- a/backend/models/falukant/predefine/promotional_gift_mood.js +++ b/backend/models/falukant/predefine/promotional_gift_mood.js @@ -39,7 +39,8 @@ PromotionalGiftMood.init( schema: 'falukant_predefine', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default PromotionalGiftMood; diff --git a/backend/models/falukant/type/banquette.js b/backend/models/falukant/type/banquette.js index 7cba1f0..e1e97d5 100644 --- a/backend/models/falukant/type/banquette.js +++ b/backend/models/falukant/type/banquette.js @@ -13,7 +13,7 @@ BanquetteType.init( type: DataTypes.INTEGER, allowNull: false, }, - reputationGrowth: { + reputation_growth: { type: DataTypes.INTEGER, allowNull: false, }, @@ -25,7 +25,8 @@ BanquetteType.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default BanquetteType; diff --git a/backend/models/falukant/type/branch.js b/backend/models/falukant/type/branch.js index a9a5b93..5776f1b 100644 --- a/backend/models/falukant/type/branch.js +++ b/backend/models/falukant/type/branch.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class BranchType extends Model { } BranchType.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, }, - baseCost: { + base_cost: { type: DataTypes.INTEGER, allowNull: false, } @@ -23,7 +23,8 @@ BranchType.init({ { unique: true, fields: ['label_tr'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/type/character_trait.js b/backend/models/falukant/type/character_trait.js index 778287d..dfd7b7e 100644 --- a/backend/models/falukant/type/character_trait.js +++ b/backend/models/falukant/type/character_trait.js @@ -17,7 +17,8 @@ CharacterTrait.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default CharacterTrait; diff --git a/backend/models/falukant/type/house.js b/backend/models/falukant/type/house.js index 6c1ec75..4740a3e 100644 --- a/backend/models/falukant/type/house.js +++ b/backend/models/falukant/type/house.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class HouseType extends Model { } HouseType.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, }, @@ -16,7 +16,7 @@ HouseType.init({ type: DataTypes.INTEGER, allowNull: false, }, - minimumNobleTitle: { + minimum_noble_title: { type: DataTypes.INTEGER, allowNull: false, }, @@ -31,7 +31,8 @@ HouseType.init({ { unique: true, fields: ['label_tr'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/type/learn_recipient.js b/backend/models/falukant/type/learn_recipient.js index 1b71cea..8b72f7d 100644 --- a/backend/models/falukant/type/learn_recipient.js +++ b/backend/models/falukant/type/learn_recipient.js @@ -17,7 +17,8 @@ LearnRecipient.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default LearnRecipient; diff --git a/backend/models/falukant/type/mood.js b/backend/models/falukant/type/mood.js index d3be72a..feeb45f 100644 --- a/backend/models/falukant/type/mood.js +++ b/backend/models/falukant/type/mood.js @@ -17,7 +17,8 @@ Mood.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default Mood; diff --git a/backend/models/falukant/type/music.js b/backend/models/falukant/type/music.js index b7d424f..8309668 100644 --- a/backend/models/falukant/type/music.js +++ b/backend/models/falukant/type/music.js @@ -13,7 +13,7 @@ MusicType.init( type: DataTypes.INTEGER, allowNull: false, }, - reputationGrowth: { + reputation_growth: { type: DataTypes.INTEGER, allowNull: false, }, @@ -25,7 +25,8 @@ MusicType.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default MusicType; diff --git a/backend/models/falukant/type/party.js b/backend/models/falukant/type/party.js index 9621986..ccec089 100644 --- a/backend/models/falukant/type/party.js +++ b/backend/models/falukant/type/party.js @@ -13,12 +13,12 @@ PartyType.init( type: DataTypes.INTEGER, allowNull: false, }, - forMarriage: { + for_marriage: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false, }, - reputationGrowth: { + reputation_growth: { type: DataTypes.INTEGER, allowNull: false, } @@ -30,7 +30,8 @@ PartyType.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default PartyType; diff --git a/backend/models/falukant/type/political_office_benefit_type.js b/backend/models/falukant/type/political_office_benefit_type.js index cbf971a..8e466a2 100644 --- a/backend/models/falukant/type/political_office_benefit_type.js +++ b/backend/models/falukant/type/political_office_benefit_type.js @@ -21,6 +21,7 @@ PoliticalOfficeBenefitType.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default PoliticalOfficeBenefitType; diff --git a/backend/models/falukant/type/political_office_type.js b/backend/models/falukant/type/political_office_type.js index b89ffc3..3dcf837 100644 --- a/backend/models/falukant/type/political_office_type.js +++ b/backend/models/falukant/type/political_office_type.js @@ -13,15 +13,15 @@ PoliticalOfficeType.init({ type: DataTypes.STRING, allowNull: false, }, - seatsPerRegion: { + seats_per_region: { type: DataTypes.INTEGER, allowNull: false, }, - regionType: { + region_type: { type: DataTypes.STRING, allowNull: false, }, - termLength: { + term_length: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0, @@ -33,6 +33,7 @@ PoliticalOfficeType.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default PoliticalOfficeType; diff --git a/backend/models/falukant/type/product.js b/backend/models/falukant/type/product.js index d4a096c..9fbae35 100644 --- a/backend/models/falukant/type/product.js +++ b/backend/models/falukant/type/product.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class ProductType extends Model { } ProductType.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, }, @@ -12,11 +12,11 @@ ProductType.init({ type: DataTypes.INTEGER, allowNull: false, }, - productionTime: { + production_time: { type: DataTypes.INTEGER, allowNull: false, }, - sellCost: { + sell_cost: { type: DataTypes.INTEGER, allowNull: false, } @@ -31,7 +31,8 @@ ProductType.init({ { unique: true, fields: ['label_tr'] - } + , + freezeTableName: true} ], }); diff --git a/backend/models/falukant/type/promotional_gift.js b/backend/models/falukant/type/promotional_gift.js index b806368..c2319b0 100644 --- a/backend/models/falukant/type/promotional_gift.js +++ b/backend/models/falukant/type/promotional_gift.js @@ -26,7 +26,8 @@ PromotionalGift.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default PromotionalGift; diff --git a/backend/models/falukant/type/region.js b/backend/models/falukant/type/region.js index 8148202..1c47ba8 100644 --- a/backend/models/falukant/type/region.js +++ b/backend/models/falukant/type/region.js @@ -4,11 +4,11 @@ import { sequelize } from '../../../utils/sequelize.js'; class RegionType extends Model { } RegionType.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, }, - parentId: { + parent_id: { type: DataTypes.INTEGER, allowNull: true, references: { @@ -24,6 +24,7 @@ RegionType.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default RegionType; diff --git a/backend/models/falukant/type/relationship.js b/backend/models/falukant/type/relationship.js index 881782b..071fb4b 100644 --- a/backend/models/falukant/type/relationship.js +++ b/backend/models/falukant/type/relationship.js @@ -17,7 +17,8 @@ RelationshipType.init( schema: 'falukant_type', timestamps: false, underscored: true, - } + , + freezeTableName: true} ); export default RelationshipType; diff --git a/backend/models/falukant/type/stock.js b/backend/models/falukant/type/stock.js index ba1aaa4..a6f3763 100644 --- a/backend/models/falukant/type/stock.js +++ b/backend/models/falukant/type/stock.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class FalukantStockType extends Model { } FalukantStockType.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, unique: true, @@ -20,6 +20,7 @@ FalukantStockType.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default FalukantStockType; diff --git a/backend/models/falukant/type/title_of_nobility.js b/backend/models/falukant/type/title_of_nobility.js index 41f8ecf..56d6043 100644 --- a/backend/models/falukant/type/title_of_nobility.js +++ b/backend/models/falukant/type/title_of_nobility.js @@ -4,7 +4,7 @@ import { sequelize } from '../../../utils/sequelize.js'; class TitleOfNobility extends Model { } TitleOfNobility.init({ - labelTr: { + label_tr: { type: DataTypes.STRING, allowNull: false, }, @@ -20,6 +20,7 @@ TitleOfNobility.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default TitleOfNobility; diff --git a/backend/models/falukant/type/title_requirement.js b/backend/models/falukant/type/title_requirement.js index 78f990e..ee2a4d8 100644 --- a/backend/models/falukant/type/title_requirement.js +++ b/backend/models/falukant/type/title_requirement.js @@ -10,15 +10,15 @@ TitleRequirement.init({ primaryKey: true, autoIncrement: true, }, - titleId: { + title_id: { type: DataTypes.INTEGER, allowNull: false, }, - requirementType: { + requirement_type: { type: DataTypes.STRING, allowNull: false, }, - requirementValue: { + requirement_value: { type: DataTypes.DECIMAL(14, 2), allowNull: false, }, @@ -34,7 +34,8 @@ TitleRequirement.init({ unique: true, fields: ['title_id', 'requirement_type'], name: 'title_requirement_titleid_reqtype_unique' - } + , + freezeTableName: true} ] }); diff --git a/backend/models/falukant/type/underground.js b/backend/models/falukant/type/underground.js index 44fef83..6409883 100644 --- a/backend/models/falukant/type/underground.js +++ b/backend/models/falukant/type/underground.js @@ -20,6 +20,7 @@ UndergroundType.init({ schema: 'falukant_type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default UndergroundType; diff --git a/backend/models/forum/forum.js b/backend/models/forum/forum.js index 134884b..298a9f4 100644 --- a/backend/models/forum/forum.js +++ b/backend/models/forum/forum.js @@ -10,6 +10,7 @@ const Forum = sequelize.define('forum', { tableName: 'forum', schema: 'forum', underscored: true -}); +, + freezeTableName: true}); export default Forum; diff --git a/backend/models/forum/forum_forum_permission.js b/backend/models/forum/forum_forum_permission.js index cf35b1e..ecf4648 100644 --- a/backend/models/forum/forum_forum_permission.js +++ b/backend/models/forum/forum_forum_permission.js @@ -2,7 +2,7 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const ForumForumPermission = sequelize.define('forum_forum_permission', { - forumId: { + forum_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -10,7 +10,7 @@ const ForumForumPermission = sequelize.define('forum_forum_permission', { key: 'id' } }, - permissionId: { + permission_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -22,6 +22,7 @@ const ForumForumPermission = sequelize.define('forum_forum_permission', { tableName: 'forum_forum_permission', schema: 'forum', underscored: true -}); +, + freezeTableName: true}); export default ForumForumPermission; diff --git a/backend/models/forum/forum_permission.js b/backend/models/forum/forum_permission.js index 136800e..ad8c71f 100644 --- a/backend/models/forum/forum_permission.js +++ b/backend/models/forum/forum_permission.js @@ -17,6 +17,7 @@ const ForumPermission = sequelize.define('forum_permission', { schema: 'forum', timestamps: false, underscored: true -}); +, + freezeTableName: true}); export default ForumPermission; diff --git a/backend/models/forum/forum_user_permission.js b/backend/models/forum/forum_user_permission.js index b57e78c..295f518 100644 --- a/backend/models/forum/forum_user_permission.js +++ b/backend/models/forum/forum_user_permission.js @@ -2,15 +2,15 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const ForumUserPermission = sequelize.define('forum_user_permission', { - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: true }, - permissionId: { + permission_id: { type: DataTypes.INTEGER, allowNull: false }, - forumId: { + forum_id: { type: DataTypes.INTEGER, allowNull: false }, @@ -18,6 +18,7 @@ const ForumUserPermission = sequelize.define('forum_user_permission', { tableName: 'forum_user_permission', schema: 'forum', underscored: true -}); +, + freezeTableName: true}); export default ForumUserPermission; diff --git a/backend/models/forum/message.js b/backend/models/forum/message.js index ffa470f..0d4ccd2 100644 --- a/backend/models/forum/message.js +++ b/backend/models/forum/message.js @@ -6,11 +6,11 @@ const Message = sequelize.define('message', { type: DataTypes.TEXT, allowNull: false }, - createdBy: { + created_by: { type: DataTypes.INTEGER, allowNull: false }, - titleId: { + title_id: { type: DataTypes.INTEGER, allowNull: false } @@ -19,6 +19,7 @@ const Message = sequelize.define('message', { schema: 'forum', underscored: true, timestamps: true -}); +, + freezeTableName: true}); export default Message; diff --git a/backend/models/forum/message_history.js b/backend/models/forum/message_history.js index 61eb3bb..3c9d25b 100644 --- a/backend/models/forum/message_history.js +++ b/backend/models/forum/message_history.js @@ -2,19 +2,19 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const MessageHistory = sequelize.define('message_history', { - messageId: { + message_id: { type: DataTypes.INTEGER, allowNull: false }, - oldText: { + old_text: { type: DataTypes.TEXT, allowNull: false }, - changedBy: { + changed_by: { type: DataTypes.INTEGER, allowNull: false }, - oldUpdatedAt: { + old_updated_at: { type: DataTypes.DATE, allowNull: false } @@ -23,6 +23,7 @@ const MessageHistory = sequelize.define('message_history', { schema: 'forum', underscored: true, timestamps: false -}); +, + freezeTableName: true}); export default MessageHistory; diff --git a/backend/models/forum/message_image.js b/backend/models/forum/message_image.js index fc584f5..ce5b58c 100644 --- a/backend/models/forum/message_image.js +++ b/backend/models/forum/message_image.js @@ -2,11 +2,11 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const MessageImage = sequelize.define('message_image', { - messageId: { + message_id: { type: DataTypes.INTEGER, allowNull: false }, - fileName: { + file_name: { type: DataTypes.STRING, allowNull: false } @@ -15,6 +15,7 @@ const MessageImage = sequelize.define('message_image', { schema: 'forum', underscored: true, timestamps: false -}); +, + freezeTableName: true}); export default MessageImage; diff --git a/backend/models/forum/title.js b/backend/models/forum/title.js index 2a2e21e..bdd4781 100644 --- a/backend/models/forum/title.js +++ b/backend/models/forum/title.js @@ -11,11 +11,11 @@ const Title = sequelize.define('title', { type: DataTypes.STRING, allowNull: false }, - createdBy: { + created_by: { type: DataTypes.INTEGER, allowNull: false }, - forumId: { + forum_id: { type: DataTypes.INTEGER, allowNull: false } @@ -24,6 +24,7 @@ const Title = sequelize.define('title', { schema: 'forum', underscored: true, timestamps: true, -}); +, + freezeTableName: true}); export default Title; diff --git a/backend/models/forum/title_history.js b/backend/models/forum/title_history.js index 535ef2b..16b4e63 100644 --- a/backend/models/forum/title_history.js +++ b/backend/models/forum/title_history.js @@ -2,19 +2,19 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const TitleHistory = sequelize.define('title_history', { - titleId: { + title_id: { type: DataTypes.INTEGER, allowNull: false }, - oldTitle: { + old_title: { type: DataTypes.STRING, allowNull: false }, - changedBy: { + changed_by: { type: DataTypes.INTEGER, allowNull: false }, - oldUpdatedAt: { + old_updated_at: { type: DataTypes.DATE, allowNull: false } @@ -23,6 +23,7 @@ const TitleHistory = sequelize.define('title_history', { schema: 'forum', underscored: true, timestamps: false -}); +, + freezeTableName: true}); export default TitleHistory; diff --git a/backend/models/logs/login.js b/backend/models/logs/login.js index 8f65c27..c017a9a 100644 --- a/backend/models/logs/login.js +++ b/backend/models/logs/login.js @@ -13,7 +13,7 @@ const Login = sequelize.define('login', { } }, { schema: 'logs', - underscored: true, + underscored: true, tableName: 'login' }); diff --git a/backend/models/match3/campaign.js b/backend/models/match3/campaign.js index 8c2fafb..b4590b8 100644 --- a/backend/models/match3/campaign.js +++ b/backend/models/match3/campaign.js @@ -15,7 +15,7 @@ const Campaign = sequelize.define('Campaign', { type: DataTypes.TEXT, allowNull: true }, - isActive: { + is_active: { type: DataTypes.BOOLEAN, defaultValue: true }, @@ -23,11 +23,11 @@ const Campaign = sequelize.define('Campaign', { type: DataTypes.INTEGER, defaultValue: 1 }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW } @@ -36,6 +36,7 @@ const Campaign = sequelize.define('Campaign', { schema: 'match3', timestamps: true, underscored: true // WICHTIG: Alle Datenbankfelder im snake_case Format -}); +, + freezeTableName: true}); export default Campaign; diff --git a/backend/models/match3/level.js b/backend/models/match3/level.js index 2f478c7..ae34a7b 100644 --- a/backend/models/match3/level.js +++ b/backend/models/match3/level.js @@ -7,7 +7,7 @@ const Match3Level = sequelize.define('Match3Level', { primaryKey: true, autoIncrement: true }, - campaignId: { + campaign_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -27,40 +27,40 @@ const Match3Level = sequelize.define('Match3Level', { type: DataTypes.INTEGER, allowNull: false }, - boardLayout: { + board_layout: { type: DataTypes.TEXT, allowNull: true, // Ändern zu true, da bereits existierende Datensätze vorhanden sind defaultValue: 'xxxxxx\nxxxxxx\nxxxxxx\nxxxxxx\nxxxxxx\nxxxxxx', // Standard-Layout für neue Level comment: 'Level-Form als String (o = kein Feld, x = Feld, Zeilen durch \n getrennt)' }, - boardWidth: { + board_width: { type: DataTypes.INTEGER, allowNull: true, // Ändern zu true, da bereits existierende Datensätze vorhanden sind defaultValue: 6, // Standardwert für neue Level comment: 'Breite des Level-Boards' }, - boardHeight: { + board_height: { type: DataTypes.INTEGER, allowNull: true, // Ändern zu true, da bereits existierende Datensätze vorhanden sind defaultValue: 6, // Standardwert für neue Level comment: 'Höhe des Level-Boards' }, - tileTypes: { + tile_types: { type: DataTypes.JSON, allowNull: true, // Ändern zu true, da wir jetzt eine Verknüpfungstabelle haben comment: 'Legacy: Array der verfügbaren Tile-Typen (wird durch levelTileTypes ersetzt)' }, - moveLimit: { + move_limit: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 20 }, - timeLimit: { + time_limit: { type: DataTypes.INTEGER, allowNull: true, comment: 'Zeitlimit in Sekunden (null = kein Limit)' }, - isActive: { + is_active: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true @@ -70,6 +70,7 @@ const Match3Level = sequelize.define('Match3Level', { schema: 'match3', timestamps: true, underscored: true // WICHTIG: Alle Datenbankfelder im snake_case Format -}); +, + freezeTableName: true}); export default Match3Level; diff --git a/backend/models/match3/levelTileType.js b/backend/models/match3/levelTileType.js index 55535b2..3931745 100644 --- a/backend/models/match3/levelTileType.js +++ b/backend/models/match3/levelTileType.js @@ -7,7 +7,7 @@ const Match3LevelTileType = sequelize.define('Match3LevelTileType', { primaryKey: true, autoIncrement: true }, - levelId: { + level_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -16,7 +16,7 @@ const Match3LevelTileType = sequelize.define('Match3LevelTileType', { }, comment: 'Referenz auf den Level' }, - tileTypeId: { + tile_type_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -31,7 +31,7 @@ const Match3LevelTileType = sequelize.define('Match3LevelTileType', { defaultValue: 1, comment: 'Gewichtung für die Wahrscheinlichkeit, dass dieser Tile-Typ erscheint' }, - isActive: { + is_active: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, @@ -46,7 +46,8 @@ const Match3LevelTileType = sequelize.define('Match3LevelTileType', { { unique: true, fields: ['level_id', 'tile_type_id'] // WICHTIG: Bei underscored: true müssen snake_case Namen verwendet werden - } + , + freezeTableName: true} ] }); diff --git a/backend/models/match3/objective.js b/backend/models/match3/objective.js index 651a381..bfb1f00 100644 --- a/backend/models/match3/objective.js +++ b/backend/models/match3/objective.js @@ -7,7 +7,7 @@ const Objective = sequelize.define('Objective', { primaryKey: true, autoIncrement: true }, - levelId: { + level_id: { type: DataTypes.INTEGER, allowNull: false }, @@ -31,15 +31,15 @@ const Objective = sequelize.define('Objective', { type: DataTypes.INTEGER, defaultValue: 1 }, - isRequired: { + is_required: { type: DataTypes.BOOLEAN, defaultValue: true }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW } @@ -48,6 +48,7 @@ const Objective = sequelize.define('Objective', { schema: 'match3', timestamps: true, underscored: true // WICHTIG: Alle Datenbankfelder im snake_case Format -}); +, + freezeTableName: true}); export default Objective; diff --git a/backend/models/match3/tileType.js b/backend/models/match3/tileType.js index b30649f..4733ea6 100644 --- a/backend/models/match3/tileType.js +++ b/backend/models/match3/tileType.js @@ -12,7 +12,7 @@ const Match3TileType = sequelize.define('Match3TileType', { allowNull: false, comment: 'Eindeutiger Name des Tile-Typs (z.B. "gem", "star", "heart")' }, - displayName: { + display_name: { type: DataTypes.STRING(100), allowNull: false, comment: 'Anzeigename des Tile-Typs (z.B. "Juwel", "Stern", "Herz")' @@ -39,7 +39,7 @@ const Match3TileType = sequelize.define('Match3TileType', { defaultValue: 10, comment: 'Punkte, die dieser Tile-Typ beim Matchen gibt' }, - isActive: { + is_active: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, @@ -54,7 +54,8 @@ const Match3TileType = sequelize.define('Match3TileType', { { unique: true, fields: ['name'] - } + , + freezeTableName: true} ] }); diff --git a/backend/models/match3/userLevelProgress.js b/backend/models/match3/userLevelProgress.js index 31e5fc8..1783650 100644 --- a/backend/models/match3/userLevelProgress.js +++ b/backend/models/match3/userLevelProgress.js @@ -7,11 +7,11 @@ const UserLevelProgress = sequelize.define('UserLevelProgress', { primaryKey: true, autoIncrement: true }, - userProgressId: { + user_progress_id: { type: DataTypes.INTEGER, allowNull: false }, - levelId: { + level_id: { type: DataTypes.INTEGER, allowNull: false }, @@ -31,7 +31,7 @@ const UserLevelProgress = sequelize.define('UserLevelProgress', { type: DataTypes.INTEGER, defaultValue: 0 }, - isCompleted: { + is_completed: { type: DataTypes.BOOLEAN, defaultValue: false }, @@ -39,27 +39,27 @@ const UserLevelProgress = sequelize.define('UserLevelProgress', { type: DataTypes.INTEGER, defaultValue: 1 }, - bestScore: { + best_score: { type: DataTypes.INTEGER, defaultValue: 0 }, - bestMoves: { + best_moves: { type: DataTypes.INTEGER, defaultValue: 0 }, - bestTime: { + best_time: { type: DataTypes.INTEGER, defaultValue: 0 }, - completedAt: { + completed_at: { type: DataTypes.DATE, allowNull: true }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW } @@ -72,7 +72,8 @@ const UserLevelProgress = sequelize.define('UserLevelProgress', { { unique: true, fields: ['user_progress_id', 'level_id'] // WICHTIG: Bei underscored: true müssen snake_case Namen verwendet werden - } + , + freezeTableName: true} ] }); diff --git a/backend/models/match3/userProgress.js b/backend/models/match3/userProgress.js index f10d2d4..bec19a7 100644 --- a/backend/models/match3/userProgress.js +++ b/backend/models/match3/userProgress.js @@ -7,43 +7,43 @@ const UserProgress = sequelize.define('UserProgress', { primaryKey: true, autoIncrement: true }, - userId: { + user_id: { type: DataTypes.STRING(255), allowNull: false }, - campaignId: { + campaign_id: { type: DataTypes.INTEGER, allowNull: false }, - totalScore: { + total_score: { type: DataTypes.INTEGER, defaultValue: 0 }, - totalStars: { + total_stars: { type: DataTypes.INTEGER, defaultValue: 0 }, - levelsCompleted: { + levels_completed: { type: DataTypes.INTEGER, defaultValue: 0 }, - currentLevel: { + current_level: { type: DataTypes.INTEGER, defaultValue: 1 }, - isCompleted: { + is_completed: { type: DataTypes.BOOLEAN, defaultValue: false }, - lastPlayed: { + last_played: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - createdAt: { + created_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - updatedAt: { + updated_at: { type: DataTypes.DATE, defaultValue: DataTypes.NOW } @@ -56,7 +56,8 @@ const UserProgress = sequelize.define('UserProgress', { { unique: true, fields: ['user_id', 'campaign_id'] // WICHTIG: Bei underscored: true müssen snake_case Namen verwendet werden - } + , + freezeTableName: true} ] }); diff --git a/backend/models/service/contactmessage.js b/backend/models/service/contactmessage.js index d3cbe27..e49890c 100644 --- a/backend/models/service/contactmessage.js +++ b/backend/models/service/contactmessage.js @@ -51,11 +51,11 @@ const ContactMessage = sequelize.define('contact_message', { } } }, - allowDataSave: { + allow_data_save: { type: DataTypes.BOOLEAN, allowNull: false }, - isFinished: { + is_finished: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false @@ -77,11 +77,11 @@ const ContactMessage = sequelize.define('contact_message', { } } }, - answeredAt: { + answered_at: { type: DataTypes.DATE, allowNull: true }, - isAnswered: { + is_answered: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false @@ -91,6 +91,7 @@ const ContactMessage = sequelize.define('contact_message', { timestamps: true, schema: 'service', underscored: true -}); +, + freezeTableName: true}); export default ContactMessage; diff --git a/backend/models/service/minigame_campaign.js b/backend/models/service/minigame_campaign.js index e83f078..feb5cb6 100644 --- a/backend/models/service/minigame_campaign.js +++ b/backend/models/service/minigame_campaign.js @@ -19,6 +19,7 @@ const MinigameCampaign = sequelize.define('minigame_campaign', { tableName: 'minigame_campaign', schema: 'service', underscored: true, -}); +, + freezeTableName: true}); export default MinigameCampaign; diff --git a/backend/models/service/minigame_campaign_level.js b/backend/models/service/minigame_campaign_level.js index 03e5f5e..271d8b9 100644 --- a/backend/models/service/minigame_campaign_level.js +++ b/backend/models/service/minigame_campaign_level.js @@ -2,7 +2,7 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const MinigameCampaignLevel = sequelize.define('minigame_campaign_level', { - campaignId: { + campaign_id: { type: DataTypes.INTEGER, allowNull: false, field: 'campaign_id' @@ -20,6 +20,7 @@ const MinigameCampaignLevel = sequelize.define('minigame_campaign_level', { tableName: 'minigame_campaign_level', schema: 'service', underscored: true, -}); +, + freezeTableName: true}); export default MinigameCampaignLevel; diff --git a/backend/models/service/minigame_user_progress.js b/backend/models/service/minigame_user_progress.js index b480369..1efba27 100644 --- a/backend/models/service/minigame_user_progress.js +++ b/backend/models/service/minigame_user_progress.js @@ -2,17 +2,17 @@ import { sequelize } from '../../utils/sequelize.js'; import { DataTypes } from 'sequelize'; const MinigameUserProgress = sequelize.define('minigame_user_progress', { - userId: { + user_id: { type: DataTypes.INTEGER, allowNull: false, field: 'user_id' }, - campaignId: { + campaign_id: { type: DataTypes.INTEGER, allowNull: false, field: 'campaign_id' }, - levelIndex: { + level_index: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 1, @@ -23,7 +23,7 @@ const MinigameUserProgress = sequelize.define('minigame_user_progress', { allowNull: false, defaultValue: 0 }, - bestScore: { + best_score: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0, @@ -34,7 +34,8 @@ const MinigameUserProgress = sequelize.define('minigame_user_progress', { schema: 'service', underscored: true, indexes: [ - { unique: true, fields: ['user_id', 'campaign_id'] } + { unique: true, fields: ['user_id', 'campaign_id'] , + freezeTableName: true} ] }); diff --git a/backend/models/type/image_visibility.js b/backend/models/type/image_visibility.js index c34d526..1b80268 100644 --- a/backend/models/type/image_visibility.js +++ b/backend/models/type/image_visibility.js @@ -17,6 +17,7 @@ const ImageVisibilityType = sequelize.define('image_visibility_type', { schema: 'type', timestamps: false, underscored: true, -}); +, + freezeTableName: true}); export default ImageVisibilityType; diff --git a/backend/models/type/interest.js b/backend/models/type/interest.js index ab7ea6e..77f1a89 100644 --- a/backend/models/type/interest.js +++ b/backend/models/type/interest.js @@ -11,7 +11,7 @@ const Interest = sequelize.define('interest_type', { allowNull: false, defaultValue: false }, - adultOnly: { + adult_only: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true, @@ -20,6 +20,7 @@ const Interest = sequelize.define('interest_type', { tableName: 'interest', schema: 'type', underscored: true -}); +, + freezeTableName: true}); export default Interest; \ No newline at end of file diff --git a/backend/models/type/interest_translation.js b/backend/models/type/interest_translation.js index 7e4b028..424e66a 100644 --- a/backend/models/type/interest_translation.js +++ b/backend/models/type/interest_translation.js @@ -11,7 +11,7 @@ const interestTranslation = sequelize.define('interest_translation_type', { type: DataTypes.INTEGER, allowNull: false }, - interestsId: { + interests_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -25,6 +25,7 @@ const interestTranslation = sequelize.define('interest_translation_type', { tableName: 'interest_translation', schema: 'type', underscored: true -}); +, + freezeTableName: true}); export default interestTranslation; \ No newline at end of file diff --git a/backend/models/type/settings.js b/backend/models/type/settings.js index d4c58cd..5341fcb 100644 --- a/backend/models/type/settings.js +++ b/backend/models/type/settings.js @@ -10,6 +10,7 @@ const Settings = sequelize.define('settings_type', { tableName: 'settings', schema: 'type', underscored: true -}); +, + freezeTableName: true}); export default Settings; \ No newline at end of file diff --git a/backend/models/type/user_param.js b/backend/models/type/user_param.js index 2fae1d9..423f709 100644 --- a/backend/models/type/user_param.js +++ b/backend/models/type/user_param.js @@ -6,7 +6,7 @@ const UserParamType = sequelize.define('user_param_type', { type: DataTypes.STRING, allowNull: false }, - minAge: { + min_age: { type: DataTypes.INTEGER, allowNull: true }, @@ -19,7 +19,7 @@ const UserParamType = sequelize.define('user_param_type', { allowNull: false, defaultValue: 'string' }, - settingsId: { + settings_id: { type: DataTypes.INTEGER, allowNull: false, references: { @@ -27,7 +27,7 @@ const UserParamType = sequelize.define('user_param_type', { key: 'id' } }, - orderId: { + order_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 @@ -40,6 +40,7 @@ const UserParamType = sequelize.define('user_param_type', { tableName: 'user_param', schema: 'type', underscored: true -}); +, + freezeTableName: true}); export default UserParamType; diff --git a/backend/models/type/user_param_value.js b/backend/models/type/user_param_value.js index 462b28a..7492a9e 100644 --- a/backend/models/type/user_param_value.js +++ b/backend/models/type/user_param_value.js @@ -8,7 +8,7 @@ const UserParamValue = sequelize.define('user_param_value', { primaryKey: true, autoIncrement: true }, - userParamTypeId: { + user_param_type_id: { type: DataTypes.INTEGER, allowNull: false }, @@ -16,7 +16,7 @@ const UserParamValue = sequelize.define('user_param_value', { type: DataTypes.STRING, allowNull: false }, - orderId: { + order_id: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 @@ -26,7 +26,8 @@ const UserParamValue = sequelize.define('user_param_value', { tableName: 'user_param_value', schema: 'type', underscored: true -} +, + freezeTableName: true} ); export default UserParamValue; diff --git a/backend/models/type/user_param_visibility.js b/backend/models/type/user_param_visibility.js index 4bcdc73..e2a1157 100644 --- a/backend/models/type/user_param_visibility.js +++ b/backend/models/type/user_param_visibility.js @@ -17,6 +17,7 @@ const UserParamVisibilityType = sequelize.define('user_param_visibility_type', { timestamps: false, underscored: true, schema: 'type' -}); +, + freezeTableName: true}); export default UserParamVisibilityType; diff --git a/backend/models/type/user_right.js b/backend/models/type/user_right.js index 4e3b00c..6eb792c 100644 --- a/backend/models/type/user_right.js +++ b/backend/models/type/user_right.js @@ -10,6 +10,7 @@ const UserRightType = sequelize.define('user_right_type', { tableName: 'user_right', schema: 'type', underscored: true -}); +, + freezeTableName: true}); export default UserRightType; diff --git a/backend/utils/checkLoginTable.js b/backend/utils/checkLoginTable.js new file mode 100644 index 0000000..93762bd --- /dev/null +++ b/backend/utils/checkLoginTable.js @@ -0,0 +1,57 @@ +import { sequelize } from './sequelize.js'; + +async function checkLoginTable() { + console.log('🔍 Überprüfe logs.login Tabelle...'); + + try { + // Prüfe die Spaltenstruktur der logs.login Tabelle + const columns = await sequelize.query( + `SELECT column_name, data_type, is_nullable, column_default + FROM information_schema.columns + WHERE table_schema = 'logs' AND table_name = 'login' + ORDER BY ordinal_position`, + { type: sequelize.QueryTypes.SELECT } + ); + + if (columns.length === 0) { + console.log('❌ Tabelle logs.login existiert nicht!'); + } else { + console.log('📊 logs.login Tabellen-Struktur:'); + columns.forEach(col => { + const defaultValue = col.column_default ? ` (default: ${col.column_default})` : ''; + console.log(` ✅ ${col.column_name} (${col.data_type}, nullable: ${col.is_nullable})${defaultValue}`); + }); + } + + // Prüfe auch ein paar Beispieldaten + const sampleData = await sequelize.query( + `SELECT * FROM logs.login LIMIT 3`, + { type: sequelize.QueryTypes.SELECT } + ); + + if (sampleData.length > 0) { + console.log('\n📋 Beispieldaten:'); + sampleData.forEach((row, index) => { + console.log(` ${index + 1}: ${JSON.stringify(row)}`); + }); + } else { + console.log('\n📋 Keine Daten in der Tabelle gefunden.'); + } + + } catch (error) { + console.error('❌ Fehler beim Überprüfen der logs.login Tabelle:', error.message); + } finally { + await sequelize.close(); + } +} + +// Führe die Überprüfung aus +checkLoginTable() + .then(() => { + console.log('\n✅ Login-Tabellenüberprüfung abgeschlossen!'); + process.exit(0); + }) + .catch((error) => { + console.error('💥 Login-Tabellenüberprüfung fehlgeschlagen:', error); + process.exit(1); + });