@hed-hog/finance 0.0.274 → 0.0.276

package/hedhog/frontend/messages/en.json

@@ -100,11 +100,11 @@
     }
   },
   "PersonFieldWithCreate": {
-    "sheet": {
-      "title": "New {entityLabel}",
-      "description": "Only name and type are required. You can complete the remaining fields now or later.",
-      "descriptionIndividualOnly": "Only name is required. You can complete the remaining fields now or later."
-    },
+    "sheet": {
+      "title": "New {entityLabel}",
+      "description": "Only name and type are required. You can complete the remaining fields now or later.",
+      "descriptionIndividualOnly": "Only name is required. You can complete the remaining fields now or later."
+    },
     "common": {
       "select": "Select"
     },
@@ -928,6 +928,8 @@
     "statement": {
       "title": "Statement Transactions",
       "description": "Select a transaction to reconcile",
+      "reconciledTitle": "Reconciled transactions",
+      "reconciledDescription": "You can undo reconciliations when needed.",
       "emptyTitle": "All reconciled!",
       "emptyDescription": "There are no pending transactions."
     },
@@ -941,6 +943,14 @@
     "ready": {
       "title": "Ready to Reconcile",
       "description": "Transaction and title selected. Click \"Reconcile\" to link them."
+    },
+    "unreconcile": {
+      "action": "Unreconcile",
+      "title": "Undo reconciliation",
+      "description": "Do you really want to undo this reconciliation? The transaction will return to pending.",
+      "confirm": "Unreconcile",
+      "success": "Reconciliation undone successfully",
+      "error": "Could not undo reconciliation"
     }
   },
   "StatementsPage": {

package/hedhog/frontend/messages/pt.json

@@ -100,11 +100,11 @@
     }
   },
   "PersonFieldWithCreate": {
-    "sheet": {
-      "title": "Novo {entityLabel}",
-      "description": "Apenas nome e tipo são obrigatórios. Você pode completar os demais dados agora ou depois.",
-      "descriptionIndividualOnly": "Apenas nome é obrigatório. Você pode completar os demais dados agora ou depois."
-    },
+    "sheet": {
+      "title": "Novo {entityLabel}",
+      "description": "Apenas nome e tipo são obrigatórios. Você pode completar os demais dados agora ou depois.",
+      "descriptionIndividualOnly": "Apenas nome é obrigatório. Você pode completar os demais dados agora ou depois."
+    },
     "common": {
       "select": "Selecione"
     },
@@ -928,6 +928,8 @@
     "statement": {
       "title": "Transações do Extrato",
       "description": "Selecione uma transação para conciliar",
+      "reconciledTitle": "Transações conciliadas",
+      "reconciledDescription": "Você pode desfazer conciliações quando necessário.",
       "emptyTitle": "Tudo conciliado!",
       "emptyDescription": "Não há transações pendentes."
     },
@@ -941,6 +943,14 @@
     "ready": {
       "title": "Pronto para Conciliar",
       "description": "Transação e título selecionados. Clique em \"Conciliar\" para vincular."
+    },
+    "unreconcile": {
+      "action": "Desconciliar",
+      "title": "Desfazer conciliação",
+      "description": "Deseja realmente desfazer esta conciliação? A transação voltará para pendente.",
+      "confirm": "Desconciliar",
+      "success": "Conciliação desfeita com sucesso",
+      "error": "Não foi possível desfazer a conciliação"
     }
   },
   "StatementsPage": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/finance",
-  "version": "0.0.274",
+  "version": "0.0.276",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -9,14 +9,14 @@
     "@nestjs/core": "^11",
     "@nestjs/jwt": "^11",
     "@nestjs/mapped-types": "*",
-    "@hed-hog/contact": "0.0.274",
-    "@hed-hog/api-prisma": "0.0.5",
-    "@hed-hog/api-pagination": "0.0.6",
+    "@hed-hog/contact": "0.0.276",
     "@hed-hog/api": "0.0.4",
-    "@hed-hog/api-types": "0.0.1",
-    "@hed-hog/tag": "0.0.274",
+    "@hed-hog/api-prisma": "0.0.5",
+    "@hed-hog/tag": "0.0.276",
     "@hed-hog/api-locale": "0.0.13",
