update: invoice user for the
This commit is contained in:
@@ -397,15 +397,16 @@ export class InvoicesService {
|
||||
async getInvoices(queryDto: InvoicesSearchQueryDto) {
|
||||
const [invoices, count] = await this.invoiceRepository.getInvoicesForAdmin(queryDto);
|
||||
|
||||
const usersWithInvoices = await this.invoiceRepository
|
||||
const usersThatHaveInvoices = await this.invoiceRepository
|
||||
.createQueryBuilder("invoice")
|
||||
.leftJoinAndSelect("invoice.user", "user")
|
||||
.select(["user.id", "user.firstName", "user.lastName", "user.email"])
|
||||
.distinctOn(["user.id"])
|
||||
.getMany();
|
||||
.select(
|
||||
"DISTINCT ON (user.id) user.id as id, user.firstName as firstName, user.lastName as lastName, user.email as email, user.phone as phone",
|
||||
)
|
||||
.leftJoin("invoice.user", "user")
|
||||
.getRawMany();
|
||||
|
||||
return {
|
||||
users: usersWithInvoices.map((inv) => inv.user),
|
||||
users: usersThatHaveInvoices,
|
||||
invoices,
|
||||
count,
|
||||
paginate: true,
|
||||
|
||||
Reference in New Issue
Block a user