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

use analysis order id as valis tellimuse id (#92)

Browse Source 
* use order analysis id as valis tellimuse id

* send analysis order id in xml
This commit is contained in:
Helena
2025-09-10 16:54:12 +03:00
committed by GitHub
parent b31de91daf
commit 99e62b91a5
12 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/job/handler/sync-analysis-results.ts
View File

@@ -6,11 +6,12 @@ type ProcessedMessage = {
hasPartialAnalysisResponse: boolean; hasPartialAnalysisResponse: boolean;
hasFullAnalysisResponse: boolean; hasFullAnalysisResponse: boolean;
medusaOrderId: string | undefined; medusaOrderId: string | undefined;
analysisOrderId: number | undefined;
}; };
type GroupedResults = { type GroupedResults = {
processed: Pick<ProcessedMessage, 'messageId' | 'medusaOrderId'>[]; processed: Pick<ProcessedMessage, 'messageId' | 'analysisOrderId'>[];
waitingForResults: Pick<ProcessedMessage, 'messageId' | 'medusaOrderId'>[]; waitingForResults: Pick<ProcessedMessage, 'messageId' | 'analysisOrderId'>[];
}; };
export default async function syncAnalysisResults() { export default async function syncAnalysisResults() {
@@ -37,14 +38,14 @@ export default async function syncAnalysisResults() {
} }
const groupedResults = processedMessages.reduce((acc, result) => { const groupedResults = processedMessages.reduce((acc, result) => {
if (result.medusaOrderId) { if (result.analysisOrderId) {
if (result.hasAnalysisResponse) { if (result.hasAnalysisResponse) {
if (!acc.processed) { if (!acc.processed) {
acc.processed = []; acc.processed = [];
} }
acc.processed.push({ acc.processed.push({
messageId: result.messageId, messageId: result.messageId,
medusaOrderId: result.medusaOrderId, analysisOrderId: result.analysisOrderId,
}); });
} else { } else {
if (!acc.waitingForResults) { if (!acc.waitingForResults) {
@@ -52,7 +53,7 @@ export default async function syncAnalysisResults() {
} }
acc.waitingForResults.push({ acc.waitingForResults.push({
messageId: result.messageId, messageId: result.messageId,
medusaOrderId: result.medusaOrderId, analysisOrderId: result.analysisOrderId,
}); });
} }
} }

2
app/api/job/test-medipost-responses/route.ts
View File

@@ -37,7 +37,7 @@ export async function POST(request: NextRequest) {
}, },
orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[], orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
orderedAnalysesIds: idsToSend.map(({ analysisId }) => analysisId).filter(Boolean) as number[], orderedAnalysesIds: idsToSend.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
orderId: medusaOrderId, orderId: medreportOrder.id,
orderCreatedAt: new Date(medreportOrder.created_at), orderCreatedAt: new Date(medreportOrder.created_at),
}); });

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

@@ -29,7 +29,7 @@ export async function POST(request: Request) {
}, },
orderedAnalysisElementsIds: orderedAnalysisElementsIds.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[], orderedAnalysisElementsIds: orderedAnalysisElementsIds.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
orderedAnalysesIds: orderedAnalysisElementsIds.map(({ analysisId }) => analysisId).filter(Boolean) as number[], orderedAnalysesIds: orderedAnalysisElementsIds.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
orderId: medusaOrderId, orderId: analysisOrder.id,
orderCreatedAt: new Date(analysisOrder.created_at), orderCreatedAt: new Date(analysisOrder.created_at),
}); });

2
app/home/(user)/(dashboard)/order/[orderId]/confirmed/page.tsx
View File

