fix: companies

This commit is contained in:
2026-02-17 09:19:11 +03:30
parent f9f397e92a
commit 42d78e15ff
11 changed files with 79 additions and 80 deletions
+21 -24
View File
@@ -1,20 +1,20 @@
import { EntityManager } from '@mikro-orm/postgresql';
import { BadRequestException, Injectable } from '@nestjs/common';
import dayjs from 'dayjs';
import Decimal from 'decimal.js';
import { EntityManager } from "@mikro-orm/postgresql";
import { BadRequestException, Injectable } from "@nestjs/common";
import dayjs from "dayjs";
import Decimal from "decimal.js";
import { BillListQueryDto } from './dto/bill-list-query.dto';
import { CreateChargeBillDto } from './dto/create-charge-bill.dto';
import { CreateWaterBillDto } from './dto/create-water-bill.dto';
import { Bill } from './entities/bill.entity';
import { BillType } from './enums/bill-type.enum';
import { BillsRepository } from './repositories/bill.repository';
import { CompanyMessage } from '../../common/enums/message.enum';
import { Business } from '../businesses/entities/business.entity';
import { Company } from '../companies/entities/company.entity';
import { CompaniesService } from '../companies/services/companies.service';
import { InvoiceItem } from '../invoices/entities/invoice-item.entity';
import { Invoice } from '../invoices/entities/invoice.entity';
import { BillListQueryDto } from "./dto/bill-list-query.dto";
import { CreateChargeBillDto } from "./dto/create-charge-bill.dto";
import { CreateWaterBillDto } from "./dto/create-water-bill.dto";
import { Bill } from "./entities/bill.entity";
import { BillType } from "./enums/bill-type.enum";
import { BillsRepository } from "./repositories/bill.repository";
import { CompanyMessage } from "../../common/enums/message.enum";
import { Business } from "../businesses/entities/business.entity";
import { Company } from "../companies/entities/company.entity";
import { CompaniesService } from "../companies/services/companies.service";
import { InvoiceItem } from "../invoices/entities/invoice-item.entity";
import { Invoice } from "../invoices/entities/invoice.entity";
@Injectable()
export class BillsService {
@@ -33,7 +33,7 @@ export class BillsService {
const bill = em.create(Bill, { type: BillType.WATER_BILL, business });
em.persist(bill);
const dueDate = dayjs().add(dueDays, 'day').toDate();
const dueDate = dayjs().add(dueDays, "day").toDate();
const uniqueCompanyIds = [...new Set(values.map((v) => v.companyId))];
const companies = await this.companiesService.findByIds(uniqueCompanyIds, em);
@@ -59,7 +59,7 @@ export class BillsService {
});
const invoiceItem = em.create(InvoiceItem, {
name: 'قبض آب',
name: "قبض آب",
count: value.waterUsage,
unitPrice: new Decimal(waterRate),
discount: new Decimal(0),
@@ -90,7 +90,7 @@ export class BillsService {
const bill = em.create(Bill, { type: BillType.MONTHLY_CHARGE, business });
em.persist(bill);
const dueDate = dayjs().add(dueDays, 'day').toDate();
const dueDate = dayjs().add(dueDays, "day").toDate();
const companies = await this.companiesService.findAllBybusinessId(business.id, em);
@@ -110,7 +110,7 @@ export class BillsService {
});
const invoiceItem = em.create(InvoiceItem, {
name: 'قبض شارژ',
name: "قبض شارژ",
count: 1,
unitPrice: subtotal,
discount: new Decimal(0),
@@ -142,10 +142,7 @@ export class BillsService {
}
async findOne(id: string, businessId: string) {
const bill = await this.billRepository.findOne(
{ id, business: { id: businessId } },
{ populate: ["invoices"] },
);
const bill = await this.billRepository.findOne({ id, business: { id: businessId } }, { populate: ["invoices"] });
if (!bill) {
throw new BadRequestException("Bill not found");
}