Merge pull request #94 from MR-medreport/develop

develop -> main

app/api/job/handler/sync-analysis-results.ts

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

app/api/job/test-medipost-responses/route.ts

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

app/api/order/medipost-test-response/route.ts

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

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

@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
 }) {
   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) {
     redirect(pathsConfig.app.myOrders);
   }

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

@@ -27,7 +27,7 @@ async function OrderConfirmedPage(props: {
 }) {
   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) {
     redirect(pathsConfig.app.myOrders);
   }

app/select-package/page.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
 import { CaretRightIcon } from '@radix-ui/react-icons';
 import { Scale } from 'lucide-react';
@@ -14,7 +15,6 @@ import { withI18n } from '~/lib/i18n/with-i18n';
 
 import ComparePackagesModal from '../home/(user)/_components/compare-packages-modal';
 import { loadAnalysisPackages } from '../home/(user)/_lib/server/load-analysis-packages';
-import { redirect } from 'next/navigation';
 
 export const generateMetadata = async () => {
   const { t } = await createI18nServerInstance();

lib/services/medipost.service.ts

@@ -194,12 +194,13 @@ export async function readPrivateMessageResponse({
   excludedMessageIds,
 }: {
   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 hasAnalysisResponse = false;
   let hasPartialAnalysisResponse = false;
   let hasFullAnalysisResponse = false;
   let medusaOrderId: string | undefined = undefined;
+  let analysisOrderId: number | undefined = undefined;
 
   try {
     const privateMessage = await getLatestPrivateMessageListItem({ excludedMessageIds });
@@ -212,6 +213,7 @@ export async function readPrivateMessageResponse({
         hasPartialAnalysisResponse: false,
         hasFullAnalysisResponse: false,
         medusaOrderId: undefined,
+        analysisOrderId: undefined
       };
     }
 
@@ -220,16 +222,15 @@ export async function readPrivateMessageResponse({
     );
 
     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) {
       await createMedipostActionLog({
         action: 'sync_analysis_results_from_medipost',
         xml: privateMessageXml,
         hasAnalysisResults: false,
-        medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
       });
       return {
         messageId,
@@ -237,9 +238,13 @@ export async function readPrivateMessageResponse({
         hasPartialAnalysisResponse: false,
         hasFullAnalysisResponse: false,
         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'>;
     try {
       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}`);
   }
 
-  return { messageId, hasAnalysisResponse, hasPartialAnalysisResponse, hasFullAnalysisResponse, medusaOrderId };
+  return { messageId, hasAnalysisResponse, hasPartialAnalysisResponse, hasFullAnalysisResponse, medusaOrderId, analysisOrderId };
 }
 
 async function saveAnalysisGroup(
@@ -616,7 +621,7 @@ export async function sendOrderToMedipost({
       lastName: account.last_name ?? '',
       phone: account.phone ?? '',
     },
-    orderId: medusaOrderId,
+    orderId: medreportOrder.id,
     orderCreatedAt: new Date(medreportOrder.created_at),
     comment: '',
   });

lib/services/medipostTest.service.ts

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

lib/services/medipostXML.service.ts

@@ -45,7 +45,7 @@ export async function composeOrderXML({
     lastName: string;
     phone: string;
   };
-  orderId: string;
+  orderId: number;
   orderCreatedAt: Date;
   comment?: string;
 }) {
@@ -76,42 +76,34 @@ export async function composeOrderXML({
 
   // Collect all materials from all analysis groups
   for (const currentGroup of analysisGroups) {
-    let relatedAnalysisElement = analysisElements?.find(
-      (element) => element.analysis_groups.id === currentGroup.id,
-    );
-    const relatedAnalyses = analyses?.filter((analysis) => {
-      return analysis.analysis_elements.analysis_groups.id === currentGroup.id;
-    });
+    let relatedAnalysisElements = analysisElements?.filter(({ analysis_groups }) => analysis_groups.id === currentGroup.id);
 
-    if (!relatedAnalysisElement) {
-      relatedAnalysisElement = relatedAnalyses?.find(
-        (relatedAnalysis) =>
-          relatedAnalysis.analysis_elements.analysis_groups.id ===
-          currentGroup.id,
-      )?.analysis_elements;
+    if (!relatedAnalysisElements || relatedAnalysisElements.length === 0) {
+      relatedAnalysisElements = analyses
+        .filter(({ analysis_elements }) => analysis_elements.analysis_groups.id === currentGroup.id)
+        .flatMap(({ analysis_elements }) => analysis_elements);
     }
 
-    if (!relatedAnalysisElement || !relatedAnalysisElement.material_groups) {
+    if (!relatedAnalysisElements || relatedAnalysisElements.length === 0) {
       throw new Error(
-        `Failed to find related analysis element for group ${currentGroup.name} (id: ${currentGroup.id})`,
+        `Failed to find related analysis elements for group ${currentGroup.name} (id: ${currentGroup.id})`,
       );
     }
 
-    for (const group of relatedAnalysisElement?.material_groups as MaterjalideGrupp[]) {
-      const materials = toArray(group.Materjal);
-      for (const material of materials) {
-        const { MaterjaliNimi, MaterjaliTyyp, MaterjaliTyypOID, Konteiner } = material;
-        const containers = toArray(Konteiner);
+    for (const analysisElement of relatedAnalysisElements) {
+      for (const { Materjal } of analysisElement.material_groups as MaterjalideGrupp[]) {
+        for (const material of toArray(Materjal)) {
+          const { MaterjaliTyyp } = material;
 
-        for (const container of containers) {
-          // Use MaterialTyyp as the key for deduplication
-          const materialKey = MaterjaliTyyp;
+          for (const container of toArray(material.Konteiner)) {
+            if (uniqueMaterials.has(MaterjaliTyyp)) {
+              continue;
+            }
 
-          if (!uniqueMaterials.has(materialKey)) {
-            uniqueMaterials.set(materialKey, {
-              MaterjaliTyypOID,
-              MaterjaliTyyp,
-              MaterjaliNimi,
+            uniqueMaterials.set(MaterjaliTyyp, {
+              MaterjaliTyypOID: material.MaterjaliTyypOID,
+              MaterjaliTyyp: material.MaterjaliTyyp,
+              MaterjaliNimi: material.MaterjaliNimi,
               ProovinouKoodOID: container.ProovinouKoodOID,
               ProovinouKood: container.ProovinouKood,
               order: specimenOrder++,
@@ -137,47 +129,48 @@ export async function composeOrderXML({
   // Generate analysis section with correct specimen references
   const analysisSection = [];
   for (const currentGroup of analysisGroups) {
-    let relatedAnalysisElement = analysisElements?.find(
+    let relatedAnalysisElements = analysisElements?.filter(
       (element) => element.analysis_groups.id === currentGroup.id,
     );
-    const relatedAnalyses = analyses?.filter((analysis) => {
-      return analysis.analysis_elements.analysis_groups.id === currentGroup.id;
-    });
 
-    if (!relatedAnalysisElement) {
-      relatedAnalysisElement = relatedAnalyses?.find(
-        (relatedAnalysis) =>
-          relatedAnalysis.analysis_elements.analysis_groups.id ===
-          currentGroup.id,
-      )?.analysis_elements;
+    if (!relatedAnalysisElements) {
+      relatedAnalysisElements = analyses
+        .filter(({ analysis_elements }) => analysis_elements.analysis_groups.id === currentGroup.id)
+        .flatMap(({ analysis_elements }) => analysis_elements);
     }
 
-    if (!relatedAnalysisElement || !relatedAnalysisElement.material_groups) {
+    if (!relatedAnalysisElements || relatedAnalysisElements.length === 0) {
       throw new Error(
         `Failed to find related analysis element for group ${currentGroup.name} (id: ${currentGroup.id})`,
       );
     }
 
-    // Find the specimen order number for this analysis group
-    let specimenOrderNumber = 1;
-    for (const group of relatedAnalysisElement?.material_groups as MaterjalideGrupp[]) {
+    // Find the specimen order numbers for analysis elements
+    const uuringElementInputs: {
+      analysisElement: Tables<{ schema: 'medreport' }, 'analysis_elements'>,
+      specimenOrderNr: number,
+    }[] = [];
+    for (const analysisElement of relatedAnalysisElements) {
+      for (const group of analysisElement.material_groups as MaterjalideGrupp[]) {
         const materials = toArray(group.Materjal);
         for (const material of materials) {
-        const materialKey = material.MaterjaliTyyp;
-        const uniqueMaterial = uniqueMaterials.get(materialKey);
-        if (uniqueMaterial) {
-          specimenOrderNumber = uniqueMaterial.order;
-          break; // Use the first material's order number
+          const uniqueMaterial = uniqueMaterials.get(material.MaterjaliTyyp);
+          if (!uniqueMaterial) {
+            continue;
+          }
+          uuringElementInputs.push({
+            analysisElement,
+            specimenOrderNr: uniqueMaterial.order,
+          });
+          break;
         }
       }
-      if (specimenOrderNumber > 1) break; // Found a specimen, use it
     }
 
     const groupXml = getAnalysisGroup(
       currentGroup.original_id,
       currentGroup.name,
-      specimenOrderNumber,
-      relatedAnalysisElement,
+      uuringElementInputs,
     );
     analysisSection.push(groupXml);
   }

lib/services/order.service.ts

@@ -82,10 +82,10 @@ export async function updateAnalysisOrderStatus({
 
 export async function getAnalysisOrder({
   medusaOrderId,
-  orderId,
+  analysisOrderId,
 }: {
   medusaOrderId?: string;
-  orderId?: number;
+  analysisOrderId?: number;
 }) {
   const query = getSupabaseServerAdminClient()
     .schema('medreport')
@@ -93,15 +93,15 @@ export async function getAnalysisOrder({
     .select('*')
   if (medusaOrderId) {
     query.eq('medusa_order_id', medusaOrderId);
-  } else if (orderId) {
-    query.eq('id', orderId);
+  } else if (analysisOrderId) {
+    query.eq('id', analysisOrderId);
   } else {
     throw new Error('Either medusaOrderId or orderId must be provided');
   }
 
   const { data: order, error } = await query.single();
   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;
 }

lib/templates/medipost-order.ts

@@ -8,8 +8,7 @@ const isProd = process.env.NODE_ENV === 'production';
 export const getPais = (
   sender: string,
   recipient: string,
-  createdAt: Date,
-  orderId: string,
+  orderId: number,
   packageName = "OL",
 ) => {
   if (isProd) {
@@ -152,14 +151,21 @@ export const getAnalysisElement = (
 export const getAnalysisGroup = (
   analysisGroupOriginalId: string,
   analysisGroupName: string,
-  specimenOrderNr: number,
+  uuringElementInputs: {
     analysisElement: Tables<{ schema: 'medreport' }, 'analysis_elements'>,
-) =>
-  `<UuringuGrupp>
-		<UuringuGruppId>${analysisGroupOriginalId}</UuringuGruppId>
-		<UuringuGruppNimi>${analysisGroupName}</UuringuGruppNimi>
-		<Uuring>
+    specimenOrderNr: number,
+  }[],
+) => {
+  const uuringElements = uuringElementInputs.map(({ analysisElement, specimenOrderNr }) => 
+    `<Uuring>
 		${getAnalysisElement(analysisElement.analysis_id_oid, analysisElement.analysis_id_original, analysisElement.tehik_short_loinc, analysisElement.tehik_loinc_name, analysisElement.id, analysisElement.analysis_name_lab)}
 		<ProoviJarjenumber>${specimenOrderNr}</ProoviJarjenumber>
-		</Uuring>
+		</Uuring>`
+  ).join('');
+
+  return `<UuringuGrupp>
+		<UuringuGruppId>${analysisGroupOriginalId}</UuringuGruppId>
+		<UuringuGruppNimi>${analysisGroupName}</UuringuGruppNimi>
+		${uuringElements}
 	</UuringuGrupp>`;
+};

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

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

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

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

packages/shared/src/components/select-analysis-package.tsx

@@ -6,11 +6,9 @@ import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 
 import type { AdminProductVariant, StoreProduct } from '@medusajs/types';
-import { Button } from '@medusajs/ui';
 import { useTranslation } from 'react-i18next';
-import { handleAddToCart } from '../../../../lib/services/medusaCart.service';
-import { toast } from '@kit/ui/sonner';
 
+import { Button } from '@kit/ui/button';
 import {
   Card,
   CardContent,
@@ -18,12 +16,20 @@ import {
   CardFooter,
   CardHeader,
 } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+import { Spinner } from '@kit/ui/spinner';
 import { Trans } from '@kit/ui/trans';
-import { ButtonTooltip } from './ui/button-tooltip';
-import { PackageHeader } from './package-header';
-import { pathsConfig } from '../config';
 
-export type AnalysisPackageWithVariant = Pick<StoreProduct, 'title' | 'description' | 'subtitle' | 'metadata'> & {
+import { handleAddToCart } from '~/lib/services/medusaCart.service';
+
+import { pathsConfig } from '../config';
+import { PackageHeader } from './package-header';
+import { ButtonTooltip } from './ui/button-tooltip';
+
+export type AnalysisPackageWithVariant = Pick<
+  StoreProduct,
+  'title' | 'description' | 'subtitle' | 'metadata'
+> & {
   variantId: string;
   nrOfAnalyses: number;
   price: number;
@@ -38,7 +44,7 @@ export default function SelectAnalysisPackage({
   countryCode,
 }: {
   analysisPackage: AnalysisPackageWithVariant;
-  countryCode: string,
+  countryCode: string;
 }) {
   const router = useRouter();
   const {
@@ -48,7 +54,14 @@ export default function SelectAnalysisPackage({
 
   const [isAddingToCart, setIsAddingToCart] = useState(false);
 
-  const { nrOfAnalyses, variantId, title, subtitle = '', description = '', price } = analysisPackage;
+  const {
+    nrOfAnalyses,
+    variantId,
+    title,
+    subtitle = '',
+    description = '',
+    price,
+  } = analysisPackage;
 
   const handleSelect = async () => {
     setIsAddingToCart(true);
@@ -58,10 +71,16 @@ export default function SelectAnalysisPackage({
         countryCode,
       });
       setIsAddingToCart(false);
-      toast.success(<Trans i18nKey={'order-analysis-package:analysisPackageAddedToCart'} />);
+      toast.success(
+        <Trans i18nKey={'order-analysis-package:analysisPackageAddedToCart'} />,
+      );
       router.push(pathsConfig.app.cart);
     } catch (e) {
-      toast.error(<Trans i18nKey={'order-analysis-package:analysisPackageAddToCartError'} />);
+      toast.error(
+        <Trans
+          i18nKey={'order-analysis-package:analysisPackageAddToCartError'}
+        />,
+      );
       setIsAddingToCart(false);
       console.error(e);
     }
@@ -87,7 +106,7 @@ export default function SelectAnalysisPackage({
       <CardContent className="space-y-1 text-center">
         <PackageHeader
           title={title}
-          tagColor='bg-cyan'
+          tagColor="bg-cyan"
           analysesNr={t('product:nrOfAnalyses', { nr: nrOfAnalyses })}
           language={language}
           price={price}
@@ -95,8 +114,15 @@ export default function SelectAnalysisPackage({
         <CardDescription>{subtitle}</CardDescription>
       </CardContent>
       <CardFooter>
-        <Button className="w-full text-[10px] sm:text-sm" onClick={handleSelect} isLoading={isAddingToCart}>
-          {!isAddingToCart && <Trans i18nKey='order-analysis-package:selectThisPackage' />}
+        <Button
+          className="w-full text-[10px] sm:text-sm"
+          onClick={handleSelect}
+        >
+          {isAddingToCart ? (
+            <Spinner />
+          ) : (
+            <Trans i18nKey="order-analysis-package:selectThisPackage" />
+          )}
         </Button>
       </CardFooter>
     </Card>

packages/shared/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "@kit/tsconfig/base.json",
   "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
+    "paths": {
+      "~/lib/*": ["../../lib/*"]
+    }
   },
   "include": ["*.ts", "src"],
   "exclude": ["node_modules"]

public/locales/et/common.json

@@ -46,7 +46,7 @@
   "skip": "Jäta vahele",
   "signedInAs": "Sisselogitud kasutajana",
   "pageOfPages": "Leht {{page}} / {{total}}",
-  "noData": "Andmeid puudub",
+  "noData": "Andmed puuduvad",
   "pageNotFoundHeading": "Ups! :|",
   "errorPageHeading": "Ups! :|",
   "notifications": "Teavitused",