Merge branch 'develop' into MED-97

app/home/(user)/(dashboard)/cart/page.tsx

@@ -6,11 +6,14 @@ import { listProductTypes } from '@lib/data/products';
 import { Trans } from '@kit/ui/trans';
 
 import { withI18n } from '~/lib/i18n/with-i18n';
+import { getCartReservations } from '~/lib/services/reservation.service';
+import { findProductTypeIdByHandle } from '~/lib/utils';
 
 import Cart from '../../_components/cart';
 import CartTimer from '../../_components/cart/cart-timer';
 import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
 import { AccountBalanceService } from '@kit/accounts/services/account-balance.service';
+import { EnrichedCartItem } from '../../_components/cart/types';
 
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();
@@ -37,29 +40,32 @@ async function CartPage() {
 
   const balanceSummary = await new AccountBalanceService().getBalanceSummary(account.id);
 
-  const analysisPackagesType = productTypes.find(
-    ({ metadata }) => metadata?.handle === 'analysis-packages',
+  const synlabAnalysisTypeId = findProductTypeIdByHandle(
+    productTypes,
+    'synlab-analysis',
   );
-  const synlabAnalysisType = productTypes.find(
-    ({ metadata }) => metadata?.handle === 'synlab-analysis',
+  const analysisPackagesTypeId = findProductTypeIdByHandle(
+    productTypes,
+    'analysis-packages',
   );
+
   const synlabAnalyses =
-    analysisPackagesType && synlabAnalysisType && cart?.items
+    analysisPackagesTypeId && synlabAnalysisTypeId && cart?.items
       ? cart.items.filter((item) => {
           const productTypeId = item.product?.type_id;
           if (!productTypeId) {
             return false;
           }
-          return [analysisPackagesType.id, synlabAnalysisType.id].includes(
+          return [analysisPackagesTypeId, synlabAnalysisTypeId].includes(
             productTypeId,
           );
         })
       : [];
-  const ttoServiceItems =
-    cart?.items?.filter(
-      (item) => !synlabAnalyses.some((analysis) => analysis.id === item.id),
-    ) ?? [];
 
+  let ttoServiceItems: EnrichedCartItem[] = [];
+  if (cart?.items?.length) {
+    ttoServiceItems = await getCartReservations(cart);
+  }
   const otherItemsSorted = ttoServiceItems.sort((a, b) =>
     (a.updated_at ?? '') > (b.updated_at ?? '') ? -1 : 1,
   );