From 6e28cc3146d711426690083943d3d573f78854e8 Mon Sep 17 00:00:00 2001 From: DeathKaioken Date: Sun, 18 Jan 2026 23:08:36 +0100 Subject: [PATCH] fix: contract gen --- .../documents/ContractUploadController.js | 13 +++++++++- .../documents/UserDocumentRepository.js | 24 +++++++++++++------ routes/getRoutes.js | 2 ++ routes/postRoutes.js | 1 + 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/controller/documents/ContractUploadController.js b/controller/documents/ContractUploadController.js index 917b0d2..e6533c4 100644 --- a/controller/documents/ContractUploadController.js +++ b/controller/documents/ContractUploadController.js @@ -35,6 +35,9 @@ class ContractUploadController { try { const signatureMeta = normalizeSignature(signatureImage); const repo = new UserDocumentRepository(unitOfWork); + + // NOTE: this DB insert is only a TEMP storage of the raw signature image. + // The contract PDF embeds the signature from `signatureMeta.base64` during PDF generation. if (signatureMeta) { await repo.insertDocument({ userId, @@ -85,6 +88,8 @@ class ContractUploadController { } // Cleanup standalone signature record after contracts are saved + // NOTE: deleting the signature row here DOES NOT remove it from the generated contract PDF. + // The PDF already contains the signature pixels and is uploaded to object storage. if (signatureMeta) { await repo.deleteSignatureDocumentsForUser(userId); logger.info('[ContractUploadController] signature cleanup completed for user', { userId }); @@ -111,6 +116,8 @@ class ContractUploadController { try { const signatureMeta = normalizeSignature(signatureImage); const repo = new UserDocumentRepository(unitOfWork); + + // NOTE: TEMP storage only; the PDF embeds the signature from `signatureMeta.base64`. if (signatureMeta) { await repo.insertDocument({ userId, @@ -160,11 +167,15 @@ class ContractUploadController { throw new Error('No active documents are available at this moment.'); } - await unitOfWork.commit(); + // IMPORTANT: cleanup must happen BEFORE commit() because commit closes/nulls the connection. + // NOTE: cleanup only removes the temporary signature row, not the signature embedded in PDFs. if (signatureMeta) { await repo.deleteSignatureDocumentsForUser(userId); logger.info('[ContractUploadController] signature cleanup completed for company user', { userId }); } + + await unitOfWork.commit(); + logger.info(`[ContractUploadController] uploadCompanyContract success for userId: ${userId}`); res.json({ success: true, uploads, skipped, downloadUrls: uploads.map(u => u.url || null) }); } catch (error) { diff --git a/repositories/documents/UserDocumentRepository.js b/repositories/documents/UserDocumentRepository.js index b589494..2cdb8a4 100644 --- a/repositories/documents/UserDocumentRepository.js +++ b/repositories/documents/UserDocumentRepository.js @@ -5,6 +5,16 @@ class UserDocumentRepository { this.unitOfWork = unitOfWork; } + _getConn() { + const conn = this.unitOfWork && this.unitOfWork.connection; + if (!conn) { + const err = new Error('UnitOfWork connection is not available (was commit()/rollback() already called?)'); + err.code = 'UOW_CONNECTION_MISSING'; + throw err; + } + return conn; + } + async insertDocument({ userId, documentType, @@ -16,7 +26,7 @@ class UserDocumentRepository { mimeType }) { logger.info('UserDocumentRepository.insertDocument:start', { userId, documentType, originalFilename }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); const query = ` INSERT INTO user_documents ( user_id, document_type, contract_type, object_storage_id, signatureBase64, @@ -44,7 +54,7 @@ class UserDocumentRepository { async insertIdMetadata({ userDocumentId, idType, idNumber, expiryDate }) { logger.info('UserDocumentRepository.insertIdMetadata:start', { userDocumentId, idType, idNumber }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { await conn.query( `INSERT INTO user_id_documents (user_document_id, id_type, id_number, expiry_date) @@ -70,7 +80,7 @@ class UserDocumentRepository { originalFilenameBack }) { logger.info('UserDocumentRepository.insertIdDocument:start', { userId, documentType, idType, idNumber }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { await conn.query( `INSERT INTO user_id_documents ( @@ -98,7 +108,7 @@ class UserDocumentRepository { async getDocumentsForUser(userId) { logger.info('UserDocumentRepository.getDocumentsForUser:start', { userId }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { const [rows] = await conn.query( `SELECT * FROM user_documents WHERE user_id = ?`, @@ -114,7 +124,7 @@ class UserDocumentRepository { async getIdDocumentsForUser(userId) { logger.info('UserDocumentRepository.getIdDocumentsForUser:start', { userId }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { const [rows] = await conn.query( `SELECT * FROM user_id_documents WHERE user_id = ?`, @@ -130,7 +140,7 @@ class UserDocumentRepository { async getAllObjectStorageIdsForUser(userId) { logger.info('UserDocumentRepository.getAllObjectStorageIdsForUser:start', { userId }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { // Get object_storage_id from user_documents const [docRows] = await conn.query( @@ -152,7 +162,7 @@ class UserDocumentRepository { async deleteSignatureDocumentsForUser(userId) { logger.info('UserDocumentRepository.deleteSignatureDocumentsForUser:start', { userId }); - const conn = this.unitOfWork.connection; + const conn = this._getConn(); try { const [result] = await conn.query( `DELETE FROM user_documents WHERE user_id = ? AND document_type = 'signature'`, diff --git a/routes/getRoutes.js b/routes/getRoutes.js index 7ac9f8f..de114de 100644 --- a/routes/getRoutes.js +++ b/routes/getRoutes.js @@ -157,5 +157,7 @@ router.get('/news/active', NewsController.listActive); router.get('/invoices/mine', authMiddleware, InvoiceController.listMine); router.get('/admin/invoices', authMiddleware, adminOnly, InvoiceController.adminList); +// NOTE: Contract signing uses UnitOfWork; any DB cleanup must happen before commit() closes the connection. + // export module.exports = router; \ No newline at end of file diff --git a/routes/postRoutes.js b/routes/postRoutes.js index c3ff547..5dbaeb1 100644 --- a/routes/postRoutes.js +++ b/routes/postRoutes.js @@ -68,6 +68,7 @@ router.post('/document-templates/:id/revise', authMiddleware, upload.single('fil router.post('/document-templates/:id/generate-pdf-with-signature', authMiddleware, DocumentTemplateController.generatePdfWithSignature); // Document uploads (moved from routes/documents.js) +// NOTE: contract upload flow stores a temporary signature row and must delete it BEFORE UnitOfWork.commit(). router.post('/upload/personal-id', authMiddleware, upload.fields([{ name: 'front', maxCount: 1 }, { name: 'back', maxCount: 1 }]), PersonalDocumentController.uploadPersonalId); router.post('/upload/company-id', authMiddleware, upload.fields([{ name: 'front', maxCount: 1 }, { name: 'back', maxCount: 1 }]), CompanyDocumentController.uploadCompanyId); router.post('/upload/contract/personal', authMiddleware, upload.single('contract'), ContractUploadController.uploadPersonalContract);