@delicity/client-cart 1.2.11 → 1.2.12

package/src/service/CartService.ts

@@ -0,0 +1,139 @@
+import {
+    ICart,
+    ICartItem,
+    ICartModifierGroup,
+    IClientConfig,
+    Menu,
+    MenuItem,
+    OrderModesEnum
+} from "@delicity/client-types";
+import axios from "axios";
+
+export function getProductPriceSum(cart:ICart): number{
+    return cart.items.reduce((acc, item) => acc + item.totalPrice, 0);
+}
+export function getProductCount(cart:ICart): number{
+    return cart.items.reduce((acc, item) => acc + item.quantity, 0);
+}
+
+export function getItemModifierValue(item:ICartItem): string {
+    return getItemModifierValueArray(item).join(', ');
+}
+export function getItemModifierValueArray(item:ICartItem): string[] {
+    return item.modifierGroups
+        .filter(mg => mg.modifiers.length > 0)
+        .map(mg => {
+            return mg.item.name + ': ' + mg.modifiers.map(m => m.item.name).join(', ');
+        })
+}
+
+export function mandatoryModifierCheck(item: MenuItem, cartModifier: ICartModifierGroup[], menu: Menu): boolean{
+    if(!item.children) return true;
+
+    // get all mandatory modifiers in this item.
+    const modifierGroups = menu.modifierGroups.filter((m:any) => item.children?.includes(m.uid) && m.min>0 && m.min);
+
+    for(let modifier of modifierGroups){
+        const m = cartModifier.find((m:any) => m.item.uid === modifier.uid);
+        if(!m) return false;
+        if(modifier.min === null) continue;
+
+        const selectedOption = m.modifiers.reduce((acc:any, m:any) => acc + m.quantity, 0);
+        if(selectedOption < modifier.min) return false;
+    }
+
+    return true;
+}
+
+export function isItemAvailable(item: MenuItem, menu: Menu){
+    const menuItem = menu.items.find((i:any) => i.uid === item.uid);
+    if(!menuItem) return false;
+    return !menuItem.unavailable;
+}
+
+
+export function getProductPrice(item:MenuItem, mode:OrderModesEnum): number{
+    if(!item.price){
+        throw new Error('price_not_set');
+    }
+    if(typeof item.price === 'number'){
+        return item.price;
+    }
+    if(mode === 'delivery'){
+        return item.price.delivery;
+    }
+    else if(mode === 'pickup'){
+        return item.price.pickup;
+    }
+    else if(mode === 'on_site_counter'){
+        return item.price.onsite;
+    }
+    return item.price.delivery;
+}
+
+export function getTotalModifiersUnitPrice(modifierGroup:ICartModifierGroup[]): number{
+    return modifierGroup.reduce((acc, mg) => acc + mg.modifiers.reduce((bcc, m) => bcc + m.price, 0), 0);
+}
+
+export function isItemAlreadyInCart(item:MenuItem, modifierGroups:ICartModifierGroup[], cart:ICart, comment?:string): number{
+    // Check if item is already in cart
+    const sameCartProducts = cart.items
+        .filter((i) => i.item.uid === item.uid)
+        .filter((i) => i.comment === (comment||null))
+        .filter((c) => {
+            if(c.modifierGroups.length !== modifierGroups.length) return false;
+            const newItemModifierGroupsKey = modifierGroups.flatMap((m) => {
+                return m.modifiers.map((o) => {return {id: o.item.id, quantity: o.quantity}});
+            }).sort((a, b) => a.id - b.id).map((m) => m.id + ':' + m.quantity).join('|');
+            const CartItemModifierGroupsKey = c.modifierGroups.flatMap((m) => {
+                return m.modifiers.map((o) => {return {id: o.item.id, quantity: o.quantity}});
+            }).sort((a, b) => a.id - b.id).map((m) => m.id + ':' + m.quantity).join('|');
+            return newItemModifierGroupsKey === CartItemModifierGroupsKey;
+        })
+
+    // If not existing in cart, return -1
+    if(sameCartProducts.length === 0) return -1;
+
+    return cart.items.findIndex((c) => c.uuid === sameCartProducts[0].uuid);
+}
+
+
+export function synchronizeCart(config:IClientConfig, cart: ICart){
+    return new Promise(((resolve, reject) => {
+        config.axiosClient.post(config.apiUrl+'/v1/client/cart/'+cart.uuid, cart)
+            .then((response) => {
+                resolve(response.data);
+            })
+            .catch((error) => {
+                reject(error);
+            })
+    }));
+}
+
+
+export function addDiscountCode(config:IClientConfig, cart: ICart, code: string){
+    return new Promise(((resolve, reject) => {
+        config.axiosClient.put(config.apiUrl+'/v1/client/cart/'+cart.uuid+"/coupon", {code})
+            .then((response) => {
+                resolve(response.data);
+            })
+            .catch((error) => {
+                reject(error);
+            })
+    }));
+}
+
+
+export function removeDiscountCode(config:IClientConfig, cart: ICart, discountId: number){
+    return new Promise(((resolve, reject) => {
+        config.axiosClient.delete(config.apiUrl+'/v1/client/cart/'+cart.uuid+'/coupon/'+discountId)
+            .then((response) => {
+                resolve(response.data);
+            })
+            .catch((error) => {
+                reject(error);
+            })
+    }));
+}
+
+

