Browse Source

Refactor

pull/803/head
Thomas 3 years ago
parent
commit
bf754f1581
  1. 4
      apps/api/src/app/user/user.service.ts

4
apps/api/src/app/user/user.service.ts

@ -42,7 +42,7 @@ export class UserService {
Settings, Settings,
subscription subscription
}: UserWithSettings, }: UserWithSettings,
aLocale?: string aLocale = locale
): Promise<IUser> { ): Promise<IUser> {
const access = await this.prismaService.access.findMany({ const access = await this.prismaService.access.findMany({
include: { include: {
@ -67,7 +67,7 @@ export class UserService {
settings: { settings: {
...(<UserSettings>Settings.settings), ...(<UserSettings>Settings.settings),
baseCurrency: Settings?.currency ?? UserService.DEFAULT_CURRENCY, baseCurrency: Settings?.currency ?? UserService.DEFAULT_CURRENCY,
locale: (<UserSettings>Settings.settings).locale ?? aLocale ?? locale, locale: (<UserSettings>Settings.settings).locale ?? aLocale,
viewMode: Settings?.viewMode ?? ViewMode.DEFAULT viewMode: Settings?.viewMode ?? ViewMode.DEFAULT
} }
}; };

Loading…
Cancel
Save