wip

2025-09-05 01:39:06 +03:00
parent 84216c3ced
commit 0cf04b4f55
29 changed files with 52428 additions and 133 deletions
--- a/app/api/email-template-test/route.ts
+++ b/app/api/email-template-test/route.ts
@@ -0,0 +1,21 @@
+import { NextResponse } from "next/server";
+import { sendEmail } from "~/lib/services/mailer.service";
+
+export const GET = async () => {
+  const { renderInviteEmail } = await import('@kit/email-templates');
+
+  const html = await renderInviteEmail({
+    language: 'en',
+    teamName: 'Test Team',
+    invitedUserEmail: 'test@example.com',
+    productName: 'Test Product',
+    teamLogo: 'https://placehold.co/100x100',
+    inviter: 'John Doe',
+    link: 'https://www.google.com',
+  });
+
+  return NextResponse.json({
+    html,
+    length: html.html.length,
+  });
+};
--- a/app/api/job/handler/sync-analysis-groups.ts
+++ b/app/api/job/handler/sync-analysis-groups.ts
@@ -2,10 +2,10 @@ import axios from 'axios';
 import { XMLParser } from 'fast-xml-parser';
 import fs from 'fs';
 import { createAnalysisGroup, getAnalysisGroups } from '~/lib/services/analysis-group.service';
-import { IMedipostPublicMessageDataParsed } from '~/lib/services/medipost.types';
+import { IMedipostPublicMessageDataParsed, IUuringElement } from '~/lib/services/medipost.types';
 import { createAnalysis, createNoDataReceivedEntry, createNoNewDataReceivedEntry, createSyncFailEntry, createSyncSuccessEntry } from '~/lib/services/analyses.service';
 import { getLastCheckedDate } from '~/lib/services/sync-entries.service';
-import { createAnalysisElement } from '~/lib/services/analysis-element.service';
+import { createAnalysisElement, getAnalysisElements } from '~/lib/services/analysis-element.service';
 import { createCodes } from '~/lib/services/codes.service';
 import { getLatestPublicMessageListItem } from '~/lib/services/medipost.service';
 import type { ICode } from '~/lib/types/code';
@@ -80,81 +80,92 @@ export default async function syncAnalysisGroups() {
    }

    const codes: ICode[] = [];