package/src/service/CategoryAvailabilityService.ts

@@ -0,0 +1,121 @@
+import {DateTime, Interval} from "luxon";
+//@ts-ignore
+import ScheduleManagement from "@delicity/backend-schedule-management";
+import ScheduleMerger from "@delicity/backend-schedule-management/ScheduleMerger";
+
+export interface CategoryAvailabilitySlot {
+    id: number;
+    day: number;
+    start: string;
+    end: string;
+}
+
+export interface CategoryAvailability {
+    type: 'some_days' | 'some_shifts' | 'timetable' | 'one_date' | 'between_two_date';
+    slots: CategoryAvailabilitySlot[];
+    startDate: string;
+    endDate: string;
+    weekNumber: number;
+    weekYear: number;
+}
+
+export interface CategoryAvailableResponse {
+    isAvailable: boolean;
+    willBeAvailableInTheFuture: boolean;
+}
+
+export function categoryAvailable(availability: CategoryAvailability, atDate: DateTime, merchantSchedule: ScheduleManagement): CategoryAvailableResponse{
+    const category = new ScheduleManagement(availability.slots)
+    const categorySchedule = ScheduleMerger(category, merchantSchedule);
+
+    // If merchant is open
+    if(availability.type === 'some_days'){
+        if(categorySchedule.isOpenAt(atDate)){
+            return {
+                isAvailable: true,
+                willBeAvailableInTheFuture: true
+            };
+        }
+    }
+    else if(availability.type === 'some_shifts'){
+        if(categorySchedule.isOpenAt(atDate)){
+            return {
+                isAvailable: true,
+                willBeAvailableInTheFuture: true
+            };
+        }
+    }
+    else if(availability.type === 'timetable'){
+        if(categorySchedule.isOpenAt(atDate)){
+            return {
+                isAvailable: true,
+                willBeAvailableInTheFuture: true
+            };
+        }
+    }
+    // if category is open only at one date
+    else if(availability.type === 'one_date'){
+        // only this day ?
+        if(DateTime.fromFormat(availability.startDate, 'yyyy-LL-dd').hasSame(atDate, 'day')){
+            if(categorySchedule.isOpenAt(atDate)){
+                return {
+                    isAvailable: true,
+                    willBeAvailableInTheFuture: false
+                };
+            }
+        }
+    }
+    else if(availability.type === 'between_two_date'){
+        const start = DateTime.fromFormat(availability.startDate, 'yyyy-LL-dd');
+        const end = DateTime.fromFormat(availability.endDate, 'yyyy-LL-dd').endOf('day');
+        if(start.toSeconds() < atDate.toSeconds() && end.toSeconds() >= atDate.toSeconds()){
+            if(categorySchedule.isOpenAt(atDate)){
+                return {
+                    isAvailable: true,
+                    willBeAvailableInTheFuture: false
+                };
+            }
+        }
+    }
+
+    let willBeAvailableInTheFuture = true;
+    if(availability.type === 'between_two_date' || availability.type === 'one_date'){
+        willBeAvailableInTheFuture = DateTime.fromFormat(availability.startDate, 'yyyy-LL-dd').toSeconds() > atDate.toSeconds();
+    }
+
+    return {
+        isAvailable: false,
+        willBeAvailableInTheFuture
+    };
+}
+
+
+export function getAvailabilityNextInterval(availability: CategoryAvailability, merchantSchedule: ScheduleManagement, atDate: DateTime): Interval | null{
+    const category = new ScheduleManagement(availability.slots)
+    const categorySchedule = ScheduleMerger(category, merchantSchedule);
+
+    if(availability.type === 'some_days' || availability.type === 'some_shifts' || availability.type === 'timetable'){
+        const nextOpen = categorySchedule.getNextOpen(atDate);
+        if(nextOpen){
+            const dateIntervals = categorySchedule.getNextOpeningHoursInterval(Interval.fromDateTimes(nextOpen.startOf('day'), nextOpen.endOf('day')));
+            if(dateIntervals.length === 0) return null;
+            return dateIntervals[0];
+        }
+    }
+    else if(availability.type === 'one_date'){
+        const date = DateTime.fromFormat(availability.startDate, 'yyyy-LL-dd');
+        const dateIntervals = categorySchedule.getNextOpeningHoursInterval(Interval.fromDateTimes(date.startOf('day'), date.endOf('day')));
+        if(dateIntervals.length === 0) return null;
+        return dateIntervals[0];
+    }
+    else if(availability.type === 'between_two_date'){
+        const start = DateTime.fromFormat(availability.startDate, 'yyyy-LL-dd');
+        const end = DateTime.fromFormat(availability.endDate, 'yyyy-LL-dd');
+        const dateIntervals = categorySchedule.getNextOpeningHoursInterval(Interval.fromDateTimes(start.startOf('day'), end.endOf('day')))
+        if(dateIntervals.length === 0) return null;
+        return dateIntervals[0];
+    }
+    return null;
+}
+
+

