mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-28 14:50:57 +00:00
merge conflict
This commit is contained in:
@@ -7,7 +7,7 @@ import {
|
||||
} from '@nestjs/common';
|
||||
import { InjectDataSource } from '@nestjs/typeorm';
|
||||
import { DataSource } from 'typeorm';
|
||||
import { insertWithGeneratedReference } from '@edr/api-common';
|
||||
import { insertWithGeneratedReference, logCtx } from '@edr/api-common';
|
||||
|
||||
import { YardCountry } from '@edr/types';
|
||||
//
|
||||
@@ -820,6 +820,17 @@ export class ContractsService {
|
||||
contract.status = 'EXPIRED';
|
||||
}
|
||||
}
|
||||
// Entry state for every contract flow (submit, approve, sign, suspend…) —
|
||||
// see the equivalent in BookingsService.findById.
|
||||
logCtx(
|
||||
{
|
||||
id: contract.id,
|
||||
reference: contract.reference,
|
||||
statusAtEntry: contract.status,
|
||||
companyId: contract.companyId,
|
||||
},
|
||||
{ path: "contract" },
|
||||
);
|
||||
|
||||
if (contract.files && contract.files.length > 0) {
|
||||
contract.files = await Promise.all(
|
||||
|
||||
Reference in New Issue
Block a user