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

update naming to be clearer

Browse Source
This commit is contained in:
Karli
2025-09-09 13:42:44 +03:00
parent 85c72e777b
commit 7d208b41f2
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import { getOrder } from "~/lib/services/order.service"; import { getAnalysisOrder } from "~/lib/services/order.service";
import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service"; import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
import { retrieveOrder } from "@lib/data"; import { retrieveOrder } from "@lib/data";
import { getAccountAdmin } from "~/lib/services/account.service"; import { getAccountAdmin } from "~/lib/services/account.service";
@@ -14,9 +14,9 @@ export async function POST(request: Request) {
const { medusaOrderId } = await request.json(); const { medusaOrderId } = await request.json();
const medusaOrder = await retrieveOrder(medusaOrderId) const medusaOrder = await retrieveOrder(medusaOrderId)
const medreportOrder = await getOrder({ medusaOrderId }); const analysisOrder = await getAnalysisOrder({ medusaOrderId });
const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id }); const account = await getAccountAdmin({ primaryOwnerUserId: analysisOrder.user_id });
const orderedAnalysisElementsIds = await getOrderedAnalysisIds({ medusaOrder }); const orderedAnalysisElementsIds = await getOrderedAnalysisIds({ medusaOrder });
console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`); console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`);
@@ -30,7 +30,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: medusaOrderId,
orderCreatedAt: new Date(medreportOrder.created_at), orderCreatedAt: new Date(analysisOrder.created_at),
}); });
try { try {

4
app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts
View File

@@ -7,7 +7,7 @@ import { loadCurrentUserAccount } from "@/app/home/(user)/_lib/server/load-user-
import { listProductTypes } from "@lib/data/products"; import { listProductTypes } from "@lib/data/products";
import { placeOrder, retrieveCart } from "@lib/data/cart"; import { placeOrder, retrieveCart } from "@lib/data/cart";
import { createI18nServerInstance } from "~/lib/i18n/i18n.server"; import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
import { createOrder } from '~/lib/services/order.service'; import { createAnalysisOrder } from '~/lib/services/order.service';
import { getOrderedAnalysisIds, sendOrderToMedipost } from '~/lib/services/medipost.service'; import { getOrderedAnalysisIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
import { createNotificationsApi } from '@kit/notifications/api'; import { createNotificationsApi } from '@kit/notifications/api';
import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client'; import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
@@ -114,7 +114,7 @@ export async function processMontonioCallback(orderToken: string) {
const medusaOrder = await placeOrder(cartId, { revalidateCacheTags: false }); const medusaOrder = await placeOrder(cartId, { revalidateCacheTags: false });
const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder }); const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder });
const orderId = await createOrder({ medusaOrder, orderedAnalysisElements }); const orderId = await createAnalysisOrder({ medusaOrder, orderedAnalysisElements });
const { productTypes } = await listProductTypes(); const { productTypes } = await listProductTypes();
const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE); const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE);

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