package/src/service/DeliveryService.ts

@@ -0,0 +1,17 @@
+import {Point} from "geojson";
+import {ICartDelivery, IClientConfig} from "@delicity/client-types";
+
+export async function getDeliveryDetails(config:IClientConfig, merchantId: number, position: Point):Promise<ICartDelivery>{
+    return new Promise(((resolve, reject) => {
+        config.axiosClient.post(config.apiUrl + '/v1/client/cart/delivery/infos', {
+            merchantId,
+            position
+        })
+            .then((response) => {
+                resolve(response.data);
+            })
+            .catch((error) => {
+                reject(error);
+            })
+    }));
+}

package/src/service/HelperService.ts

@@ -0,0 +1,9 @@
+export function formatPrice(price:number|string|null) {
+    if(typeof price == 'string'){
+        price = parseFloat(price);
+    }
+    if(!price && typeof price !== 'number'){
+        return '--,-- €'
+    }
+    return new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(price/100)
+}

package/src/test/availability.test.ts

@@ -0,0 +1,346 @@
+// @ts-nocheck
+
+import { describe, expect, test } from '@jest/globals'
+import ScheduleManagement from "@delicity/backend-schedule-management";
+import {
+  categoryAvailable,
+  getAvailabilityNextInterval,
+} from "../service/CategoryAvailabilityService";
+
+import {DateTime} from "luxon";
+
+describe('Category availability check', () => {
+
+
+  test('one_date', () => {
+    const categoryAvailability = {
+      type: "one_date",
+      slots: [{id: 0, day: 3, start: "00:00", end: "23:59"}],
+      startDate: "2024-02-14",
+      endDate: "2024-02-14"
+    };
+    const slots = [
+      {id: 0, day: 1, start: "12:00", end: "14:00"},
+      {id: 0, day: 1, start: "18:00", end: "23:00"},
+      {id: 0, day: 2, start: "18:00", end: "23:00"},
+      {id: 0, day: 3, start: "18:00", end: "23:00"}
+    ];
+    const merchantSchedule = new ScheduleManagement(slots, [], {timezone: 'Europe/Paris'});
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-17 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-14 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-14 19:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-14 20:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-14 20:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(true);
+    // Good day
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-14 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-14 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true); // good date
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-14 19:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true); // good date
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-14 19:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(false); // good date
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-14 23:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-15 10:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-13 19:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-15 19:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(false);
+  });
+
+
+  test('between_two_date', () => {
+    const categoryAvailability = {
+      type: "between_two_date",
+      slots: [
+        {id: 0, day: 1, start: "00:00", end: "23:59"},
+        {id: 1, day: 2, start: "00:00", end: "23:59"},
+        {id: 2, day: 3, start: "00:00", end: "23:59"},
+        {id: 3, day: 4, start: "00:00", end: "23:59"},
+        {id: 4, day: 5, start: "00:00", end: "23:59"},
+        {id: 5, day: 6, start: "00:00", end: "23:59"}
+      ],
+      startDate: "2024-02-12",
+      endDate: "2024-02-18"
+    };
+    const slots = [
+      {id: 0, day: 1, start: "12:00", end: "14:00"},
+      {id: 0, day: 1, start: "18:00", end: "23:00"},
+      {id: 0, day: 2, start: "18:00", end: "23:00"},
+      {id: 0, day: 3, start: "18:00", end: "23:00"}
+    ];
+    const merchantSchedule = new ScheduleManagement(slots, [], {timezone: 'Europe/Paris'});
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-11 13:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-19 11:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    // Between two dates
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-12 11:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-12 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-12 13:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-12 14:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-13 14:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-13 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-15 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-02-18 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+
+  });
+
+
+  test('timetable', () => {
+    const categoryAvailability = {
+      type: "timetable",
+      slots: [
+        {id: 0, day: 2, start: "11:00", end: "16:00"},
+        {id: 1, day: 3, start: "17:00", end: "21:00"},
+        {id: 2, day: 7, start: "17:00", end: "20:30"}
+      ]
+    };
+    const slots = [
+      {id: 3151, day: 1, start: "01:00", end: "23:59"},
+      {id: 3152, day: 2, start: "01:00", end: "23:59"},
+      {id: 3153, day: 3, start: "01:00", end: "23:59"},
+      {id: 3154, day: 4, start: "01:00", end: "23:59"},
+      {id: 3155, day: 5, start: "01:00", end: "23:59"},
+      {id: 3156, day: 6, start: "01:00", end: "23:59"},
+      {id: 3157, day: 7, start: "01:00", end: "23:59"}
+    ];
+
+    const merchantSchedule = new ScheduleManagement(slots, [], {timezone: 'Europe/Paris'});
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-02 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-03 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-03 17:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-03 20:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-03 23:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-07 15:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-07 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-08 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-08 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(true);
+  });
+
+  test('some_shifts', () => {
+    const categoryAvailability = {
+      type: "some_shifts",
+      slots: [
+        {id: 0, day: 1, start: "13:30", end: "18:00"},
+        {id: 1, day: 2, start: "13:30", end: "18:00"},
+        {id: 2, day: 3, start: "13:30", end: "18:00"},
+        {id: 3, day: 4, start: "13:30", end: "18:00"},
+        {id: 4, day: 5, start: "13:30", end: "18:00"},
+        {id: 5, day: 6, start: "13:30", end: "18:00"},
+        {id: 6, day: 7, start: "13:30", end: "18:00"}
+      ],
+      startDate: "2024-02-12",
+      endDate: "2024-02-18",
+      weekNumber: 7,
+      weekYear: 2024
+    };
+    const slots = [
+      {id: 3151, day: 1, start: "01:00", end: "23:59"},
+      {id: 3152, day: 2, start: "01:00", end: "23:59"},
+      {id: 3153, day: 3, start: "01:00", end: "23:59"},
+      {id: 3154, day: 4, start: "01:00", end: "23:59"},
+      {id: 3155, day: 5, start: "01:00", end: "23:59"},
+      {id: 3156, day: 6, start: "01:00", end: "23:59"},
+      {id: 3157, day: 7, start: "01:00", end: "23:59"}
+    ];
+
+    const merchantSchedule = new ScheduleManagement(slots, [], {timezone: 'Europe/Paris'});
+    for(let i=1; i<=7; i++){
+      expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-0'+i+' 12:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+      expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-0'+i+' 13:30', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+      expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-0'+i+' 17:30', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+      expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-0'+i+' 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+      expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-0'+i+' 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(true);
+    }
+  });
+
+
+  test('some_days', () => {
+    const categoryAvailability = {
+      type: "some_days",
+      slots: [
+        {id: 0, day: 1, start: "00:00", end: "23:59"},
+        {id: 1, day: 2, start: "00:00", end: "23:59"}
+      ]
+    };
+
+    const slots = [
+      {id: 3151, day: 1, start: "01:00", end: "23:59"},
+      {id: 3152, day: 2, start: "01:00", end: "23:59"},
+      {id: 3153, day: 3, start: "01:00", end: "23:59"},
+      {id: 3154, day: 4, start: "01:00", end: "23:59"},
+      {id: 3155, day: 5, start: "01:00", end: "23:59"},
+      {id: 3156, day: 6, start: "01:00", end: "23:59"},
+      {id: 3157, day: 7, start: "01:00", end: "23:59"}
+    ];
+
+    const merchantSchedule = new ScheduleManagement(slots, [], {timezone: 'Europe/Paris'});
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-01 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-02 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(true);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-03 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-04 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-05 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-06 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-07 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).isAvailable).toBe(false);
+    expect(categoryAvailable(categoryAvailability, DateTime.fromFormat('2024-01-07 18:00', 'yyyy-LL-dd HH:mm'), merchantSchedule).willBeAvailableInTheFuture).toBe(true);
+  });
+
+
+})
+
+
+const merchantSlots = [
+  {id: 3151, day: 1, start: "12:00", end: "22:00"},
+  {id: 3152, day: 2, start: "12:00", end: "22:00"},
+  {id: 3153, day: 3, start: "12:00", end: "22:00"},
+  {id: 3154, day: 4, start: "12:00", end: "22:00"},
+  {id: 3155, day: 5, start: "12:00", end: "22:00"},
+  {id: 3156, day: 6, start: "12:00", end: "22:00"},
+  {id: 3157, day: 7, start: "12:00", end: "22:00"}
+];
+
+
+
+
+
+describe('Category availability get next available date', () => {
+
+  test('one_date', () => {
+    const categoryAvailability = {
+      type: "one_date",
+      slots: [{id: 0, day: 3, start: "00:00", end: "23:59"}],
+      startDate: "2024-02-14",
+      endDate: "2024-02-14"
+    };
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-02-14 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-02-14 22:00');
+  });
+
+  test('between_two_date', () => {
+    const categoryAvailability = {
+      type: "between_two_date",
+      slots: [
+        {id: 0, day: 1, start: "00:00", end: "23:59"},
+        {id: 1, day: 2, start: "00:00", end: "23:59"},
+        {id: 2, day: 3, start: "00:00", end: "23:59"},
+        {id: 3, day: 4, start: "00:00", end: "23:59"},
+        {id: 4, day: 5, start: "00:00", end: "23:59"},
+        {id: 5, day: 6, start: "00:00", end: "23:59"}
+      ],
+      startDate: "2024-02-13",
+      endDate: "2024-02-18"
+    };
+
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-02-13 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-02-13 22:00');
+  });
+
+  test('timetable: Open tomorrow', () => {
+    const categoryAvailability = {
+      type: "timetable",
+      slots: [
+        {id: 0, day: 2, start: "11:00", end: "16:00"},
+        {id: 1, day: 3, start: "17:00", end: "21:00"},
+        {id: 2, day: 7, start: "17:00", end: "20:30"}
+      ]
+    };
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-02 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-02 16:00');
+  });
+
+  test('timetable: Is open at this time', () => {
+    const categoryAvailability = {
+      type: "timetable",
+      slots: [
+        {id: 0, day: 2, start: "11:00", end: "16:00"},
+        {id: 1, day: 3, start: "17:00", end: "21:00"},
+        {id: 2, day: 7, start: "17:00", end: "20:30"}
+      ]
+    };
+
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-02 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-03 17:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-03 21:00');
+  });
+
+
+  test('timetable: Open while week-end', () => {
+    const categoryAvailability = {
+      type: "timetable",
+      slots: [
+        {id: 0, day: 6, start: "08:00", end: "13:00"},
+        {id: 1, day: 7, start: "08:00", end: "13:00"}
+      ]
+    };
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-12 16:31', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-13 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-13 13:00');
+  });
+
+
+  test('some_shifts', () => {
+    const categoryAvailability = {
+      type: "some_shifts",
+      slots: [
+        {id: 0, day: 1, start: "13:30", end: "18:00"},
+        {id: 1, day: 2, start: "13:30", end: "18:00"},
+        {id: 2, day: 3, start: "13:30", end: "18:00"},
+        {id: 3, day: 4, start: "13:30", end: "18:00"},
+        {id: 4, day: 5, start: "13:30", end: "18:00"},
+        {id: 5, day: 6, start: "13:30", end: "18:00"},
+        {id: 6, day: 7, start: "13:30", end: "18:00"}
+      ]
+    };
+
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-01 13:30');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-01 18:00');
+  });
+
+  test('some_days : not currently open', () => {
+    const categoryAvailability = {
+      type: "some_days",
+      slots: [
+        {id: 0, day: 1, start: "00:00", end: "23:59"},
+        {id: 1, day: 2, start: "00:00", end: "23:59"},
+        {id: 1, day: 3, start: "00:00", end: "23:59"},
+        {id: 1, day: 7, start: "00:00", end: "23:59"}
+      ]
+    };
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 00:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-01 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-01 22:00');
+  });
+  test('some_days : currently open', () => {
+    const categoryAvailability = {
+      type: "some_days",
+      slots: [
+        {id: 0, day: 1, start: "00:00", end: "23:59"},
+        {id: 1, day: 2, start: "00:00", end: "23:59"},
+        {id: 1, day: 3, start: "00:00", end: "23:59"},
+        {id: 1, day: 7, start: "00:00", end: "23:59"}
+      ]
+    };
+    const merchantSchedule = new ScheduleManagement(merchantSlots, [], {timezone: 'Europe/Paris'});
+    const interval = getAvailabilityNextInterval(categoryAvailability, merchantSchedule, DateTime.fromFormat('2024-01-01 12:00', 'yyyy-LL-dd HH:mm'));
+    expect(interval).not.toBe(null);
+    expect(interval.start.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-02 12:00');
+    expect(interval.end.toFormat('yyyy-LL-dd HH:mm')).toBe('2024-01-02 22:00');
+  });
+
+
+})