Skip to content
Open
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
6 changes: 3 additions & 3 deletions src/domain/usecases/RunPractitionersValidationUseCase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Future } from "$/domain/entities/generic/Future";
import { DataElement } from "$/domain/entities/DataElement";
import { ModuleRepository } from "$/domain/repositories/ModuleRepository";
import { QualityAnalysisRepository } from "$/domain/repositories/QualityAnalysisRepository";
import { convertToNumberOrZero, getCurrentSection } from "./common/utils";
import { convertToNumberOrZero, getCurrentSection, isNumerical } from "./common/utils";
import { Maybe } from "$/utils/ts-utils";
import { DataValue } from "$/domain/entities/DataValue";
import { DataValueRepository } from "$/domain/repositories/DataValueRepository";
Expand Down Expand Up @@ -304,8 +304,8 @@ export class RunPractitionersValidationUseCase {
if (!x_1) return undefined;
if (!x_2) return undefined;

const firstHasValue = convertToNumberOrZero(x_1.dataValue?.value) > 0;
const secondHasValue = convertToNumberOrZero(x_2.dataValue?.value) > 0;
const firstHasValue = isNumerical(x_1.dataValue?.value);
const secondHasValue = isNumerical(x_2.dataValue?.value);

if (x_1.dataValue && firstHasValue && !secondHasValue) {
return {
Expand Down
4 changes: 4 additions & 0 deletions src/domain/usecases/common/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ export function getIssues(
export function convertToNumberOrZero(value: Maybe<string>): number {
return Number(value) || 0;
}

export function isNumerical(value: Maybe<string>): boolean {
return !isNaN(Number(value));
}