k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(MED-168): clean up types

Browse Source
This commit is contained in:
Karli
2025-09-19 15:14:03 +03:00
parent 47bbeeb155
commit afdaebc804
4 changed files with 127 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/features/user-analyses/src/server/api.ts
View File

@@ -4,7 +4,7 @@ import { Database } from '@kit/supabase/database';
import { toArray } from '@kit/shared/utils';
import type { UuringuVastus } from '@kit/shared/types/medipost-analysis';
import type { AnalysisResultDetails, AnalysisResultDetailsMapped, AnalysisResultsDetailsElementNested, UserAnalysis } from '../types/analysis-results';
import type { AnalysisResultsQuery, AnalysisResultDetailsElement, AnalysisResultDetailsMapped, AnalysisResultLevel, AnalysisResultsDetailsElementNested, AnalysisStatus, UserAnalysis } from '../types/analysis-results';
import type { AnalysisOrder } from '../types/analysis-orders';
/**
@@ -74,7 +74,7 @@ class UserAnalysesApi {
order: {
status: analysisOrder.status,
medusaOrderId: analysisOrder.medusa_order_id,
createdAt: new Date(analysisOrder.created_at),
createdAt: analysisOrder.created_at,
},
orderedAnalysisElements: mappedOrderedAnalysisElements,
summary:
@@ -107,7 +107,7 @@ class UserAnalysesApi {
.eq('analysis_order_id', analysisOrderId)
.throwOnError();
return analysisResponse?.[0] as AnalysisResultDetails | null;
return analysisResponse?.[0] as AnalysisResultsQuery | null;
}
async getOrderedAnalysisElements({
@@ -133,9 +133,9 @@ class UserAnalysesApi {
analysisResponseElements,
orderedAnalysisElements,
}: {
analysisResponseElements: AnalysisResultDetails['elements'];
analysisResponseElements: AnalysisResultsQuery['elements'];
orderedAnalysisElements: { analysis_id_original: string; analysis_name_lab: string }[];
}) {
}): Promise<AnalysisResultDetailsElement[]> {
const mappedOrderedAnalysisElements = orderedAnalysisElements.map(({ analysis_id_original, analysis_name_lab }) => {
return this.getOrderedAnalysisElement({
analysisIdOriginal: analysis_id_original,
@@ -186,8 +186,8 @@ class UserAnalysesApi {
}: {
analysisIdOriginal: string;
analysisNameLab: string;
analysisResponseElements: AnalysisResultDetails['elements'];
}) {
analysisResponseElements: AnalysisResultsQuery['elements'];
}): AnalysisResultDetailsElement {
const elementResponse = analysisResponseElements.find((element) => element.analysis_element_original_id === analysisIdOriginal);
if (!elementResponse) {
return {
@@ -202,7 +202,7 @@ class UserAnalysesApi {
isWaitingForResults: false,
analysisName: analysisNameLab,
results: {
nestedElements: (() => {
nestedElements: ((): AnalysisResultsDetailsElementNested[] => {
const nestedElements = toArray(elementResponse.original_response_element?.UuringuElement)
return nestedElements.map<AnalysisResultsDetailsElementNested>((element) => {
const mappedResponse = this.mapUuringVastus({
@@ -220,13 +220,12 @@ class UserAnalysesApi {
normLowerIncluded: mappedResponse.normLowerIncluded,
normUpperIncluded: mappedResponse.normUpperIncluded,
analysisElementOriginalId: element.UuringId,
status: elementResponse.status,
status: Number(elementResponse.status) as AnalysisStatus,
analysisName: undefined,
};
});
})(),
labComment,
//originalResponseElement: elementResponse.original_response_element ?? null,
unit: elementResponse.unit,
normLower: elementResponse.norm_lower,
normUpper: elementResponse.norm_upper,
@@ -237,9 +236,8 @@ class UserAnalysesApi {
responseValueIsWithinNorm: elementResponse.response_value_is_within_norm === null ? null : elementResponse.response_value_is_within_norm === true,
normLowerIncluded: elementResponse.norm_lower_included,
normUpperIncluded: elementResponse.norm_upper_included,
status: elementResponse.status,
status: Number(elementResponse.status) as AnalysisStatus,
analysisElementOriginalId: elementResponse.analysis_element_original_id,
elementResponse,
}
};
}
@@ -260,7 +258,7 @@ class UserAnalysesApi {
return {
normLower: uuringVastus?.NormAlum?.['#text'] ?? null,
normUpper: uuringVastus?.NormYlem?.['#text'] ?? null,
normStatus: uuringVastus?.NormiStaatus ?? null,
normStatus: (uuringVastus?.NormiStaatus ?? null) as AnalysisResultLevel | null,
responseTime: uuringVastus?.VastuseAeg ?? null,
responseValue: responseValueIsNegative || !responseValueIsNumeric ? null : (responseValueNumber ?? null),
responseValueIsNegative: responseValueIsNumeric ? null : responseValueIsNegative,