Skip to content

[comp] Production Deploy #2692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marfuen merged 2 commits into from
Apr 29, 2026
Merged

[comp] Production Deploy #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60de920
chore: merge release v3.34.2 back to main [skip ci]
github-actions[bot] Apr 28, 2026
5e30bfb
feat: add clear view of maps between policies<>controls<>tasks
github-actions[bot] Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 220 additions & 7 deletions apps/api/src/policies/policies.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,17 @@ jest.mock('@db', () => ({
FindingType: {
soc2: 'soc2',
iso27001: 'iso27001',
hipaa: 'hipaa',
gdpr: 'gdpr',
nist: 'nist',
},
FindingStatus: {
open: 'open',
closed: 'closed',
},
PhaseCompletionType: {},
TimelinePhaseStatus: {},
TimelineStatus: {},
}));

jest.mock('@trigger.dev/sdk', () => ({
Expand Down Expand Up @@ -394,14 +404,39 @@ describe('PoliciesController', () => {
});

describe('getPolicyControls', () => {
it('should return mapped and all controls', async () => {
it('returns mapped and all controls with framework names derived from requirementsMapped', async () => {
const { db } = require('@db');
const mappedControls = [
{ id: 'ctrl_1', name: 'Control 1', description: 'desc' },
{
id: 'ctrl_1',
name: 'Control 1',
description: 'desc',
requirementsMapped: [
{
frameworkInstance: {
id: 'fi_1',
framework: { id: 'fw_soc2', name: 'SOC 2' },
customFramework: null,
},
},
{
frameworkInstance: {
id: 'fi_2',
framework: null,
customFramework: { id: 'cfw_1', name: 'Internal Policy' },
},
},
],
},
];
const allControls = [
{ id: 'ctrl_1', name: 'Control 1', description: 'desc' },
{ id: 'ctrl_2', name: 'Control 2', description: 'desc2' },
...mappedControls,
{
id: 'ctrl_2',
name: 'Control 2',
description: 'desc2',
requirementsMapped: [],
},
];
db.policy.findFirst.mockResolvedValue({
id: 'pol_1',
Expand All @@ -415,12 +450,80 @@ describe('PoliciesController', () => {
mockAuthContext,
);

expect(result.mappedControls).toEqual(mappedControls);
expect(result.allControls).toEqual(allControls);
expect(result.mappedControls).toEqual([
{
id: 'ctrl_1',
name: 'Control 1',
description: 'desc',
frameworks: [
{ id: 'fw_soc2', name: 'SOC 2' },
{ id: 'cfw_1', name: 'Internal Policy' },
],
},
]);
expect(result.allControls).toEqual([
{
id: 'ctrl_1',
name: 'Control 1',
description: 'desc',
frameworks: [
{ id: 'fw_soc2', name: 'SOC 2' },
{ id: 'cfw_1', name: 'Internal Policy' },
],
},
{
id: 'ctrl_2',
name: 'Control 2',
description: 'desc2',
frameworks: [],
},
]);
expect(result.authType).toBe('session');
});

it('should return empty mappedControls when policy not found', async () => {
it('dedupes frameworks when the same FrameworkInstance is reachable via multiple RequirementMaps', async () => {
const { db } = require('@db');
const controls = [
{
id: 'ctrl_1',
name: 'Control 1',
description: 'desc',
requirementsMapped: [
{
frameworkInstance: {
id: 'fi_1',
framework: { id: 'fw_soc2', name: 'SOC 2' },
customFramework: null,
},
},
{
frameworkInstance: {
id: 'fi_1',
framework: { id: 'fw_soc2', name: 'SOC 2' },
customFramework: null,
},
},
],
},
];
db.policy.findFirst.mockResolvedValue({
id: 'pol_1',
controls,
});
db.control.findMany.mockResolvedValue(controls);

const result = await controller.getPolicyControls(
'pol_1',
orgId,
mockAuthContext,
);

expect(result.mappedControls[0].frameworks).toEqual([
{ id: 'fw_soc2', name: 'SOC 2' },
]);
});

it('returns empty mappedControls when policy is not found', async () => {
const { db } = require('@db');
db.policy.findFirst.mockResolvedValue(null);
db.control.findMany.mockResolvedValue([]);
Expand All @@ -433,6 +536,33 @@ describe('PoliciesController', () => {

expect(result.mappedControls).toEqual([]);
});

it('scopes the requirementsMapped query to the caller organization', async () => {
const { db } = require('@db');
db.policy.findFirst.mockResolvedValue({ id: 'pol_1', controls: [] });
db.control.findMany.mockResolvedValue([]);

await controller.getPolicyControls('pol_1', orgId, mockAuthContext);

expect(db.policy.findFirst).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: 'pol_1', organizationId: orgId, archivedAt: null },
select: expect.objectContaining({
controls: expect.objectContaining({
where: { archivedAt: null },
select: expect.objectContaining({
requirementsMapped: expect.objectContaining({
where: {
archivedAt: null,
frameworkInstance: { organizationId: orgId },
},
}),
}),
}),
}),
}),
);
});
});

describe('addPolicyControls', () => {
Expand Down Expand Up @@ -724,4 +854,87 @@ describe('PoliciesController', () => {
expect(result.data).toEqual(mockResult);
});
});

describe('getPolicyEvidenceTasks', () => {
it('returns tasks grouped by control, excluding archived tasks', async () => {
const { db } = require('@db');
db.policy.findFirst.mockResolvedValue({
id: 'pol_1',
controls: [
{
id: 'ctl_1',
name: 'Access Controls',
tasks: [
{
id: 'tsk_1',
title: 'Enable 2FA',
status: 'in_progress',
frequency: 'monthly',
department: 'it',
automationStatus: 'MANUAL',
assigneeId: 'mem_1',
},
],
},
{
id: 'ctl_2',
name: 'Monitoring',
tasks: [],
},
],
});

const result = await controller.getPolicyEvidenceTasks(
'pol_1',
orgId,
mockAuthContext,
);

expect(db.policy.findFirst).toHaveBeenCalledWith({
where: { id: 'pol_1', organizationId: orgId, archivedAt: null },
select: expect.objectContaining({
id: true,
controls: expect.objectContaining({
where: { archivedAt: null, organizationId: orgId },
select: expect.objectContaining({
tasks: expect.objectContaining({
where: { archivedAt: null, organizationId: orgId },
}),
}),
}),
}),
});
expect(result.data).toEqual([
{
control: { id: 'ctl_1', name: 'Access Controls' },
tasks: [
{
id: 'tsk_1',
title: 'Enable 2FA',
status: 'in_progress',
frequency: 'monthly',
department: 'it',
automationStatus: 'MANUAL',
assigneeId: 'mem_1',
},
],
},
{
control: { id: 'ctl_2', name: 'Monitoring' },
tasks: [],
},
]);
expect(result.count).toBe(1);
expect(result.authType).toBe('session');
});

it('throws NotFoundException when policy is not in caller org', async () => {
const { db } = require('@db');
db.policy.findFirst.mockResolvedValue(null);

await expect(
controller.getPolicyEvidenceTasks('pol_404', orgId, mockAuthContext),
).rejects.toThrow('Policy not found');
});
});
});
Loading
Loading