Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,11 @@ describe('parseStatusFile', () => {
await expect(parseStatusFile('/path/to/status.json')).rejects.toThrow('Invalid status.json');
});

it('rejects null phase entry', async () => {
it('accepts null phase entry (skipped phase)', async () => {
mockedReadFile.mockResolvedValue(JSON.stringify({ ...minimalValid(), phases: { architecture: null } }));

await expect(parseStatusFile('/path/to/status.json')).rejects.toThrow('Invalid status.json');
const result = await parseStatusFile('/path/to/status.json');
expect(result.phases).toEqual({ architecture: null });
});

it('rejects phase that is not an object', async () => {
Expand All @@ -409,6 +410,18 @@ describe('parseStatusFile', () => {
await expect(parseStatusFile('/path/to/status.json')).rejects.toThrow('Invalid status.json');
});

it('accepts phase with null criticality (skipped review)', async () => {
mockJson({
...minimalValid(),
phases: {
holisticReview: { status: 'skipped', criticality: null },
},
});

const result = await parseStatusFile('/path/to/status.json');
expect(result.phases.holisticReview).toEqual({ status: 'skipped', criticality: null });
});

it('rejects phase with invalid criticality', async () => {
mockJson({
...minimalValid(),
Expand Down
14 changes: 9 additions & 5 deletions packages/factory/src/server/adapters/status-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,24 @@ function isValidPhaseDecisionMap(value: unknown): boolean {
return true;
}

function isNullOrValid(value: unknown, check: (v: unknown) => boolean): boolean {
return value === null || check(value);
}

function isValidPhaseEntry(phase: unknown): boolean {
if (!isRecord(phase)) {
return false;
}
if ('status' in phase && !isValidPhaseStatus(phase.status)) {
if ('status' in phase && !isNullOrValid(phase.status, isValidPhaseStatus)) {
return false;
}
if ('criticality' in phase && !isValidCriticality(phase.criticality)) {
if ('criticality' in phase && !isNullOrValid(phase.criticality, isValidCriticality)) {
return false;
}
if ('finalCriticality' in phase && !isValidCriticality(phase.finalCriticality)) {
if ('finalCriticality' in phase && !isNullOrValid(phase.finalCriticality, isValidCriticality)) {
return false;
}
if ('aggregatedCriticality' in phase && !isValidCriticality(phase.aggregatedCriticality)) {
if ('aggregatedCriticality' in phase && !isNullOrValid(phase.aggregatedCriticality, isValidCriticality)) {
return false;
}
return true;
Expand All @@ -281,7 +285,7 @@ function isValidPhasesObject(value: unknown): boolean {
return false;
}
for (const phase of Object.values(value)) {
if (phase === undefined) {
if (phase === undefined || phase === null) {
continue;
}
if (!isValidPhaseEntry(phase)) {
Expand Down