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

feat(MED-85): add logging for medipost actions with xml and related order id

Browse Source
This commit is contained in:
Karli
2025-08-28 11:56:07 +03:00
parent 47ab39172e
commit a37c4cad9c
6 changed files with 100 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/api/job/send-medipost-test-response-for-order/route.ts
View File

@@ -1,57 +0,0 @@
import { NextRequest, NextResponse } from "next/server";
import { getAnalysisOrdersAdmin } from "~/lib/services/order.service";
import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
import { retrieveOrder } from "@lib/data";
import { getAccountAdmin } from "~/lib/services/account.service";
import { getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
import loadEnv from "../handler/load-env";
import validateApiKey from "../handler/validate-api-key";
export async function POST(request: NextRequest) {
loadEnv();
try {
validateApiKey(request);
} catch (e) {
return NextResponse.json({}, { status: 401, statusText: 'Unauthorized' });
}
const { order_id: medusaOrderId } = await request.json();
if (!medusaOrderId) {
return NextResponse.json({ error: 'order_id is required' }, { status: 400 });
}
const analysisOrders = await getAnalysisOrdersAdmin({ medusaOrderId });
console.error(`Sending test responses for ${analysisOrders.length} analysis orders`);
for (const medreportOrder of analysisOrders) {
const medusaOrderId = medreportOrder.medusa_order_id;
const medusaOrder = await retrieveOrder(medusaOrderId)
const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
const orderedAnalysisElementsIds = await getOrderedAnalysisElementsIds({ medusaOrder });
console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`);
const idsToSend = orderedAnalysisElementsIds;
const messageXml = await composeOrderTestResponseXML({
person: {
idCode: account.personal_code!,
firstName: account.name ?? '',
lastName: account.last_name ?? '',
phone: account.phone ?? '',
},
orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId),
orderedAnalysesIds: [],
orderId: medusaOrderId,
orderCreatedAt: new Date(medreportOrder.created_at),
});
try {
await sendPrivateMessageTestResponse({ messageXml });
} catch (error) {
console.error("Error sending private message test response: ", error);
}
}
return NextResponse.json({ success: true });
}

7
app/api/order/medipost-test-response/route.ts
View File

@@ -3,7 +3,7 @@ import { getOrder } from "~/lib/services/order.service";
import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
import { retrieveOrder } from "@lib/data";
import { getAccountAdmin } from "~/lib/services/account.service";
import { getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
import { createMedipostActionLog, getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
export async function POST(request: Request) {
// const isDev = process.env.NODE_ENV === 'development';
@@ -35,6 +35,11 @@ export async function POST(request: Request) {
});
try {
await createMedipostActionLog({
action: 'send_fake_analysis_results_to_medipost',
xml: messageXml,
medusaOrderId,
});
await sendPrivateMessageTestResponse({ messageXml });
} catch (error) {
console.error("Error sending private message test response: ", error);

77
lib/services/medipost.service.ts
View File

@@ -180,7 +180,10 @@ export async function getPrivateMessage(messageId: string) {
await validateMedipostResponse(data, { canHaveEmptyCode: true });
return parseXML(data) as MedipostOrderResponse;
return {
message: parseXML(data) as MedipostOrderResponse,
xml: data as string,
};
}
export async function deletePrivateMessage(messageId: string) {
@@ -211,7 +214,9 @@ export async function readPrivateMessageResponse({
try {
const privateMessage = await getLatestPrivateMessageListItem({ excludedMessageIds });
if (!privateMessage) {
messageId = privateMessage?.messageId ?? null;
if (!privateMessage || !messageId) {
return {
messageId: null,
hasAnalysisResponse: false,
@@ -221,40 +226,28 @@ export async function readPrivateMessageResponse({
};
}
messageId = privateMessage.messageId;
if (!messageId) {
return {
messageId: null,
hasAnalysisResponse: false,
hasPartialAnalysisResponse: false,
hasFullAnalysisResponse: false,
medusaOrderId: undefined,
};
}
const privateMessageContent = await getPrivateMessage(
const { message: privateMessageContent, xml: privateMessageXml } = await getPrivateMessage(
privateMessage.messageId,
);
const messageResponse = privateMessageContent?.Saadetis?.Vastus;
medusaOrderId = privateMessageContent?.Saadetis?.Tellimus?.ValisTellimuseId || messageResponse?.ValisTellimuseId;
if (!medusaOrderId || !medusaOrderId.toString().startsWith('order_')) {
return {
messageId,
hasAnalysisResponse: false,
hasPartialAnalysisResponse: false,
hasFullAnalysisResponse: false,
medusaOrderId: undefined,
};
}
const hasInvalidOrderId = !medusaOrderId || !medusaOrderId.toString().startsWith('order_');
if (!messageResponse) {
if (hasInvalidOrderId || !messageResponse) {
await createMedipostActionLog({
action: 'sync_analysis_results_from_medipost',
xml: privateMessageXml,
hasAnalysisResults: false,
medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
});
return {
messageId,
hasAnalysisResponse: false,
hasPartialAnalysisResponse: false,
hasFullAnalysisResponse: false,
medusaOrderId,
medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
};
}
@@ -743,6 +736,12 @@ export async function sendOrderToMedipost({
try {
await sendPrivateMessage(orderXml);
await createMedipostActionLog({
action: 'send_order_to_medipost',
xml: orderXml,
hasAnalysisResults: false,
medusaOrderId,
});
} catch (e) {
const isMedipostError = e instanceof MedipostValidationError;
await logMedipostDispatch({
@@ -825,3 +824,31 @@ export async function getOrderedAnalysisElementsIds({
return [...analysisPackageElements, ...orderedAnalysisElements];
}
export async function createMedipostActionLog({
action,
xml,
hasAnalysisResults = false,
medusaOrderId,
}: {
action:
| 'send_order_to_medipost'
| 'sync_analysis_results_from_medipost'
| 'send_fake_analysis_results_to_medipost'
| 'send_analysis_results_to_medipost';
xml: string;
hasAnalysisResults?: boolean;
medusaOrderId?: string | null;
}) {
await getSupabaseServerAdminClient()
.schema('medreport')
.from('medipost_actions')
.insert({
action,
xml,
has_analysis_results: hasAnalysisResults,
medusa_order_id: medusaOrderId,
})
.select('id')
.throwOnError();
}

24
packages/supabase/src/database.types.ts
View File

@@ -1188,6 +1188,28 @@ export type Database = {
},
]
}
medipost_actions: {
Row: {
id: string
action: string
xml: string
has_analysis_results: boolean
created_at: string
medusa_order_id: string
}
Insert: {
action: string
xml: string
has_analysis_results: boolean
medusa_order_id: string
}
Update: {
action?: string
xml?: string
has_analysis_results?: boolean
medusa_order_id?: string
}
}
medreport_product_groups: {
Row: {
created_at: string
@@ -2076,7 +2098,7 @@ export type Database = {
}
send_medipost_test_response_for_order: {
Args: {
order_id: string
medusa_order_id: string
}
}
}

6
supabase/migrations-env-specific/20250827090152_bo_run_dev_fake_results_sync.sql
View File

@@ -1,17 +1,17 @@
-- Parameters order_id
CREATE OR REPLACE FUNCTION medreport.send_medipost_test_response_for_order(order_id text)
CREATE OR REPLACE FUNCTION medreport.send_medipost_test_response_for_order(medusa_order_id text)
RETURNS void
LANGUAGE plpgsql
AS $$
BEGIN
select net.http_post(
url := 'https://test.medreport.ee/api/job/send-medipost-test-response-for-order',
url := 'https://test.medreport.ee/api/order/medipost-test-response',
headers := jsonb_build_object(
'Content-Type', 'application/json',
'x-jobs-api-key', 'fd26ec26-70ed-11f0-9e95-431ac3b15a84'
),
body := jsonb_build_object(
'order_id', order_id
'medusaOrderId', medusa_order_id
)
) as request_id;
END;

16
supabase/migrations/20250828105844_medipost_actions.sql Normal file
View File

@@ -0,0 +1,16 @@
CREATE TABLE medreport.medipost_actions (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
action VARCHAR(255) NOT NULL,
xml VARCHAR(131072),
has_analysis_results BOOLEAN NOT NULL DEFAULT FALSE,
medusa_order_id VARCHAR(255),
created_at TIMESTAMP WITH TIME ZONE DEFAULT now()
);
ALTER TABLE medreport.medipost_actions ENABLE ROW LEVEL SECURITY;
CREATE POLICY "service_role_select" ON medreport.medipost_actions FOR SELECT TO service_role USING (true);
CREATE POLICY "service_role_insert" ON medreport.medipost_actions FOR INSERT TO service_role WITH CHECK (true);
CREATE POLICY "service_role_update" ON medreport.medipost_actions FOR UPDATE TO service_role USING (true);
CREATE POLICY "service_role_delete" ON medreport.medipost_actions FOR DELETE TO service_role USING (true);
grant select, insert, update, delete on table medreport.medipost_actions to service_role;