-    "@hed-hog/core": "0.0.274"
+    "@hed-hog/api-types": "0.0.1",
+    "@hed-hog/api-pagination": "0.0.6",
+    "@hed-hog/core": "0.0.276"
   },
   "exports": {
     ".": {

package/src/dto/create-bank-reconciliation.dto.ts

@@ -0,0 +1,24 @@
+import { Type } from 'class-transformer';
+import { IsInt, IsOptional, IsString } from 'class-validator';
+
+export class CreateBankReconciliationDto {
+  @Type(() => Number)
+  @IsInt()
+  title_id: number;
+
+  @Type(() => Number)
+  @IsInt()
+  installment_id: number;
+
+  @Type(() => Number)
+  @IsInt()
+  bank_statement_line_id: number;
+
+  @IsOptional()
+  @IsString()
+  payment_channel?: string;
+
+  @IsOptional()
+  @IsString()
+  description?: string;
+}

package/src/finance-statements.controller.ts

@@ -13,6 +13,7 @@ import {
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { Response } from 'express';
+import { CreateBankReconciliationDto } from './dto/create-bank-reconciliation.dto';
 import { CreateBankStatementAdjustmentDto } from './dto/create-bank-statement-adjustment.dto';
 import { FinanceService } from './finance.service';
 
@@ -49,6 +50,19 @@ export class FinanceStatementsController {
     return this.financeService.getBankReconciliationSummary(parsedBankAccountId);
   }
 
+  @Post('bank-reconciliations')
+  async createBankReconciliation(
+    @Body() data: CreateBankReconciliationDto,
+    @Locale() locale: string,
+    @User() user,
+  ) {
+    return this.financeService.createBankReconciliation(
+      data,
+      locale,
+      user?.id,
+    );
+  }
+
   @Get('statements/export')
   async exportBankStatementsCsv(
     @Query('bank_account_id') bankAccountId: string,

package/src/finance.module.ts

@@ -1,43 +1,43 @@
-import { LocaleModule } from '@hed-hog/api-locale';
-import { PaginationModule } from '@hed-hog/api-pagination';
-import { PrismaModule } from '@hed-hog/api-prisma';
-import { AiModule, FileModule } from '@hed-hog/core';
-import { forwardRef, Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-import { FinanceAuditLogsController } from './finance-audit-logs.controller';
-import { FinanceBankAccountsController } from './finance-bank-accounts.controller';
-import { FinanceCategoriesController } from './finance-categories.controller';
-import { FinanceCollectionsController } from './finance-collections.controller';
-import { FinanceCostCentersController } from './finance-cost-centers.controller';
-import { FinanceDataController } from './finance-data.controller';
-import { FinanceInstallmentsController } from './finance-installments.controller';
-import { FinancePeriodCloseController } from './finance-period-close.controller';
-import { FinanceStatementsController } from './finance-statements.controller';
-import { FinanceTransfersController } from './finance-transfers.controller';
-import { FinanceService } from './finance.service';
-
-@Module({
-  imports: [
-    ConfigModule.forRoot(),
-    forwardRef(() => PaginationModule),
-    forwardRef(() => PrismaModule),
-    forwardRef(() => LocaleModule),
-    forwardRef(() => AiModule),
-    forwardRef(() => FileModule),
-  ],
-  controllers: [
-    FinanceAuditLogsController,
-    FinanceDataController,
-    FinanceInstallmentsController,
-    FinanceBankAccountsController,
-    FinanceCategoriesController,
-    FinanceCollectionsController,
-    FinanceCostCentersController,
-    FinancePeriodCloseController,
-    FinanceStatementsController,
-    FinanceTransfersController,
-  ],
-  providers: [FinanceService],
-  exports: [FinanceService],
-})
-export class FinanceModule {}
+import { LocaleModule } from '@hed-hog/api-locale';
+import { PaginationModule } from '@hed-hog/api-pagination';
+import { PrismaModule } from '@hed-hog/api-prisma';
+import { AiModule, FileModule } from '@hed-hog/core';
+import { forwardRef, Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { FinanceAuditLogsController } from './finance-audit-logs.controller';
+import { FinanceBankAccountsController } from './finance-bank-accounts.controller';
+import { FinanceCategoriesController } from './finance-categories.controller';
+import { FinanceCollectionsController } from './finance-collections.controller';
+import { FinanceCostCentersController } from './finance-cost-centers.controller';
+import { FinanceDataController } from './finance-data.controller';
+import { FinanceInstallmentsController } from './finance-installments.controller';
+import { FinancePeriodCloseController } from './finance-period-close.controller';
+import { FinanceStatementsController } from './finance-statements.controller';
+import { FinanceTransfersController } from './finance-transfers.controller';
+import { FinanceService } from './finance.service';
+
+@Module({
+  imports: [
+    ConfigModule.forRoot(),
+    forwardRef(() => PaginationModule),
+    forwardRef(() => PrismaModule),
+    forwardRef(() => LocaleModule),
+    forwardRef(() => AiModule),
+    forwardRef(() => FileModule),
+  ],
+  controllers: [
+    FinanceAuditLogsController,
+    FinanceDataController,
+    FinanceInstallmentsController,
+    FinanceBankAccountsController,
+    FinanceCategoriesController,
+    FinanceCollectionsController,
+    FinanceCostCentersController,
+    FinancePeriodCloseController,
+    FinanceStatementsController,
+    FinanceTransfersController,
+  ],
+  providers: [FinanceService],
+  exports: [FinanceService],
+})
+export class FinanceModule {}

package/src/finance.service.ts

@@ -18,6 +18,7 @@ import {
 import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 import { CreateBankAccountDto } from './dto/create-bank-account.dto';
+import { CreateBankReconciliationDto } from './dto/create-bank-reconciliation.dto';
 import { CreateBankStatementAdjustmentDto } from './dto/create-bank-statement-adjustment.dto';
 import { CreateCostCenterDto } from './dto/create-cost-center.dto';
 import { CreateFinanceCategoryDto } from './dto/create-finance-category.dto';
@@ -2742,6 +2743,21 @@ export class FinanceService {
             id: true,
           },
         },
+        bank_reconciliation: {
+          where: {
+            status: {
+              in: ['pending', 'reconciled', 'adjusted'],
+            },
+          },
+          select: {
+            id: true,
+            settlement_id: true,
+          },
+          orderBy: {
+            id: 'desc',
+          },
+          take: 1,
+        },
       },
       orderBy: [{ posted_date: 'desc' }, { id: 'desc' }],
     });
@@ -2754,9 +2770,111 @@ export class FinanceService {
       valor: this.fromCents(statement.amount_cents),
       tipo: statement.amount_cents >= 0 ? 'entrada' : 'saida',
       statusConciliacao: this.mapStatementStatusToPt(statement.status),
+      reconciliationId: statement.bank_reconciliation[0]?.id
+        ? String(statement.bank_reconciliation[0].id)
+        : null,
+      settlementId: statement.bank_reconciliation[0]?.settlement_id
+        ? String(statement.bank_reconciliation[0].settlement_id)
+        : null,
     }));
   }
 