@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
}) { }) {
const params = await props.params; const params = await props.params;
const order = await getAnalysisOrder({ orderId: Number(params.orderId) }).catch(() => null); const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
if (!order) { if (!order) {
redirect(pathsConfig.app.myOrders); redirect(pathsConfig.app.myOrders);
} }

2
app/home/(user)/(dashboard)/order/[orderId]/page.tsx
View File

@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
}) { }) {
const params = await props.params; const params = await props.params;
const order = await getAnalysisOrder({ orderId: Number(params.orderId) }).catch(() => null); const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
if (!order) { if (!order) {
redirect(pathsConfig.app.myOrders); redirect(pathsConfig.app.myOrders);
} }

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

@@ -194,12 +194,13 @@ export async function readPrivateMessageResponse({
excludedMessageIds, excludedMessageIds,
}: { }: {
excludedMessageIds: string[]; excludedMessageIds: string[];
}): Promise<{ messageId: string | null; hasAnalysisResponse: boolean; hasPartialAnalysisResponse: boolean; hasFullAnalysisResponse: boolean; medusaOrderId: string | undefined }> { }): Promise<{ messageId: string | null; hasAnalysisResponse: boolean; hasPartialAnalysisResponse: boolean; hasFullAnalysisResponse: boolean; medusaOrderId: string | undefined; analysisOrderId: number | undefined }> {
let messageId: string | null = null; let messageId: string | null = null;
let hasAnalysisResponse = false; let hasAnalysisResponse = false;
let hasPartialAnalysisResponse = false; let hasPartialAnalysisResponse = false;
let hasFullAnalysisResponse = false; let hasFullAnalysisResponse = false;
let medusaOrderId: string | undefined = undefined; let medusaOrderId: string | undefined = undefined;
let analysisOrderId: number | undefined = undefined;
try { try {
const privateMessage = await getLatestPrivateMessageListItem({ excludedMessageIds }); const privateMessage = await getLatestPrivateMessageListItem({ excludedMessageIds });
@@ -212,6 +213,7 @@ export async function readPrivateMessageResponse({
hasPartialAnalysisResponse: false, hasPartialAnalysisResponse: false,
hasFullAnalysisResponse: false, hasFullAnalysisResponse: false,
medusaOrderId: undefined, medusaOrderId: undefined,
analysisOrderId: undefined
}; };
} }
@@ -220,16 +222,15 @@ export async function readPrivateMessageResponse({
); );
const messageResponse = privateMessageContent?.Saadetis?.Vastus; const messageResponse = privateMessageContent?.Saadetis?.Vastus;
medusaOrderId = privateMessageContent?.Saadetis?.Tellimus?.ValisTellimuseId || messageResponse?.ValisTellimuseId; analysisOrderId = Number(privateMessageContent?.Saadetis?.Tellimus?.ValisTellimuseId || messageResponse?.ValisTellimuseId);
const hasInvalidOrderId = !medusaOrderId || !medusaOrderId.toString().startsWith('order_'); const hasInvalidOrderId = isNaN(analysisOrderId)
if (hasInvalidOrderId || !messageResponse) { if (hasInvalidOrderId || !messageResponse) {
await createMedipostActionLog({ await createMedipostActionLog({
action: 'sync_analysis_results_from_medipost', action: 'sync_analysis_results_from_medipost',
xml: privateMessageXml, xml: privateMessageXml,
hasAnalysisResults: false, hasAnalysisResults: false,
medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
}); });
return { return {
messageId, messageId,
@@ -237,9 +238,13 @@ export async function readPrivateMessageResponse({
hasPartialAnalysisResponse: false, hasPartialAnalysisResponse: false,
hasFullAnalysisResponse: false, hasFullAnalysisResponse: false,
medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId, medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
analysisOrderId: hasInvalidOrderId ? undefined : analysisOrderId
}; };
} }
const analysisOrder = await getAnalysisOrder({ analysisOrderId: analysisOrderId })
medusaOrderId = analysisOrder.medusa_order_id;
let order: Tables<{ schema: 'medreport' }, 'analysis_orders'>; let order: Tables<{ schema: 'medreport' }, 'analysis_orders'>;
try { try {
order = await getAnalysisOrder({ medusaOrderId }); order = await getAnalysisOrder({ medusaOrderId });
@@ -264,7 +269,7 @@ export async function readPrivateMessageResponse({
console.warn(`Failed to process private message id=${messageId}, message=${(e as Error).message}`); console.warn(`Failed to process private message id=${messageId}, message=${(e as Error).message}`);
} }
return { messageId, hasAnalysisResponse, hasPartialAnalysisResponse, hasFullAnalysisResponse, medusaOrderId }; return { messageId, hasAnalysisResponse, hasPartialAnalysisResponse, hasFullAnalysisResponse, medusaOrderId, analysisOrderId };
} }
async function saveAnalysisGroup( async function saveAnalysisGroup(
@@ -616,7 +621,7 @@ export async function sendOrderToMedipost({
lastName: account.last_name ?? '', lastName: account.last_name ?? '',
phone: account.phone ?? '', phone: account.phone ?? '',
}, },
orderId: medusaOrderId, orderId: medreportOrder.id,
orderCreatedAt: new Date(medreportOrder.created_at), orderCreatedAt: new Date(medreportOrder.created_at),
comment: '', comment: '',
}); });

2
lib/services/medipostTest.service.ts
View File

@@ -68,7 +68,7 @@ export async function composeOrderTestResponseXML({
}; };
orderedAnalysisElementsIds: number[]; orderedAnalysisElementsIds: number[];
orderedAnalysesIds: number[]; orderedAnalysesIds: number[];
orderId: string; orderId: number;
orderCreatedAt: Date; orderCreatedAt: Date;
}) { }) {
const analysisElements = await getAnalysisElementsAdmin({ ids: orderedAnalysisElementsIds }); const analysisElements = await getAnalysisElementsAdmin({ ids: orderedAnalysisElementsIds });

2
lib/services/medipostXML.service.ts
View File

@@ -45,7 +45,7 @@ export async function composeOrderXML({
lastName: string; lastName: string;
phone: string; phone: string;
}; };
orderId: string; orderId: number;
orderCreatedAt: Date; orderCreatedAt: Date;
comment?: string; comment?: string;
}) { }) {

10
lib/services/order.service.ts
View File

@@ -82,10 +82,10 @@ export async function updateAnalysisOrderStatus({
export async function getAnalysisOrder({ export async function getAnalysisOrder({
medusaOrderId, medusaOrderId,
orderId, analysisOrderId,
}: { }: {
medusaOrderId?: string; medusaOrderId?: string;
orderId?: number; analysisOrderId?: number;
}) { }) {
const query = getSupabaseServerAdminClient() const query = getSupabaseServerAdminClient()
.schema('medreport') .schema('medreport')
@@ -93,15 +93,15 @@ export async function getAnalysisOrder({
.select('*') .select('*')
if (medusaOrderId) { if (medusaOrderId) {
query.eq('medusa_order_id', medusaOrderId); query.eq('medusa_order_id', medusaOrderId);
} else if (orderId) { } else if (analysisOrderId) {
query.eq('id', orderId); query.eq('id', analysisOrderId);
} else { } else {
throw new Error('Either medusaOrderId or orderId must be provided'); throw new Error('Either medusaOrderId or orderId must be provided');
} }
const { data: order, error } = await query.single(); const { data: order, error } = await query.single();
if (error) { if (error) {
throw new Error(`Failed to get order by medusaOrderId=${medusaOrderId} or orderId=${orderId}, message=${error.message}, data=${JSON.stringify(order)}`); throw new Error(`Failed to get order by medusaOrderId=${medusaOrderId} or analysisOrderId=${analysisOrderId}, message=${error.message}, data=${JSON.stringify(order)}`);
} }
return order; return order;
} }

3
lib/templates/medipost-order.ts
View File

@@ -8,8 +8,7 @@ const isProd = process.env.NODE_ENV === 'production';
export const getPais = ( export const getPais = (
sender: string, sender: string,
recipient: string, recipient: string,
createdAt: Date, orderId: number,
orderId: string,
packageName = "OL", packageName = "OL",
) => { ) => {
if (isProd) { if (isProd) {

1
packages/features/medusa-storefront/src/lib/data/orders.ts
View File

@@ -54,7 +54,6 @@ export const listOrders = async (
}, },
headers, headers,
next, next,
cache: "force-cache",
}) })
.then(({ orders }) => orders) .then(({ orders }) => orders)
.catch((err) => medusaError(err)) .catch((err) => medusaError(err))

1
packages/features/medusa-storefront/src/lib/data/products.ts
View File

@@ -73,7 +73,6 @@ export const listProducts = async ({
}, },
headers, headers,
next, next,
cache: "force-cache",
} }
) )
.then(({ products, count }) => { .then(({ products, count }) => {