@@ -4,7 +4,7 @@ import { PageBody, PageHeader } from '@kit/ui/page';
import { createI18nServerInstance } from '@/lib/i18n/i18n.server'; import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n'; import { withI18n } from '~/lib/i18n/with-i18n';
import { getOrder } from '~/lib/services/order.service'; import { getAnalysisOrder } from '~/lib/services/order.service';
import { retrieveOrder } from '@lib/data/orders'; import { retrieveOrder } from '@lib/data/orders';
import { pathsConfig } from '@kit/shared/config'; import { pathsConfig } from '@kit/shared/config';
@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
}) { }) {
const params = await props.params; const params = await props.params;
const order = await getOrder({ orderId: Number(params.orderId) }).catch(() => null); const order = await getAnalysisOrder({ orderId: Number(params.orderId) }).catch(() => null);
if (!order) { if (!order) {
redirect(pathsConfig.app.myOrders); redirect(pathsConfig.app.myOrders);
} }

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

@@ -4,7 +4,7 @@ import { PageBody, PageHeader } from '@kit/ui/page';
import { createI18nServerInstance } from '@/lib/i18n/i18n.server'; import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n'; import { withI18n } from '~/lib/i18n/with-i18n';
import { getOrder } from '~/lib/services/order.service'; import { getAnalysisOrder } from '~/lib/services/order.service';
import { retrieveOrder } from '@lib/data/orders'; import { retrieveOrder } from '@lib/data/orders';
import { pathsConfig } from '@kit/shared/config'; import { pathsConfig } from '@kit/shared/config';
@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
}) { }) {
const params = await props.params; const params = await props.params;
const order = await getOrder({ orderId: Number(params.orderId) }).catch(() => null); const order = await getAnalysisOrder({ orderId: Number(params.orderId) }).catch(() => null);
if (!order) { if (!order) {
redirect(pathsConfig.app.myOrders); redirect(pathsConfig.app.myOrders);
} }

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

@@ -24,7 +24,7 @@ import { XMLParser } from 'fast-xml-parser';
import { Tables } from '@kit/supabase/database'; import { Tables } from '@kit/supabase/database';
import { createAnalysisGroup } from './analysis-group.service'; import { createAnalysisGroup } from './analysis-group.service';
import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client'; import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client';
import { getOrder, updateOrderStatus } from './order.service'; import { getAnalysisOrder, updateAnalysisOrderStatus } from './order.service';
import { getAnalysisElements, getAnalysisElementsAdmin } from './analysis-element.service'; import { getAnalysisElements, getAnalysisElementsAdmin } from './analysis-element.service';
import { getAnalyses } from './analyses.service'; import { getAnalyses } from './analyses.service';
import { getAccountAdmin } from './account.service'; import { getAccountAdmin } from './account.service';
@@ -242,7 +242,7 @@ export async function readPrivateMessageResponse({
let order: Tables<{ schema: 'medreport' }, 'analysis_orders'>; let order: Tables<{ schema: 'medreport' }, 'analysis_orders'>;
try { try {
order = await getOrder({ medusaOrderId }); order = await getAnalysisOrder({ medusaOrderId });
} catch (e) { } catch (e) {
await deletePrivateMessage(privateMessage.messageId); await deletePrivateMessage(privateMessage.messageId);
throw new Error(`Order not found by Medipost message ValisTellimuseId=${medusaOrderId}`); throw new Error(`Order not found by Medipost message ValisTellimuseId=${medusaOrderId}`);
@@ -251,11 +251,11 @@ export async function readPrivateMessageResponse({
const status = await syncPrivateMessage({ messageResponse, order }); const status = await syncPrivateMessage({ messageResponse, order });
if (status.isPartial) { if (status.isPartial) {
await updateOrderStatus({ medusaOrderId, orderStatus: 'PARTIAL_ANALYSIS_RESPONSE' }); await updateAnalysisOrderStatus({ medusaOrderId, orderStatus: 'PARTIAL_ANALYSIS_RESPONSE' });
hasAnalysisResponse = true; hasAnalysisResponse = true;
hasPartialAnalysisResponse = true; hasPartialAnalysisResponse = true;
} else if (status.isCompleted) { } else if (status.isCompleted) {
await updateOrderStatus({ medusaOrderId, orderStatus: 'FULL_ANALYSIS_RESPONSE' }); await updateAnalysisOrderStatus({ medusaOrderId, orderStatus: 'FULL_ANALYSIS_RESPONSE' });
await deletePrivateMessage(privateMessage.messageId); await deletePrivateMessage(privateMessage.messageId);
hasAnalysisResponse = true; hasAnalysisResponse = true;
hasFullAnalysisResponse = true; hasFullAnalysisResponse = true;
@@ -588,7 +588,7 @@ export async function sendOrderToMedipost({
medusaOrderId: string; medusaOrderId: string;
orderedAnalysisElements: OrderedAnalysisElement[]; orderedAnalysisElements: OrderedAnalysisElement[];
}) { }) {
const medreportOrder = await getOrder({ medusaOrderId }); const medreportOrder = await getAnalysisOrder({ medusaOrderId });
const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id }); const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
const orderedAnalysesIds = orderedAnalysisElements const orderedAnalysesIds = orderedAnalysisElements
@@ -668,7 +668,7 @@ export async function sendOrderToMedipost({
hasAnalysisResults: false, hasAnalysisResults: false,
medusaOrderId, medusaOrderId,
}); });
await updateOrderStatus({ medusaOrderId, orderStatus: 'PROCESSING' }); await updateAnalysisOrderStatus({ medusaOrderId, orderStatus: 'PROCESSING' });
} }
export async function getOrderedAnalysisIds({ export async function getOrderedAnalysisIds({

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

@@ -5,7 +5,7 @@ import type { StoreOrder } from '@medusajs/types';
export type AnalysisOrder = Tables<{ schema: 'medreport' }, 'analysis_orders'>; export type AnalysisOrder = Tables<{ schema: 'medreport' }, 'analysis_orders'>;
export async function createOrder({ export async function createAnalysisOrder({
medusaOrder, medusaOrder,
orderedAnalysisElements, orderedAnalysisElements,
}: { }: {
@@ -38,7 +38,7 @@ export async function createOrder({
return orderResult.data.id; return orderResult.data.id;
} }
export async function updateOrder({ export async function updateAnalysisOrder({
orderId, orderId,
orderStatus, orderStatus,
}: { }: {
@@ -56,7 +56,7 @@ export async function updateOrder({
.throwOnError(); .throwOnError();
} }
export async function updateOrderStatus({ export async function updateAnalysisOrderStatus({
orderId, orderId,
medusaOrderId, medusaOrderId,
orderStatus, orderStatus,
@@ -80,7 +80,7 @@ export async function updateOrderStatus({
.throwOnError(); .throwOnError();
} }
export async function getOrder({ export async function getAnalysisOrder({
medusaOrderId, medusaOrderId,
orderId, orderId,
}: { }: {