+  async createBankReconciliation(
+    data: CreateBankReconciliationDto,
+    locale: string,
+    userId?: number,
+  ) {
+    const installment = await this.prisma.financial_installment.findUnique({
+      where: {
+        id: data.installment_id,
+      },
+      select: {
+        id: true,
+        title_id: true,
+      },
+    });
+
+    if (!installment) {
+      throw new NotFoundException('Installment not found');
+    }
+
+    if (installment.title_id !== data.title_id) {
+      throw new ConflictException('Installment does not belong to informed title');
+    }
+
+    const title = await this.prisma.financial_title.findUnique({
+      where: {
+        id: data.title_id,
+      },
+      select: {
+        id: true,
+        title_type: true,
+      },
+    });
+
+    if (!title) {
+      throw new NotFoundException(
+        getLocaleText(
+          'itemNotFound',
+          locale,
+          `Financial title with ID ${data.title_id} not found`,
+        ).replace('{{item}}', 'Financial title'),
+      );
+    }
+
+    const statementLine = await this.prisma.bank_statement_line.findUnique({
+      where: {
+        id: data.bank_statement_line_id,
+      },
+      select: {
+        id: true,
+        bank_account_id: true,
+        posted_date: true,
+        amount_cents: true,
+        description: true,
+        status: true,
+      },
+    });
+
+    if (!statementLine) {
+      throw new NotFoundException('Bank statement line not found');
+    }
+
+    if (!['pending', 'imported'].includes(statementLine.status)) {
+      throw new ConflictException('Bank statement line already reconciled');
+    }
+
+    const isIncoming = statementLine.amount_cents >= 0;
+
+    if (isIncoming && title.title_type !== 'receivable') {
+      throw new ConflictException(
+        'Incoming bank statements can only be reconciled with receivable titles',
+      );
+    }
+
+    if (!isIncoming && title.title_type !== 'payable') {
+      throw new ConflictException(
+        'Outgoing bank statements can only be reconciled with payable titles',
+      );
+    }
+
+    return this.settleTitleInstallment(
+      title.id,
+      {
+        installment_id: installment.id,
+        amount: this.fromCents(Math.abs(statementLine.amount_cents)),
+        settled_at: statementLine.posted_date.toISOString(),
+        bank_account_id: statementLine.bank_account_id,
+        bank_statement_line_id: statementLine.id,
+        payment_channel: data.payment_channel || 'transferencia',
+        description: data.description?.trim() || statementLine.description,
+      },
+      title.title_type as TitleType,
+      locale,
+      userId,
+    );
+  }
+
   async getBankReconciliationSummary(bankAccountId: number) {
     const pendingStatements = await this.prisma.bank_statement_line.findMany({
       where: {

package/src/index.ts

@@ -1,14 +1,14 @@
-export * from './dto/create-financial-title.dto';
-export * from './finance-audit-logs.controller';
-export * from './finance-bank-accounts.controller';
-export * from './finance-categories.controller';
-export * from './finance-collections.controller';
-export * from './finance-cost-centers.controller';
-export * from './finance-data.controller';
-export * from './finance-installments.controller';
-export * from './finance-period-close.controller';
-export * from './finance-statements.controller';
-export * from './finance-transfers.controller';
-export * from './finance.module';
-export * from './finance.service';
-
+export * from './dto/create-financial-title.dto';
+export * from './finance-audit-logs.controller';
+export * from './finance-bank-accounts.controller';
+export * from './finance-categories.controller';
+export * from './finance-collections.controller';
+export * from './finance-cost-centers.controller';
+export * from './finance-data.controller';
+export * from './finance-installments.controller';
+export * from './finance-period-close.controller';
+export * from './finance-statements.controller';
+export * from './finance-transfers.controller';
+export * from './finance.module';
+export * from './finance.service';
+