Browse Source

Rename Account to account in AccountBalance database schema

pull/5049/head
Thomas Kaul 3 days ago
parent
commit
deaf986f1d
  1. 12
      apps/api/src/app/account-balance/account-balance.service.ts
  2. 2
      prisma/schema.prisma

12
apps/api/src/app/account-balance/account-balance.service.ts

@ -30,7 +30,7 @@ export class AccountBalanceService {
): Promise<AccountBalance | null> { ): Promise<AccountBalance | null> {
return this.prismaService.accountBalance.findFirst({ return this.prismaService.accountBalance.findFirst({
include: { include: {
Account: true account: true
}, },
where: accountBalanceWhereInput where: accountBalanceWhereInput
}); });
@ -46,7 +46,7 @@ export class AccountBalanceService {
}): Promise<AccountBalance> { }): Promise<AccountBalance> {
const accountBalance = await this.prismaService.accountBalance.upsert({ const accountBalance = await this.prismaService.accountBalance.upsert({
create: { create: {
Account: { account: {
connect: { connect: {
id_userId: { id_userId: {
userId, userId,
@ -154,7 +154,7 @@ export class AccountBalanceService {
} }
if (withExcludedAccounts === false) { if (withExcludedAccounts === false) {
where.Account = { isExcluded: false }; where.account = { isExcluded: false };
} }
const balances = await this.prismaService.accountBalance.findMany({ const balances = await this.prismaService.accountBalance.findMany({
@ -163,7 +163,7 @@ export class AccountBalanceService {
date: 'asc' date: 'asc'
}, },
select: { select: {
Account: true, account: true,
date: true, date: true,
id: true, id: true,
value: true value: true
@ -174,10 +174,10 @@ export class AccountBalanceService {
balances: balances.map((balance) => { balances: balances.map((balance) => {
return { return {
...balance, ...balance,
accountId: balance.Account.id, accountId: balance.account.id,
valueInBaseCurrency: this.exchangeRateDataService.toCurrency( valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
balance.value, balance.value,
balance.Account.currency, balance.account.currency,
userCurrency userCurrency
) )
}; };

2
prisma/schema.prisma

@ -50,6 +50,7 @@ model Account {
} }
model AccountBalance { model AccountBalance {
account Account @relation(fields: [accountId, userId], onDelete: Cascade, references: [id, userId])
accountId String accountId String
createdAt DateTime @default(now()) createdAt DateTime @default(now())
date DateTime @default(now()) date DateTime @default(now())
@ -57,7 +58,6 @@ model AccountBalance {
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
userId String userId String
value Float value Float
Account Account @relation(fields: [accountId, userId], onDelete: Cascade, references: [id, userId])
@@unique([accountId, date]) @@unique([accountId, date])
@@index([accountId]) @@index([accountId])

Loading…
Cancel
Save