update: the invoice service
This commit is contained in:
@@ -21,7 +21,7 @@ import { SmsService } from "../../utils/providers/sms.service";
|
||||
import { Wallet } from "../../wallets/entities/wallet.entity";
|
||||
import { WalletsService } from "../../wallets/providers/wallets.service";
|
||||
import { INVOICE } from "../constants";
|
||||
import { CreateInvoiceDto } from "../DTO/create-invoice.dto";
|
||||
import { CreateInvoiceDto, InvoiceItemDto } from "../DTO/create-invoice.dto";
|
||||
import { InvoicesSearchQueryDto, UserInvoicesSearchQueryDto } from "../DTO/invoices-search-query.dto";
|
||||
import { UpdateInvoiceDto } from "../DTO/update-invoice.dto";
|
||||
import { Invoice } from "../entities/invoice.entity";
|
||||
@@ -48,13 +48,41 @@ export class InvoicesService {
|
||||
|
||||
///********************************** */
|
||||
|
||||
private validateInvoiceItems(items: InvoiceItemDto[]): void {
|
||||
if (!items || items.length === 0) throw new BadRequestException(InvoiceMessage.ITEMS_REQUIRED);
|
||||
|
||||
items.forEach((item) => {
|
||||
if (item.unitPrice <= 0) throw new BadRequestException(InvoiceMessage.UNIT_PRICE_MUST_BE_POSITIVE);
|
||||
if (item.count <= 0) throw new BadRequestException(InvoiceMessage.COUNT_MUST_BE_POSITIVE);
|
||||
if (item.discount && (item.discount < 0 || item.discount > 100)) {
|
||||
throw new BadRequestException(InvoiceMessage.DISCOUNT_MUST_BE_BETWEEN_0_AND_100);
|
||||
}
|
||||
});
|
||||
}
|
||||
///********************************** */
|
||||
|
||||
private validateRecurringInvoice(createDto: CreateInvoiceDto): void {
|
||||
if (createDto.isRecurring) {
|
||||
if (!createDto.recurringPeriod) throw new BadRequestException(InvoiceMessage.RECURRING_PERIOD_REQUIRED);
|
||||
|
||||
if (createDto.maxRecurringCycles && createDto.maxRecurringCycles < 1) {
|
||||
throw new BadRequestException(InvoiceMessage.MAX_RECURRING_CYCLES_MUST_BE_POSITIVE);
|
||||
}
|
||||
}
|
||||
}
|
||||
///********************************** */
|
||||
|
||||
async createInvoiceAdmin(createDto: CreateInvoiceDto) {
|
||||
const queryRunner = this.dataSource.createQueryRunner();
|
||||
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
try {
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
this.validateInvoiceItems(createDto.items);
|
||||
|
||||
this.validateRecurringInvoice(createDto);
|
||||
|
||||
const invoiceItems = createDto.items.map((item) => ({
|
||||
name: item.name,
|
||||
count: item.count,
|
||||
@@ -66,14 +94,22 @@ export class InvoicesService {
|
||||
const totalPrice = invoiceItems.reduce((sum, item) => new Decimal(item.totalPrice).add(sum), new Decimal(0));
|
||||
const tax = totalPrice.mul(0.1);
|
||||
|
||||
if (totalPrice.lessThanOrEqualTo(0)) throw new BadRequestException(InvoiceMessage.TOTAL_PRICE_MUST_BE_POSITIVE);
|
||||
|
||||
const dueDate = dayjs().add(INVOICE.DUEDATE, "day").toDate();
|
||||
|
||||
const invoice = queryRunner.manager.create(this.invoiceRepository.target, {
|
||||
user: { id: createDto.userId },
|
||||
totalPrice: totalPrice.add(tax).toNumber(),
|
||||
originalPrice: totalPrice.add(tax).toNumber(),
|
||||
items: invoiceItems,
|
||||
tax: tax.toNumber(),
|
||||
dueDate,
|
||||
status: InvoiceStatus.PENDING,
|
||||
isRecurring: createDto.isRecurring,
|
||||
recurringPeriod: createDto.recurringPeriod,
|
||||
maxRecurringCycles: createDto.maxRecurringCycles,
|
||||
currentRecurringCycle: 0,
|
||||
});
|
||||
|
||||
await queryRunner.manager.save(this.invoiceRepository.target, invoice);
|
||||
@@ -104,6 +140,10 @@ export class InvoicesService {
|
||||
};
|
||||
} catch (error) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
this.logger.error(
|
||||
`Failed to create invoice: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
error instanceof Error ? error.stack : "",
|
||||
);
|
||||
throw error;
|
||||
} finally {
|
||||
await queryRunner.release();
|
||||
@@ -575,6 +615,8 @@ export class InvoicesService {
|
||||
},
|
||||
);
|
||||
|
||||
if (createDto?.isRecurring && !createDto?.recurringPeriod) throw new BadRequestException(InvoiceMessage.RECURRING_PERIOD_REQUIRED);
|
||||
|
||||
// Add to queue for recurring invoice if applicable
|
||||
if (createDto?.isRecurring && createDto?.recurringPeriod) {
|
||||
await this.invoiceQueue.add(
|
||||
|
||||
Reference in New Issue
Block a user