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

feat(MED-168): clean up types, show nested elements

Browse Source
This commit is contained in:
Karli
2025-09-19 15:28:56 +03:00
parent e7b484e1d4
commit 091144d942
9 changed files with 188 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/features/accounts/src/types/analysis-orders.ts
View File

@@ -1,3 +0,0 @@
import { Tables } from '@kit/supabase/database';
export type AnalysisOrder = Tables<{ schema: 'medreport' }, 'analysis_orders'>;

139
packages/features/accounts/src/types/analysis-results.ts
View File

@@ -1,139 +0,0 @@
import * as z from 'zod';
import { Database } from '@kit/supabase/database';
export type UserAnalysisElement =
Database['medreport']['Tables']['analysis_response_elements']['Row'];
export type UserAnalysisResponse =
Database['medreport']['Tables']['analysis_responses']['Row'] & {
elements: UserAnalysisElement[];
};
export type UserAnalysis = UserAnalysisResponse[];
const ElementSchema = z.object({
unit: z.string(),
norm_lower: z.number(),
norm_upper: z.number(),
norm_status: z.number(),
analysis_name: z.string(),
response_time: z.string(),
response_value: z.number(),
response_value_is_negative: z.boolean(),
norm_lower_included: z.boolean(),
norm_upper_included: z.boolean(),
status: z.string(),
analysis_element_original_id: z.string(),
original_response_element: z.object({
}),
});
const OrderSchema = z.object({
status: z.string(),
medusa_order_id: z.string(),
created_at: z.coerce.date(),
});
const DoctorAnalysisFeedbackSchema = z.object({
id: z.number(),
status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
created_by: z.string(),
});
const SummarySchema = z.object({
id: z.number(),
value: z.string(),
status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
created_by: z.string(),
updated_at: z.coerce.date().nullable(),
updated_by: z.string(),
doctor_user_id: z.string().nullable(),
analysis_order_id: z.number(),
doctor_analysis_feedback: z.array(DoctorAnalysisFeedbackSchema),
});
export const AnalysisResultDetailsSchema = z.object({
id: z.number(),
analysis_order_id: z.number(),
order_number: z.string(),
order_status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
updated_at: z.coerce.date().nullable(),
elements: z.array(ElementSchema),
order: OrderSchema,
summary: SummarySchema.nullable(),
});
export type AnalysisResultDetails = z.infer<typeof AnalysisResultDetailsSchema>;
export type AnalysisResultDetailsElementResults = {
unit: string | null;
normLower: number | null;
normUpper: number | null;
normStatus: number | null;
responseTime: string | null;
responseValue: number | null;
responseValueIsNegative: boolean | null;
responseValueIsWithinNorm: boolean | null;
normLowerIncluded: boolean;
normUpperIncluded: boolean;
status: string;
analysisElementOriginalId: string;
nestedElements: {
analysisElementOriginalId: string;
normLower?: number | null;
normLowerIncluded: boolean;
normStatus: number;
normUpper?: number | null;
normUpperIncluded: boolean;
responseTime: string;
responseValue: number;
status: number;
unit: string;
}[];
labComment?: string | null;
};
export type AnalysisResultDetailsElement = {
analysisIdOriginal: string;
isWaitingForResults: boolean;
analysisName: string;
results: AnalysisResultDetailsElementResults;
};
export type AnalysisResultDetailsMapped = {
id: number;
order: {
status: string;
medusaOrderId: string;
createdAt: Date | string;
};
elements: {
id: string;
unit: string;
norm_lower: number;
norm_upper: number;
norm_status: number;
analysis_name: string;
response_time: string;
response_value: number;
norm_lower_included: boolean;
norm_upper_included: boolean;
status: string;
analysis_element_original_id: string;
}[];
orderedAnalysisElementIds: number[];
orderedAnalysisElements: AnalysisResultDetailsElement[];
summary: {
id: number;
status: string;
user_id: string;
created_at: Date;
created_by: string;
value?: string;
} | null;
};

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

