Skip to content

Commit 0ef297d

Browse files
[dev] [carhartlewis] lewis/comp-form-type-finding-fix (#2159)
* test(finding-notifier): add unit tests for FindingNotifierService * feat(taskEvidence): add mapping function for evidence form type conversion * chore: update dependencies and improve evidence form handling * feat(company): add @trycompai/db dependency and refactor evidence form type functions --------- Co-authored-by: Lewis Carhart <lewis@trycomp.ai>
1 parent 5d4c597 commit 0ef297d

21 files changed

Lines changed: 1371 additions & 386 deletions

File tree

apps/api/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"prettier": "^3.5.3",
8383
"source-map-support": "^0.5.21",
8484
"supertest": "^7.0.0",
85+
"trigger.dev": "4.0.6",
8586
"ts-jest": "^29.2.5",
8687
"ts-loader": "^9.5.2",
8788
"ts-node": "^10.9.2",
@@ -111,9 +112,9 @@
111112
"db:getschema": "node ../../packages/db/scripts/combine-schemas.js && cp ../../packages/db/dist/schema.prisma prisma/schema.prisma",
112113
"db:migrate": "cd ../../packages/db && bunx prisma migrate dev && cd ../../apps/api",
113114
"deploy:trigger-prod": "npx trigger.dev@4.0.6 deploy",
114-
"dev": "bunx concurrently --kill-others --names \"nest,trigger\" --prefix-colors \"green,blue\" \"nest start --watch\" \"bunx trigger.dev@4.0.6 dev\"",
115+
"dev": "bunx concurrently --kill-others --names \"nest,trigger\" --prefix-colors \"green,blue\" \"nest start --watch\" \"trigger dev\"",
115116
"dev:nest": "nest start --watch",
116-
"dev:trigger": "bunx trigger.dev@4.0.6 dev",
117+
"dev:trigger": "trigger dev",
117118
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
118119
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
119120
"prebuild": "bun run db:generate",

apps/api/src/evidence-forms/evidence-form-type-map.ts

Lines changed: 0 additions & 43 deletions
This file was deleted.

apps/api/src/evidence-forms/evidence-forms.service.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { AttachmentsService } from '@/attachments/attachments.service';
22
import type { AuthContext } from '@/auth/types';
3-
import { db, type EvidenceFormType as DbEvidenceFormType } from '@trycompai/db';
3+
import { db, EvidenceFormType as DbEvidenceFormType } from '@trycompai/db';
4+
import {
5+
toDbEvidenceFormType,
6+
toExternalEvidenceFormType,
7+
} from '@comp/company';
48
import {
59
BadRequestException,
610
Injectable,
@@ -16,10 +20,6 @@ import {
1620
type EvidenceFormFieldDefinition,
1721
type EvidenceFormType,
1822
} from './evidence-forms.definitions';
19-
import {
20-
toDbEvidenceFormType,
21-
toExternalEvidenceFormType,
22-
} from './evidence-form-type-map';
2323

2424
const listQuerySchema = z.object({
2525
search: z.string().trim().optional(),

apps/api/src/findings/findings.service.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ import {
77
} from '@nestjs/common';
88
import {
99
db,
10-
type EvidenceFormType as DbEvidenceFormType,
10+
EvidenceFormType as DbEvidenceFormType,
1111
FindingStatus,
1212
FindingType,
1313
} from '@trycompai/db';
14+
import {
15+
toDbEvidenceFormType,
16+
toExternalEvidenceFormType,
17+
} from '@comp/company';
1418
import { CreateFindingDto } from './dto/create-finding.dto';
1519
import { UpdateFindingDto } from './dto/update-finding.dto';
1620
import { FindingAuditService } from './finding-audit.service';
1721
import { FindingNotifierService } from './finding-notifier.service';
1822
import { type EvidenceFormType } from '@/evidence-forms/evidence-forms.definitions';
19-
import {
20-
toDbEvidenceFormType,
21-
toExternalEvidenceFormType,
22-
} from '@/evidence-forms/evidence-form-type-map';
2323

2424
@Injectable()
2525
export class FindingsService {

apps/app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
"postcss": "^8.5.4",
146146
"raw-loader": "^4.0.2",
147147
"tailwindcss": "^4.1.8",
148+
"trigger.dev": "4.0.6",
148149
"typescript": "^5.8.3",
149150
"vite-tsconfig-paths": "^5.1.4",
150151
"vitest": "^3.2.4"
@@ -170,7 +171,7 @@
170171
"db:getschema": "node ../../packages/db/scripts/combine-schemas.js && cp ../../packages/db/dist/schema.prisma prisma/schema.prisma",
171172
"db:migrate": "cd ../../packages/db && bunx prisma migrate dev && cd ../../apps/app",
172173
"deploy:trigger-prod": "npx trigger.dev@4.0.6 deploy",
173-
"dev": "bun i && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"bunx trigger.dev@4.0.6 dev\"",
174+
"dev": "bun i && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"trigger dev\"",
174175
"lint": "eslint . && prettier --check .",
175176
"prebuild": "bun run db:generate",
176177
"postinstall": "prisma generate --schema=./prisma/schema.prisma || exit 0",

0 commit comments

Comments
 (0)