feat(MED-131): fix medusa vs medipost vs b2b product ids mixed
This commit is contained in:
@@ -37,11 +37,10 @@ import { Tables } from '@kit/supabase/database';
|
||||
import { createAnalysisGroup } from './analysis-group.service';
|
||||
import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client';
|
||||
import { getOrder } from './order.service';
|
||||
import { getAnalysisElementsAdmin } from './analysis-element.service';
|
||||
import { getAnalysisElements, getAnalysisElementsAdmin } from './analysis-element.service';
|
||||
import { getAnalyses } from './analyses.service';
|
||||
import { retrieveOrder } from '@lib/data/orders';
|
||||
import { getAccountAdmin } from './account.service';
|
||||
import { StoreProduct } from '@medusajs/types';
|
||||
import { StoreOrder } from '@medusajs/types';
|
||||
import { listProducts } from '@lib/data/products';
|
||||
import { listRegions } from '@lib/data/regions';
|
||||
import { getAnalysisElementMedusaProductIds } from '@/utils/medusa-product';
|
||||
@@ -648,55 +647,14 @@ export async function syncPrivateMessage({
|
||||
|
||||
export async function sendOrderToMedipost({
|
||||
medusaOrderId,
|
||||
orderedAnalysisElements,
|
||||
}: {
|
||||
medusaOrderId: string;
|
||||
orderedAnalysisElements: { analysisElementId: number }[];
|
||||
}) {
|
||||
const [medusaOrder, medreportOrder, countryCodes] = await Promise.all([
|
||||
retrieveOrder(medusaOrderId),
|
||||
getOrder({ medusaOrderId }),
|
||||
listRegions(),
|
||||
]);
|
||||
const countryCode = countryCodes[0]!.countries![0]!.iso_2!;
|
||||
const medreportOrder = await getOrder({ medusaOrderId });
|
||||
const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
|
||||
|
||||
let analysisPackageElements: StoreProduct[] = [];
|
||||
const orderedAnalysisPackages = (medusaOrder?.items ?? []).filter(({ product }) => product?.handle.startsWith(ANALYSIS_PACKAGE_HANDLE_PREFIX));
|
||||
const orderedAnalysisElements = (medusaOrder?.items ?? []).filter(({ product }) => product?.handle.startsWith(ANALYSIS_ELEMENT_HANDLE_PREFIX));
|
||||
|
||||
if (orderedAnalysisPackages.length > 0) {
|
||||
const { response: { products: analysisPackages } } = await listProducts({
|
||||
countryCode,
|
||||
queryParams: { limit: 100, "type_id[0]": orderedAnalysisPackages[0]!.product_type_id! },
|
||||
});
|
||||
const analysisElementMedusaProductIds = getAnalysisElementMedusaProductIds(analysisPackages);
|
||||
const { response: { products } } = await listProducts({
|
||||
countryCode,
|
||||
queryParams: {
|
||||
id: analysisElementMedusaProductIds,
|
||||
limit: 100,
|
||||
},
|
||||
});
|
||||
analysisPackageElements = products;
|
||||
}
|
||||
|
||||
const analysisPackageElementsIds = analysisPackageElements
|
||||
.map((product) => {
|
||||
const id = Number(product?.metadata?.analysisIdOriginal);
|
||||
if (Number.isNaN(id)) {
|
||||
return null;
|
||||
}
|
||||
return id;
|
||||
})
|
||||
.filter(Boolean) as number[];
|
||||
const orderedAnalysisElementsIds = orderedAnalysisElements
|
||||
.map((line) => {
|
||||
const id = Number(line.product?.handle?.replace(ANALYSIS_ELEMENT_HANDLE_PREFIX, ''));
|
||||
if (Number.isNaN(id)) {
|
||||
return null;
|
||||
}
|
||||
return id;
|
||||
})
|
||||
.filter(Boolean) as number[];
|
||||
const orderXml = await composeOrderXML({
|
||||
person: {
|
||||
idCode: account.personal_code!,
|
||||
@@ -704,7 +662,7 @@ export async function sendOrderToMedipost({
|
||||
lastName: account.last_name ?? '',
|
||||
phone: account.phone ?? '',
|
||||
},
|
||||
orderedAnalysisElementsIds: [...analysisPackageElementsIds, ...orderedAnalysisElementsIds],
|
||||
orderedAnalysisElementsIds: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId),
|
||||
orderedAnalysesIds: [],
|
||||
orderId: medusaOrderId,
|
||||
orderCreatedAt: new Date(medreportOrder.created_at),
|
||||
@@ -713,3 +671,67 @@ export async function sendOrderToMedipost({
|
||||
|
||||
await sendPrivateMessage(orderXml);
|
||||
}
|
||||
|
||||
export async function getOrderedAnalysisElementsIds({
|
||||
medusaOrder,
|
||||
}: {
|
||||
medusaOrder: StoreOrder;
|
||||
}): Promise<{
|
||||
analysisElementId: number;
|
||||
}[]> {
|
||||
const countryCodes = await listRegions();
|
||||
const countryCode = countryCodes[0]!.countries![0]!.iso_2!;
|
||||
|
||||
function getOrderedAnalysisElements(medusaOrder: StoreOrder) {
|
||||
return (medusaOrder?.items ?? [])
|
||||
.filter(({ product }) => product?.handle.startsWith(ANALYSIS_ELEMENT_HANDLE_PREFIX))
|
||||
.map((line) => {
|
||||
const analysisElementId = Number(line.product?.handle?.replace(ANALYSIS_ELEMENT_HANDLE_PREFIX, ''));
|
||||
if (Number.isNaN(analysisElementId)) {
|
||||
return null;
|
||||
}
|
||||
return { analysisElementId };
|
||||
}) as { analysisElementId: number }[];
|
||||
}
|
||||
|
||||
async function getOrderedAnalysisPackages(medusaOrder: StoreOrder) {
|
||||
const orderedPackages = (medusaOrder?.items ?? []).filter(({ product }) => product?.handle.startsWith(ANALYSIS_PACKAGE_HANDLE_PREFIX));
|
||||
const orderedPackageIds = orderedPackages.map(({ product }) => product?.id).filter(Boolean) as string[];
|
||||
if (orderedPackageIds.length === 0) {
|
||||
return [];
|
||||
}
|
||||
console.info(`Order has ${orderedPackageIds.length} packages`);
|
||||
const { response: { products: orderedPackagesProducts } } = await listProducts({
|
||||
countryCode,
|
||||
queryParams: { limit: 100, id: orderedPackageIds },
|
||||
});
|
||||
console.info(`Order has ${orderedPackagesProducts.length} packages`);
|
||||
if (orderedPackagesProducts.length !== orderedPackageIds.length) {
|
||||
throw new Error(`Got ${orderedPackagesProducts.length} ordered packages products, expected ${orderedPackageIds.length}`);
|
||||
}
|
||||
|
||||
const ids = getAnalysisElementMedusaProductIds(orderedPackagesProducts);
|
||||
const { response: { products: analysisPackagesProducts } } = await listProducts({
|
||||
countryCode,
|
||||
queryParams: { limit: 100, id: ids },
|
||||
});
|
||||
if (analysisPackagesProducts.length !== ids.length) {
|
||||
throw new Error(`Got ${analysisPackagesProducts.length} analysis packages products, expected ${ids.length}`);
|
||||
}
|
||||
|
||||
const originalIds = analysisPackagesProducts
|
||||
.map(({ metadata }) => metadata?.analysisIdOriginal)
|
||||
.filter((id) => typeof id === 'string');
|
||||
if (originalIds.length !== ids.length) {
|
||||
throw new Error(`Got ${originalIds.length} analysis packages products with analysisIdOriginal, expected ${ids.length}`);
|
||||
}
|
||||
const analysisElements = await getAnalysisElements({ originalIds });
|
||||
|
||||
return analysisElements.map(({ id }) => ({ analysisElementId: id }));
|
||||
}
|
||||
|
||||
const analysisPackageElements = await getOrderedAnalysisPackages(medusaOrder);
|
||||
const orderedAnalysisElements = getOrderedAnalysisElements(medusaOrder);
|
||||
|
||||
return [...analysisPackageElements, ...orderedAnalysisElements];
|
||||
}
|
||||
|
||||
@@ -5,15 +5,13 @@ import type { StoreOrder } from '@medusajs/types';
|
||||
|
||||
export async function createOrder({
|
||||
medusaOrder,
|
||||
orderedAnalysisElements,
|
||||
}: {
|
||||
medusaOrder: StoreOrder;
|
||||
orderedAnalysisElements: { analysisElementId: number }[];
|
||||
}) {
|
||||
const supabase = getSupabaseServerClient();
|
||||
|
||||
const analysisElementIds = medusaOrder.items
|
||||
?.filter(({ product }) => product?.handle?.startsWith('analysis-element-'))
|
||||
.map(({ product }) => Number(product?.handle.replace('analysis-element-', '')))
|
||||
.filter((id) => !Number.isNaN(id)) as number[];
|
||||
const { data: { user } } = await supabase.auth.getUser();
|
||||
if (!user) {
|
||||
throw new Error('User not found');
|
||||
@@ -21,7 +19,7 @@ export async function createOrder({
|
||||
const orderResult = await supabase.schema('medreport')
|
||||
.from('analysis_orders')
|
||||
.insert({
|
||||
analysis_element_ids: analysisElementIds,
|
||||
analysis_element_ids: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId),
|
||||
analysis_ids: [],
|
||||
status: 'QUEUED',
|
||||
user_id: user.id,
|
||||
|
||||
Reference in New Issue
Block a user