@@ -2,9 +2,9 @@ import { SupabaseClient } from '@supabase/supabase-js';
import { Database } from '@kit/supabase/database';
import { toArray } from '@kit/shared/utils';
import type { UuringElement, UuringuVastus } from '@kit/shared/types/medipost-analysis';
import type { UuringuVastus } from '@kit/shared/types/medipost-analysis';
import type { AnalysisResultDetails, AnalysisResultDetailsMapped, UserAnalysis } from '../types/analysis-results';
import type { AnalysisResultDetails, AnalysisResultDetailsMapped, AnalysisResultsDetailsElementNested, UserAnalysis } from '../types/analysis-results';
import type { AnalysisOrder } from '../types/analysis-orders';
/**
@@ -166,28 +166,14 @@ class UserAnalysesApi {
if (!nestedAnalysisElement) {
continue;
}
results.nestedElements.push({
...nestedAnalysisElement,
analysisElementOriginalId,
analysisName: nestedAnalysisElement.analysis_name_lab,
});
}
}
mappedOrderedAnalysisElements.forEach(({ results }) => {
results?.nestedElements.forEach(({ analysisElementOriginalId }) => {
const nestedAnalysisElement = nestedAnalysisElements.find(({ id }) => id === analysisElementOriginalId);
if (nestedAnalysisElement) {
results?.nestedElements.push({
...nestedAnalysisElement,
analysisElementOriginalId,
analysisName: nestedAnalysisElement.analysis_name_lab,
});
} else {
console.error('Nested analysis element not found for analysis element original id=', analysisElementOriginalId);
}
});
});
nestedElement.analysisElementOriginalId = analysisElementOriginalId;
nestedElement.analysisName = nestedAnalysisElement.analysis_name_lab as string | undefined;
}
results.nestedElements = results.nestedElements.sort((a, b) => a.analysisName?.localeCompare(b.analysisName ?? '') ?? 0);
}
} else {
console.error('Failed to get nested analysis elements by ids=', nestedAnalysisElementIds, nestedAnalysisElementsError);
}
}
@@ -218,16 +204,12 @@ class UserAnalysesApi {
analysisName: analysisNameLab,
results: {
nestedElements: (() => {
const nestedElements = elementResponse.original_response_element?.UuringuElement as UuringElement[] | undefined;
if (!nestedElements) {
return [];
}
return toArray(nestedElements).map((element) => {
const nestedElements = toArray(elementResponse.original_response_element?.UuringuElement)
return nestedElements.map<AnalysisResultsDetailsElementNested>((element) => {
const mappedResponse = this.mapUuringVastus({
uuringVastus: element.UuringuVastus as UuringuVastus | undefined,
});
return {
status: element.UuringOlek,
unit: element.Mootyhik ?? null,
normLower: mappedResponse.normLower,
normUpper: mappedResponse.normUpper,
@@ -239,6 +221,7 @@ class UserAnalysesApi {
normLowerIncluded: mappedResponse.normLowerIncluded,
normUpperIncluded: mappedResponse.normUpperIncluded,
analysisElementOriginalId: element.UuringId,
status: elementResponse.status,
analysisName: undefined,
};
});
@@ -251,12 +234,13 @@ class UserAnalysesApi {
normStatus: elementResponse.norm_status,
responseTime: elementResponse.response_time,
responseValue: elementResponse.response_value,
responseValueIsNegative: elementResponse.response_value_is_negative === true,
responseValueIsWithinNorm: elementResponse.response_value_is_within_norm === true,
responseValueIsNegative: elementResponse.response_value_is_negative === null ? null : elementResponse.response_value_is_negative === true,
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,
analysisElementOriginalId: elementResponse.analysis_element_original_id,
elementResponse,
}
};
}

186
packages/features/user-analyses/src/types/analysis-results.ts
View File

@@ -1,6 +1,5 @@
import * as z from 'zod';
import { Database } from '@kit/supabase/database';
import { AnalysisOrderStatus, NormStatus } from '@kit/shared/types/medipost-analysis';
export type UserAnalysisElement =
Database['medreport']['Tables']['analysis_response_elements']['Row'];
@@ -10,66 +9,109 @@ export type UserAnalysisResponse =
};
export type UserAnalysis = UserAnalysisResponse[];
const ElementSchema = z.object({
unit: z.string(),
norm_lower: z.number(),
norm_upper: z.number(),
norm_status: z.number(),
analysis_name: z.string(),
response_time: z.string(),
response_value: z.number(),
response_value_is_negative: z.boolean(),
response_value_is_within_norm: z.boolean(),
norm_lower_included: z.boolean(),
norm_upper_included: z.boolean(),
status: z.string(),
analysis_element_original_id: z.string(),
original_response_element: z.object({
type ElementSchema = {
unit: string,
norm_lower: number,
norm_upper: number,
norm_status: number,
analysis_name: string,
response_time: string,
response_value: number,
response_value_is_negative: boolean,
response_value_is_within_norm: boolean,
norm_lower_included: boolean,
norm_upper_included: boolean,
status: string,
analysis_element_original_id: string,
original_response_element: {
UuringuElement: {
UuringIdOID: string,
UuringId: string,
TLyhend: string,
KNimetus: string,
UuringNimi: string,
UuringuKommentaar: string | null,
TellijaUuringId: number,
TeostajaUuringId: string,
UuringOlek: keyof typeof AnalysisOrderStatus,
Mootyhik: string | null,
Kood: {
HkKood: number,
HkKoodiKordaja: number,
Koefitsient: number,
Hind: number,
},
UuringuVastus: {
VastuseVaartus: string,
VastuseAeg: string,
NormiStaatus: keyof typeof NormStatus,
ProoviJarjenumber: number,
},
UuringuTaitjaAsutuseJnr: number,
},
UuringuKommentaar: string | null,
},
};
}),
});
type OrderSchema = {
status: string,
medusa_order_id: string,
created_at: string,
};
const OrderSchema = z.object({
status: z.string(),
medusa_order_id: z.string(),
created_at: z.coerce.date(),
});
type DoctorAnalysisFeedbackSchema = {
id: number,
status: string,
user_id: string,
created_at: string,
created_by: string,
};
const DoctorAnalysisFeedbackSchema = z.object({
id: z.number(),
status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
created_by: z.string(),
});
type SummarySchema = {
id: number,
value: string,
status: string,
user_id: string,
created_at: string,
created_by: string,
updated_at: string | null,
updated_by: string,
doctor_user_id: string | null,
analysis_order_id: number,
doctor_analysis_feedback: DoctorAnalysisFeedbackSchema[],
};
const SummarySchema = z.object({
id: z.number(),
value: z.string(),
status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
created_by: z.string(),
updated_at: z.coerce.date().nullable(),
updated_by: z.string(),
doctor_user_id: z.string().nullable(),
analysis_order_id: z.number(),
doctor_analysis_feedback: z.array(DoctorAnalysisFeedbackSchema),
});
export const AnalysisResultDetailsSchema = z.object({
id: z.number(),
analysis_order_id: z.number(),
order_number: z.string(),
order_status: z.string(),
user_id: z.string(),
created_at: z.coerce.date(),
updated_at: z.coerce.date().nullable(),
elements: z.array(ElementSchema),
export type AnalysisResultDetails = {
id: number,
analysis_order_id: number,
order_number: string,
order_status: string,
user_id: string,
created_at: string,
updated_at: string | null,
elements: ElementSchema[],
order: OrderSchema,
summary: SummarySchema.nullable(),
});
export type AnalysisResultDetails = z.infer<typeof AnalysisResultDetailsSchema>;
summary: SummarySchema | null,
};
export type AnalysisResultsDetailsElementNested = {
analysisElementOriginalId: string;
analysisName?: string;
} & Pick<
AnalysisResultDetailsElementResults,
'unit' |
'normLower' |
'normUpper' |
'normStatus' |
'responseTime' |
'responseValue' |
'responseValueIsNegative' |
'responseValueIsWithinNorm' |
'normLowerIncluded' |
'normUpperIncluded' |
'status' |
'analysisElementOriginalId'
>;
export type AnalysisResultDetailsElementResults = {
unit: string | null;
@@ -84,19 +126,7 @@ export type AnalysisResultDetailsElementResults = {
normUpperIncluded: boolean;
status: string;
analysisElementOriginalId: string;
nestedElements: {
analysisElementOriginalId: string;
normLower?: number | null;
normLowerIncluded: boolean;
normStatus: number | null;
normUpper?: number | null;
normUpperIncluded: boolean;
responseTime: string | null;
responseValue: number | null;
status: number;
unit: string | null;
analysisName?: string | null;
}[];
nestedElements: AnalysisResultsDetailsElementNested[];
labComment?: string | null;
};
@@ -114,27 +144,13 @@ export type AnalysisResultDetailsMapped = {
medusaOrderId: string;
createdAt: Date | string;
};
elements: {
id: string;
unit: string;
norm_lower: number;
norm_upper: number;
norm_status: number;
analysis_name: string;
response_time: string;
response_value: number;
norm_lower_included: boolean;
norm_upper_included: boolean;
status: string;
analysis_element_original_id: string;
}[];
orderedAnalysisElementIds: number[];
orderedAnalysisElements: AnalysisResultDetailsElement[];
summary: {
id: number;
status: string;
user_id: string;
created_at: Date;
created_at: string;
created_by: string;
value?: string;
} | null;