diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 039500719..89e0d4141 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -47,9 +47,11 @@ export class UserResolver { // read additional settings from settings table const userSettingRepository = getCustomRepository(UserSettingRepository) const userEntity = await dbUser.findByPubkeyHex(user.pubkey) - const coinanimation = await userSettingRepository.readBoolean(userEntity.id, Setting.COIN_ANIMATION).catch((error) => { - throw new Error(error) - }) + const coinanimation = await userSettingRepository + .readBoolean(userEntity.id, Setting.COIN_ANIMATION) + .catch((error) => { + throw new Error(error) + }) user.coinanimation = coinanimation return user } @@ -191,13 +193,11 @@ export class UserResolver { const userEntity = await userRepository.findByPubkeyHex(result.data.user.public_hex) const userSettingRepository = getCustomRepository(UserSettingRepository) - userSettingRepository.setOrUpdate( - userEntity.id, - Setting.COIN_ANIMATION, - coinanimation.toString(), - ).catch((error) => { - throw new Error(error) - }) + userSettingRepository + .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) + .catch((error) => { + throw new Error(error) + }) if (!response) { response = new UpdateUserInfosResponse({ valid_values: 1 }) diff --git a/backend/src/typeorm/entity/UserSetting.ts b/backend/src/typeorm/entity/UserSetting.ts index 79c10b4c8..26a00f854 100644 --- a/backend/src/typeorm/entity/UserSetting.ts +++ b/backend/src/typeorm/entity/UserSetting.ts @@ -2,7 +2,8 @@ import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 't import { User } from './User' @Entity() -export class UserSetting { //extends BaseEntity { +export class UserSetting { + // extends BaseEntity { @PrimaryGeneratedColumn() id: number diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index f4d4ea849..c086638a0 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -5,7 +5,6 @@ import { isStringBoolean } from '../../util/validate' @EntityRepository(UserSetting) export class UserSettingRepository extends Repository { - async setOrUpdate(userId: number, key: Setting, value: string): Promise { switch (key) { case Setting.COIN_ANIMATION: @@ -26,8 +25,8 @@ export class UserSettingRepository extends Repository { } async readBoolean(userId: number, key: Setting): Promise { - let entity = await this.findOne({ userId: userId, key: key }) - if(!entity || !isStringBoolean(entity.value)) { + const entity = await this.findOne({ userId: userId, key: key }) + if (!entity || !isStringBoolean(entity.value)) { return false } return entity.value.toLowerCase() === 'true' diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts index ecf4b47a8..68c340040 100644 --- a/database/migrations/0002-add_settings.ts +++ b/database/migrations/0002-add_settings.ts @@ -10,19 +10,17 @@ */ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { - - await queryFn(` + await queryFn(` CREATE TABLE IF NOT EXISTS \`user_setting\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`userId\` int(11) NOT NULL, \`key\` varchar(255) NOT NULL, \`value\` varchar(255) NOT NULL, PRIMARY KEY (\`id\`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`) - } - - export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - // write downgrade logic as parameter of queryFn - await queryFn(`DROP TABLE IF EXISTS \`user_setting\`;`) - } - \ No newline at end of file + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + // write downgrade logic as parameter of queryFn + await queryFn(`DROP TABLE IF EXISTS \`user_setting\`;`) +}