+    const analysesToCreate: { analysisGroupId: number, analyses: IUuringElement[], analysisElementId: number }[] = [];
    for (const analysisGroup of analysisGroups) {
+      let analysisGroupId: number | undefined;
      const existingAnalysisGroup = existingAnalysisGroups?.find(({ original_id }) => original_id === analysisGroup.UuringuGruppId);
      if (existingAnalysisGroup) {
        console.info(`Analysis group '${analysisGroup.UuringuGruppNimi}' already exists`);
-        continue;
+        analysisGroupId = existingAnalysisGroup.id;
+      } else {
+        // SAVE ANALYSIS GROUP
+        analysisGroupId = await createAnalysisGroup({
+          id: analysisGroup.UuringuGruppId,
+          name: analysisGroup.UuringuGruppNimi,
+          order: analysisGroup.UuringuGruppJarjekord,
+        });
+
+        const analysisGroupCodes = toArray(analysisGroup.Kood);
+        codes.push(
+          ...analysisGroupCodes.map((kood) => ({
+            hk_code: kood.HkKood,
+            hk_code_multiplier: kood.HkKoodiKordaja,
+            coefficient: kood.Koefitsient,
+            price: kood.Hind,
+            analysis_group_id: analysisGroupId!,
+            analysis_element_id: null,
+            analysis_id: null,
+          })),
+        );
      }

-      // SAVE ANALYSIS GROUP
-      const analysisGroupId = await createAnalysisGroup({
-        id: analysisGroup.UuringuGruppId,
-        name: analysisGroup.UuringuGruppNimi,
-        order: analysisGroup.UuringuGruppJarjekord,
-      });
-
-      const analysisGroupCodes = toArray(analysisGroup.Kood);
-      codes.push(
-        ...analysisGroupCodes.map((kood) => ({
-          hk_code: kood.HkKood,
-          hk_code_multiplier: kood.HkKoodiKordaja,
-          coefficient: kood.Koefitsient,
-          price: kood.Hind,
-          analysis_group_id: analysisGroupId,
-          analysis_element_id: null,
-          analysis_id: null,
-        })),
-      );
-
      const analysisGroupItems = toArray(analysisGroup.Uuring);

      for (const item of analysisGroupItems) {
        const analysisElement = item.UuringuElement;

-        const insertedAnalysisElementId = await createAnalysisElement({
-          analysisElement,
-          analysisGroupId,
-          materialGroups: toArray(item.MaterjalideGrupp),
-        });
+        let insertedAnalysisElementId: number | undefined;
+        const existingAnalysisElement = (await getAnalysisElements({ originalIds: [analysisElement.UuringId] }))?.[0];
+        if (existingAnalysisElement) {
+          console.info(`Analysis element '${analysisElement.UuringNimi}' already exists`);
+          insertedAnalysisElementId = existingAnalysisElement.id;
+        } else {
+          insertedAnalysisElementId = await createAnalysisElement({
+            analysisElement,
+            analysisGroupId: analysisGroupId!,
+            materialGroups: toArray(item.MaterjalideGrupp),
+          });
+          if (analysisElement.Kood) {
+            const analysisElementCodes = toArray(analysisElement.Kood);
+            codes.push(
+              ...analysisElementCodes.map((kood) => ({
+                hk_code: kood.HkKood,
+                hk_code_multiplier: kood.HkKoodiKordaja,
+                coefficient: kood.Koefitsient,
+                price: kood.Hind,
+                analysis_group_id: null,
+                analysis_element_id: insertedAnalysisElementId!,
+                analysis_id: null,
+              })),
+            );
+          }
+        }
+
+        const analyses = toArray(analysisElement.UuringuElement);
+        if (analyses?.length && insertedAnalysisElementId) {
+          analysesToCreate.push({ analysisGroupId: analysisGroupId!, analyses, analysisElementId: insertedAnalysisElementId });
+        }
+      }
+    }
+
+    for (const { analysisGroupId, analyses, analysisElementId } of analysesToCreate) {
+      for (const analysis of analyses) {
+        const insertedAnalysisId = await createAnalysis(analysis, analysisElementId);
+        if (analysis.Kood) {
+          const analysisCodes = toArray(analysis.Kood);

-        if (analysisElement.Kood) {
-          const analysisElementCodes = toArray(analysisElement.Kood);
          codes.push(
-            ...analysisElementCodes.map((kood) => ({
+            ...analysisCodes.map((kood) => ({
              hk_code: kood.HkKood,
              hk_code_multiplier: kood.HkKoodiKordaja,
              coefficient: kood.Koefitsient,
              price: kood.Hind,
              analysis_group_id: null,
-              analysis_element_id: insertedAnalysisElementId,
-              analysis_id: null,
+              analysis_element_id: null,
+              analysis_id: insertedAnalysisId,
            })),
          );
        }
-
-        const analyses = analysisElement.UuringuElement;
-        if (analyses?.length) {
-          for (const analysis of analyses) {
-            const insertedAnalysisId = await createAnalysis(analysis, analysisGroupId);
-
-            if (analysis.Kood) {
-              const analysisCodes = toArray(analysis.Kood);
-
-              codes.push(
-                ...analysisCodes.map((kood) => ({
-                  hk_code: kood.HkKood,
-                  hk_code_multiplier: kood.HkKoodiKordaja,
-                  coefficient: kood.Koefitsient,
-                  price: kood.Hind,
-                  analysis_group_id: null,
-                  analysis_element_id: null,
-                  analysis_id: insertedAnalysisId,
-                })),
-              );
-            }
-          }
-        }
      }
    }

--- a/app/api/job/sync-analysis-groups/route.ts
+++ b/app/api/job/sync-analysis-groups/route.ts
@@ -22,6 +22,7 @@ export const POST = async (request: NextRequest) => {
    console.error("Error syncing analysis groups", e);
    return NextResponse.json({
      message: 'Failed to sync analysis groups',
+      error: e instanceof Error ? JSON.stringify(e, undefined, 2) : 'Unknown error',
    }, { status: 500 });
  }
 };
--- a/app/auth/sign-in/page.tsx
+++ b/app/auth/sign-in/page.tsx
@@ -1,5 +1,5 @@
 import Link from 'next/link';
-
+import { redirect } from 'next/navigation';

 import { SignInMethodsContainer } from '@kit/auth/sign-in';
 import { authConfig, pathsConfig } from '@kit/shared/config';
@@ -9,6 +9,7 @@ import { Trans } from '@kit/ui/trans';

 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
+import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';

 interface SignInPageProps {
  searchParams: Promise<{
@@ -40,6 +41,21 @@ async function SignInPage({ searchParams }: SignInPageProps) {
    updateAccount: pathsConfig.auth.updateAccount,
  };

+  // const { data, error } = await getSupabaseServerClient()
+  //   .auth
+  //   .signInWithOAuth({
+  //     provider: 'keycloak',
+  //   });
+
+  // if (error) {
+  //   console.error('OAuth error', error);
+  //   redirect('/');
+  // }
+
+  // if (data.url) {
+  //   redirect(data.url);
+  // }
+
  return (
    <>
      <div className={'flex flex-col items-center gap-1'}>
--- a/app/home/(user)/_components/cart/index.tsx
+++ b/app/home/(user)/_components/cart/index.tsx
@@ -17,6 +17,7 @@ import { formatCurrency } from "@/packages/shared/src/utils";
 import { useTranslation } from "react-i18next";
 import { handleNavigateToPayment } from "@/lib/services/medusaCart.service";
 import AnalysisLocation from "./analysis-location";
+import { composeOrderXML, getOrderedAnalysisIds } from "~/lib/services/medipost.service";

 const IS_DISCOUNT_SHOWN = false as boolean;

@@ -133,6 +134,26 @@ export default function Cart({
          <Trans i18nKey="cart:checkout.goToCheckout" />
        </Button>
      </div>
+
+      <Button type='button' onClick={async () => {
+        const orderedAnalysisElementsIds = await getOrderedAnalysisIds({ medusaOrder: { items: cart.items ?? [] } });
+        const xml = await composeOrderXML({
+          person: {
+            idCode: '1234567890',
+            firstName: 'John',
+            lastName: 'Doe',
+            phone: '1234567890',
+          },
+          orderedAnalysisElementsIds: orderedAnalysisElementsIds.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
+          orderedAnalysesIds: orderedAnalysisElementsIds.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
+          orderId: '1234567890',
+          orderCreatedAt: new Date(),
+        });
+        console.log('test', { items: cart.items, ids: orderedAnalysisElementsIds, xml });
+        console.log('test', xml);
+      }}>
+        Test
+      </Button>
    </div>
  );
 }
--- a/app/home/(user)/_components/order-analyses-cards.tsx
+++ b/app/home/(user)/_components/order-analyses-cards.tsx
@@ -94,7 +94,7 @@ export default function OrderAnalysesCards({
                    className="px-2 text-black"
                    onClick={() => handleSelect(variant.id)}
                  >
-                    {variantAddingToCart ? <Loader2 className="size-4 stroke-2 animate-spin" /> : <ShoppingCart className="size-4 stroke-2" />}
+                    {variantAddingToCart === variant.id ? <Loader2 className="size-4 stroke-2 animate-spin" /> : <ShoppingCart className="size-4 stroke-2" />}
                  </Button>
                </div>
              )}