refactor(orders): streamline order creation logic and enhance test setup

- Removed redundant variable assignments in the createOrder method for cleaner code.
- Updated test setup in orders.test.js to use global mocks for user and service retrieval, improving test clarity and maintainability.
- Added checks for required fields in order creation to ensure data integrity.

apps/web/components/orders/order-buttons.tsx

@@ -7,7 +7,7 @@ import { useIsMaster } from '@/hooks/api/customers';
 import { useOrderMutation, useOrderQuery } from '@/hooks/api/orders';
 import { usePushWithData } from '@/hooks/url';
 import { Enum_Order_State } from '@repo/graphql/types';
-import { isBeforeToday } from '@repo/utils/datetime-format';
+import { isBeforeNow } from '@repo/utils/datetime-format';
 
 export function OrderButtons({ documentId }: Readonly<OrderComponentProps>) {
   const push = usePushWithData();
@@ -50,7 +50,7 @@ export function OrderButtons({ documentId }: Readonly<OrderComponentProps>) {
     push('/orders/add', order);
   }
 
-  const isOrderStale = order?.datetime_start && isBeforeToday(order?.datetime_start);
+  const isOrderStale = order?.datetime_start && isBeforeNow(order?.datetime_start);
 
   const canCancel = !isOrderStale && (isCreated || (isMaster && isCancelling) || isApproved);
   const canComplete = isMaster && isApproved;

apps/web/components/orders/order-form/datetime-select.tsx

@@ -6,16 +6,22 @@ import { Button } from '@repo/ui/components/ui/button';
 import { Calendar } from '@repo/ui/components/ui/calendar';
 import { formatTime } from '@repo/utils/datetime-format';
 import dayjs from 'dayjs';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 export function DateSelect() {
   const selectedDate = useOrderStore((store) => store.date);
-  const setDate = useOrderStore((store) => store.setDate);
+  const setSelectedDate = useOrderStore((store) => store.setDate);
   const setTime = useOrderStore((store) => store.setTime);
   const setSlot = useOrderStore((store) => store.setSlotId);
   const masterId = useOrderStore((store) => store.masterId);
   const serviceId = useOrderStore((store) => store.serviceId);
 
+  useEffect(() => {
+    if (!selectedDate) {
+      setSelectedDate(new Date());
+    }
+  }, [selectedDate, setSelectedDate]);
+
   const [selectedMonthDate, setSelectedMonthDate] = useState(new Date());
 
   const { data: { slots } = {} } = useAvailableTimeSlotsQuery(
@@ -53,7 +59,7 @@ export function DateSelect() {
       mode="single"
       onMonthChange={(date) => setSelectedMonthDate(date)}
       onSelect={(date) => {
-        if (date) setDate(date);
+        if (date) setSelectedDate(date);
         setTime(null);
         setSlot(null);
       }}

apps/web/components/schedule/calendar.tsx

@@ -6,7 +6,7 @@ import { useDateTimeStore } from '@/stores/datetime';
 import { Calendar } from '@repo/ui/components/ui/calendar';
 import { getDateUTCRange } from '@repo/utils/datetime-format';
 import dayjs from 'dayjs';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 export function ScheduleCalendar() {
   const { data: { customer } = {} } = useCustomerQuery();
@@ -14,6 +14,12 @@ export function ScheduleCalendar() {
   const selectedDate = useDateTimeStore((store) => store.date);
   const setSelectedDate = useDateTimeStore((store) => store.setDate);
 
+  useEffect(() => {
+    if (!selectedDate) {
+      setSelectedDate(new Date());
+    }
+  }, [selectedDate, setSelectedDate]);
+
   const [currentMonthDate, setCurrentMonthDate] = useState(new Date());
 
   const { endOfMonth, startOfMonth } = getDateUTCRange(currentMonthDate).month();

apps/web/components/schedule/day-slots-list/index.tsx

@@ -7,7 +7,7 @@ import { useCustomerQuery } from '@/hooks/api/customers';
 import { useMasterSlotsQuery } from '@/hooks/api/slots';
 import { useDateTimeStore } from '@/stores/datetime';
 import { LoadingSpinner } from '@repo/ui/components/ui/spinner';
-import { getDateUTCRange, isTodayOrAfter } from '@repo/utils/datetime-format';
+import { getDateUTCRange, isNowOrAfter } from '@repo/utils/datetime-format';
 import { type PropsWithChildren } from 'react';
 
 export function DaySlotsList() {
@@ -26,7 +26,7 @@ export function DaySlotsList() {
     return <LoadingSpinner />;
   }
 
-  const isSelectedDateTodayOrAfter = selectedDate && isTodayOrAfter(selectedDate);
+  const isSelectedDateTodayOrAfter = selectedDate && isNowOrAfter(selectedDate);
 
   if (!slots?.length) {
     return (

apps/web/components/schedule/slot-buttons.tsx

@@ -5,7 +5,7 @@ import FloatingActionPanel from '../shared/action-panel';
 import { type SlotComponentProps } from './types';
 import { useSlotDelete, useSlotMutation, useSlotQuery } from '@/hooks/api/slots';
 import { Enum_Slot_State } from '@repo/graphql/types';
-import { isBeforeToday } from '@repo/utils/datetime-format';
+import { isBeforeNow } from '@repo/utils/datetime-format';
 import { useRouter } from 'next/navigation';
 
 export function SlotButtons({ documentId }: Readonly<SlotComponentProps>) {
@@ -42,7 +42,7 @@ export function SlotButtons({ documentId }: Readonly<SlotComponentProps>) {
 
   const hasOrders = Boolean(slot?.orders.length);
 
-  const isSlotStale = slot?.datetime_start && isBeforeToday(slot?.datetime_start);
+  const isSlotStale = slot?.datetime_start && isBeforeNow(slot?.datetime_start);
 
   const canDelete = !isSlotStale && !hasOrders;
   const canToggle = !isSlotStale;

apps/web/hooks/api/contacts/use-customer-contacts.ts

@@ -20,8 +20,8 @@ export function useCustomerContacts() {
     refetch: refetchMasters,
   } = useMastersQuery();
 
-  const clients = clientsData?.customers?.at(0)?.clients || [];
-  const masters = mastersData?.customers?.at(0)?.masters || [];
+  const clients = clientsData?.clients || [];
+  const masters = mastersData?.masters || [];
 
   const isLoading = isLoadingClients || isLoadingMasters;
 

apps/web/vitest.config.mts

@@ -6,7 +6,7 @@ export default defineConfig({
   plugins: [tsconfigPaths(), react()],
   test: {
     environment: 'jsdom',
-    exclude: ['**/e2e/**', '**/*.spec.ts'],
+    exclude: ['**/e2e/**', '**/*.spec.ts', '**/node_modules/**'],
     include: ['**/*.test.{ts,tsx}'],
   },
 });

packages/graphql/api/base.ts

@@ -2,9 +2,9 @@
 import { getClientWithToken } from '../apollo/client';
 import * as GQL from '../types';
 
-const ERRORS = {
-  MISSING_TELEGRAM_ID: 'Missing telegram id',
-  NOT_FOUND_CUSTOMER: 'Customer not found',
+export const ERRORS = {
+  MISSING_TELEGRAM_ID: 'Не указан Telegram ID',
+  NOT_FOUND_CUSTOMER: 'Пользователь не найден',
 };
 
 type UserProfile = {

packages/graphql/api/customers.ts

@@ -38,12 +38,12 @@ export class CustomersService extends BaseService {
 
     const result = await query({
       query: GQL.GetClientsDocument,
-      variables: {
-        telegramId: variables?.telegramId || this._user.telegramId,
-      },
+      variables,
     });
 
-    return result.data;
+    const customer = result.data.customers.at(0);
+
+    return customer;
   }
 
   async getCustomer(variables: VariablesOf<typeof GQL.GetCustomerDocument>) {
@@ -64,12 +64,12 @@ export class CustomersService extends BaseService {
 
     const result = await query({
       query: GQL.GetMastersDocument,
-      variables: {
-        telegramId: variables?.telegramId || this._user.telegramId,
-      },
+      variables,
     });
 
-    return result.data;
+    const customer = result.data.customers.at(0);
+
+    return customer;
   }
 
   async updateCustomer(

packages/graphql/api/orders.ts

@@ -1,23 +1,46 @@
+/* eslint-disable sonarjs/cognitive-complexity */
+/* eslint-disable @typescript-eslint/naming-convention */
 import { getClientWithToken } from '../apollo/client';
 import * as GQL from '../types';
 import { BaseService } from './base';
+import { CustomersService } from './customers';
 import { ServicesService } from './services';
+import { SlotsService } from './slots';
 import { type VariablesOf } from '@graphql-typed-document-node/core';
 import { isCustomerMaster } from '@repo/utils/customer';
-import { getMinutes } from '@repo/utils/datetime-format';
+import { getMinutes, isBeforeNow, isNowOrAfter } from '@repo/utils/datetime-format';
 import dayjs from 'dayjs';
 
-const ERRORS = {
-  INVALID_SERVICE_DURATION: 'Invalid service duration',
-  MISSING_CLIENT: 'Missing client',
-  MISSING_ORDER: 'Order not found',
-  MISSING_SERVICE_ID: 'Missing service id',
-  MISSING_SERVICES: 'Missing services',
-  MISSING_SLOT: 'Missing slot id',
-  MISSING_START_TIME: 'Missing time start',
-  NO_PERMISSION: 'No permission',
+export const ERRORS = {
+  CANNOT_COMPLETE_BEFORE_START: 'Нельзя завершить запись до её наступления',
+  INACTIVE_CLIENT: 'Клиент не активен',
+  INACTIVE_MASTER: 'Мастер не активен',
+  INVALID_MASTER: 'Некорректный мастер',
+  INVALID_SERVICE_DURATION: 'Неверная длительность услуги',
+  INVALID_TIME: 'Некорректное время',
+  MISSING_CLIENT: 'Не указан клиент',
+  MISSING_END_TIME: 'Не указано время окончания',
+  MISSING_ORDER: 'Заказ не найден',
+  MISSING_SERVICE_ID: 'Не указан идентификатор услуги',
+  MISSING_SERVICES: 'Отсутствуют услуги',
+  MISSING_SLOT: 'Не указан слот',
+  MISSING_START_TIME: 'Не указано время начала',
+  MISSING_TIME: 'Не указано время',
+  NO_CHANGE_STATE_COMPLETED: 'Нельзя изменить статус завершенного заказа',
+  NO_MASTER_SELF_BOOK: 'Нельзя записать к самому себе',
+  NO_ORDER_IN_PAST: 'Нельзя создать запись на время в прошлом',
+  NO_ORDER_OUT_OF_SLOT: 'Время заказа выходит за пределы слота',
+  NO_PERMISSION: 'Нет доступа',
+  NOT_FOUND_CLIENT: 'Клиент не найден',
+  NOT_FOUND_MASTER: 'Мастер не найден',
+  NOT_FOUND_ORDER: 'Заказ не найден',
+  NOT_FOUND_ORDER_SLOT: 'Слот заказа не найден',
+  OVERLAPPING_TIME: 'Время пересекается с другими заказами',
+  SLOT_CLOSED: 'Слот закрыт',
 };
 
+const DEFAULT_ORDERS_SORT = ['slot.datetime_start:desc', 'datetime_start:asc'];
+
 export class OrdersService extends BaseService {
   async createOrder(variables: VariablesOf<typeof GQL.CreateOrderDocument>) {
     const { customer } = await this._getUser();
@@ -26,7 +49,6 @@ export class OrdersService extends BaseService {
     if (!variables.input.slot) throw new Error(ERRORS.MISSING_SLOT);
     if (!variables.input.services?.length) throw new Error(ERRORS.MISSING_SERVICES);
     if (!variables.input.services[0]) throw new Error(ERRORS.MISSING_SERVICE_ID);
-    if (!variables.input.datetime_start) throw new Error(ERRORS.MISSING_START_TIME);
     if (!variables.input.client) throw new Error(ERRORS.MISSING_CLIENT);
 
     const servicesService = new ServicesService(this._user);
@@ -41,6 +63,14 @@ export class OrdersService extends BaseService {
       .add(getMinutes(service.duration), 'minute')
       .toISOString();
 
+    await this.checkBeforeCreate({
+      ...variables,
+      input: {
+        ...variables.input,
+        datetime_end: datetimeEnd,
+      },
+    });
+
     const { mutate } = await getClientWithToken();
 
     const mutationResult = await mutate({
@@ -79,13 +109,19 @@ export class OrdersService extends BaseService {
 
     const result = await query({
       query: GQL.GetOrdersDocument,
-      variables,
+      variables: {
+        sort: DEFAULT_ORDERS_SORT,
+        ...variables,
+      },
     });
 
     return result.data;
   }
 
   async updateOrder(variables: VariablesOf<typeof GQL.UpdateOrderDocument>) {
+    await this.checkUpdatePermission(variables);
+    await this.checkBeforeUpdate(variables);
+
     const { customer } = await this._getUser();
 
     const { query } = await getClientWithToken();
@@ -117,9 +153,17 @@ export class OrdersService extends BaseService {
 
     const { mutate } = await getClientWithToken();
 
+    const lastOrderNumber = await this.getLastOrderNumber(variables);
+
     const mutationResult = await mutate({
       mutation: GQL.UpdateOrderDocument,
-      variables,
+      variables: {
+        ...variables,
+        data: {
+          ...variables.data,
+          order_number: lastOrderNumber ? lastOrderNumber + 1 : undefined,
+        },
+      },
     });
 
     const error = mutationResult.errors?.at(0);
@@ -127,4 +171,252 @@ export class OrdersService extends BaseService {
 
     return mutationResult.data;
   }
+
+  private async checkBeforeCreate(variables: VariablesOf<typeof GQL.CreateOrderDocument>) {
+    const {
+      client: clientId,
+      datetime_end,
+      datetime_start,
+      services,
+      slot: slotId,
+    } = variables.input;
+
+    // Проверка наличия обязательных полей
+    if (!slotId) throw new Error(ERRORS.MISSING_SLOT);
+    if (!clientId) throw new Error(ERRORS.MISSING_CLIENT);
+    if (!services?.length) throw new Error(ERRORS.MISSING_SERVICES);
+
+    // Проверка корректности времени заказа.
+    if (!datetime_start) {
+      throw new Error(ERRORS.MISSING_START_TIME);
+    }
+
+    if (!datetime_end) {
+      throw new Error(ERRORS.MISSING_END_TIME);
+    }
+
+    if (new Date(datetime_end) <= new Date(datetime_start)) {
+      throw new Error(ERRORS.INVALID_TIME);
+    }
+
+    // Проверка, что заказ не создается на время в прошлом
+    if (isBeforeNow(datetime_start, 'minute')) {
+      throw new Error(ERRORS.NO_ORDER_IN_PAST);
+    }
+
+    const slotService = new SlotsService(this._user);
+    // Получаем слот
+    const { slot } = await slotService.getSlot({ documentId: slotId });
+
+    if (!slot) throw new Error(ERRORS.MISSING_SLOT);
+
+    // Проверка, что заказ укладывается в рамки слота
+    if (
+      new Date(datetime_start) < new Date(slot.datetime_start) ||
+      new Date(datetime_end) > new Date(slot.datetime_end)
+    ) {
+      throw new Error(ERRORS.NO_ORDER_OUT_OF_SLOT);
+    }
+
+    // 1. Слот не должен быть закрыт
+    if (slot.state === GQL.Enum_Slot_State.Closed) {
+      throw new Error(ERRORS.SLOT_CLOSED);
+    }
+
+    const customerService = new CustomersService(this._user);
+    // Получаем клиента
+    const { customer: clientEntity } = await customerService.getCustomer({ documentId: clientId });
+
+    if (!clientEntity) throw new Error(ERRORS.NOT_FOUND_CLIENT);
+
+    // Проверка активности клиента
+    if (!clientEntity?.active) {
+      throw new Error(ERRORS.INACTIVE_CLIENT);
+    }
+
+    // Получаем мастера слота
+    const slotMaster = slot.master;
+    if (!slotMaster) throw new Error(ERRORS.INVALID_MASTER);
+    if (!slotMaster.active || slotMaster.role !== GQL.Enum_Customer_Role.Master) {
+      throw new Error(ERRORS.INACTIVE_MASTER);
+    }
+
+    // 2. Проверка ролей и связей
+    const isClientMaster = clientEntity.role === GQL.Enum_Customer_Role.Master;
+    const slotMasterId = slot.master?.documentId;
+
+    if (!slotMasterId) {
+      throw new Error(ERRORS.NOT_FOUND_MASTER);
+    }
+
+    if (isClientMaster) {
+      // Мастер может записывать только себя
+      if (slotMasterId !== clientId) {
+        throw new Error(ERRORS.INVALID_MASTER);
+      }
+    } else {
+      // Клиент не должен быть мастером слота
+      if (slotMasterId === clientId) {
+        throw new Error(ERRORS.NO_MASTER_SELF_BOOK);
+      }
+
+      const clientMasters = await customerService.getMasters({ documentId: clientId });
+
+      const isLinkedToSlotMaster = clientMasters?.masters.some(
+        (master) => master?.documentId === slotMasterId,
+      );
+
+      // Клиент должен быть привязан к мастеру слота
+      if (!isLinkedToSlotMaster) {
+        throw new Error(ERRORS.INVALID_MASTER);
+      }
+    }
+
+    // Проверка пересечений заказов по времени.
+
+    const { orders: overlappingOrders } = await this.getOrders({
+      filters: {
+        datetime_end: { gt: datetime_start },
+        datetime_start: { lt: datetime_end },
+        slot: {
+          documentId: { eq: slotId },
+        },
+        state: {
+          notIn: [GQL.Enum_Order_State.Cancelled],
+        },
+      },
+    });
+
+    if (overlappingOrders?.length) {
+      throw new Error(ERRORS.OVERLAPPING_TIME);
+    }
+  }
+
+  private async checkBeforeUpdate(variables: VariablesOf<typeof GQL.UpdateOrderDocument>) {
+    if (variables.data.client || variables.data.services?.length || variables.data.slot) {
+      throw new Error(ERRORS.NO_PERMISSION);
+    }
+
+    const { order: existingOrder } = await this.getOrder({ documentId: variables.documentId });
+
+    if (!existingOrder) {
+      throw new Error(ERRORS.NOT_FOUND_ORDER);
+    }
+
+    if (!existingOrder.slot) {
+      throw new Error(ERRORS.NOT_FOUND_ORDER_SLOT);
+    }
+
+    if (existingOrder.state === GQL.Enum_Order_State.Completed && variables.data.state) {
+      throw new Error(ERRORS.NO_CHANGE_STATE_COMPLETED);
+    }
+
+    const { datetime_end, datetime_start } = variables.data;
+
+    if (!datetime_start || !datetime_end) {
+      return;
+    }
+
+    if (new Date(datetime_end) <= new Date(datetime_start)) {
+      throw new Error(ERRORS.INVALID_TIME);
+    }
+
+    const slotId = existingOrder.slot.documentId;
+
+    const { orders: overlappingEntities } = await this.getOrders({
+      filters: {
+        datetime_end: { gt: datetime_start },
+        datetime_start: { lt: datetime_end },
+        documentId: { ne: variables.documentId },
+        slot: {
+          documentId: { eq: slotId },
+        },
+        state: {
+          not: {
+            eq: GQL.Enum_Order_State.Cancelled,
+          },
+        },
+      },
+    });
+
+    if (overlappingEntities?.length) {
+      throw new Error(ERRORS.OVERLAPPING_TIME);
+    }
+  }
+
+  private async checkUpdatePermission(variables: VariablesOf<typeof GQL.UpdateOrderDocument>) {
+    const { customer } = await this._getUser();
+
+    const { order } = await this.getOrder({ documentId: variables.documentId });
+
+    if (!order) throw new Error(ERRORS.MISSING_ORDER);
+
+    const isOrderClient = order.client?.documentId === customer.documentId;
+    const isOrderMaster = order.slot?.master?.documentId === customer.documentId;
+
+    if (!isOrderClient && !isOrderMaster) {
+      throw new Error(ERRORS.NO_PERMISSION);
+    }
+
+    if (isOrderClient && variables?.data && Object.keys(variables.data).length > 1) {
+      throw new Error(ERRORS.NO_PERMISSION);
+    }
+
+    if (
+      isOrderClient &&
+      variables?.data?.state &&
+      variables.data.state !== GQL.Enum_Order_State.Cancelling
+    ) {
+      throw new Error(ERRORS.NO_PERMISSION);
+    }
+  }
+
+  private async getLastOrderNumber(variables: VariablesOf<typeof GQL.UpdateOrderDocument>) {
+    const { datetime_end, datetime_start, state } = variables.data;
+
+    const { order: existingOrder } = await this.getOrder({ documentId: variables.documentId });
+
+    if (!existingOrder) {
+      throw new Error(ERRORS.NOT_FOUND_ORDER);
+    }
+
+    if (state !== GQL.Enum_Order_State.Completed || datetime_start || datetime_end) {
+      return undefined;
+    }
+
+    if (
+      state === GQL.Enum_Order_State.Completed &&
+      existingOrder?.datetime_start &&
+      isNowOrAfter(existingOrder?.datetime_start, 'minute')
+    ) {
+      throw new Error(ERRORS.CANNOT_COMPLETE_BEFORE_START);
+    }
+
+    let lastOrderNumber: number | undefined;
+
+    if (state === GQL.Enum_Order_State.Completed) {
+      const clientId = existingOrder?.client?.documentId;
+
+      const {
+        orders: [lastOrder],
+      } = await this.getOrders({
+        filters: {
+          client: {
+            documentId: { eq: clientId },
+          },
+          state: {
+            eq: GQL.Enum_Order_State.Completed,
+          },
+        },
+        pagination: {
+          limit: 1,
+        },
+        sort: ['order_number:desc'],
+      });
+
+      lastOrderNumber = lastOrder?.order_number || undefined;
+    }
+
+    return lastOrderNumber;
+  }
 }

packages/graphql/api/slots.ts

@@ -1,21 +1,31 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import { getClientWithToken } from '../apollo/client';
 import * as GQL from '../types';
 import { BaseService } from './base';
 import { ServicesService } from './services';
 import { type VariablesOf } from '@graphql-typed-document-node/core';
-import { getMinutes } from '@repo/utils/datetime-format';
+import { getMinutes, isBeforeNow } from '@repo/utils/datetime-format';
 import dayjs from 'dayjs';
 
-const ERRORS = {
-  HAS_ORDERS: 'Slot has orders',
-  MISSING_DATE: 'Missing date',
-  MISSING_SERVICE: 'Missing service',
-  MISSING_SERVICE_ID: 'Missing service id',
-  NO_PERMISSION: 'No permission',
+export const ERRORS = {
+  INACTIVE_MASTER: 'Пользователь не является активным или мастером',
+  INVALID_TIME: 'Некорректное время',
+  MISSING_DATETIME_END: 'Не указана дата окончания',
+  MISSING_DATETIME_START: 'Не указана дата начала',
+  MISSING_SERVICE_ID: 'Не указана услуга',
+  NO_PAST_SLOT: 'Нельзя создать слот в прошлом',
+  NO_PERMISSION: 'Нет доступа',
+  NOT_FOUND_MASTER: 'Мастер не найден',
+  NOT_FOUND_SERVICE: 'Сервис не найден',
+  NOT_FOUND_SLOT: 'Слот не найден',
+  OVERLAPPING_TIME: 'Время пересекается с другими слотами',
+  SLOT_HAS_ORDERS: 'Слот имеет активные заказы',
 };
 
 export class SlotsService extends BaseService {
   async createSlot(variables: VariablesOf<typeof GQL.CreateSlotDocument>) {
+    await this.checkBeforeCreate(variables);
+
     const { customer } = await this._getUser();
 
     const { mutate } = await getClientWithToken();
@@ -43,7 +53,7 @@ export class SlotsService extends BaseService {
     const { slot } = await this.getSlot({ documentId: variables.documentId });
 
     if (slot?.orders?.length) {
-      throw new Error(ERRORS.HAS_ORDERS);
+      throw new Error(ERRORS.SLOT_HAS_ORDERS);
     }
 
     const { mutate } = await getClientWithToken();
@@ -63,7 +73,7 @@ export class SlotsService extends BaseService {
     variables: VariablesOf<typeof GQL.GetSlotsDocument>,
     context: { service: GQL.ServiceFiltersInput },
   ) {
-    if (!variables.filters?.datetime_start) throw new Error(ERRORS.MISSING_DATE);
+    if (!variables.filters?.datetime_start) throw new Error(ERRORS.MISSING_DATETIME_START);
     if (!context?.service?.documentId?.eq) throw new Error(ERRORS.MISSING_SERVICE_ID);
 
     const { query } = await getClientWithToken();
@@ -86,7 +96,7 @@ export class SlotsService extends BaseService {
       documentId: context.service.documentId.eq,
     });
 
-    if (!service) throw new Error(ERRORS.MISSING_SERVICE);
+    if (!service) throw new Error(ERRORS.NOT_FOUND_SERVICE);
 
     const serviceDuration = getMinutes(service.duration);
 
@@ -149,6 +159,7 @@ export class SlotsService extends BaseService {
 
   async updateSlot(variables: VariablesOf<typeof GQL.UpdateSlotDocument>) {
     await this.checkPermission(variables);
+    await this.checkBeforeUpdateDatetime(variables);
 
     const { mutate } = await getClientWithToken();
 
@@ -163,6 +174,101 @@ export class SlotsService extends BaseService {
     return mutationResult.data;
   }
 
+  private async checkBeforeCreate(variables: VariablesOf<typeof GQL.CreateSlotDocument>) {
+    const { datetime_end, datetime_start } = variables.input;
+
+    if (!datetime_start) throw new Error(ERRORS.MISSING_DATETIME_START);
+    if (!datetime_end) throw new Error(ERRORS.MISSING_DATETIME_END);
+
+    // Проверка, что мастер существует и активен
+    const { customer: masterEntity } = await this._getUser();
+
+    if (!masterEntity) throw new Error(ERRORS.NOT_FOUND_MASTER);
+
+    if (!masterEntity?.active || masterEntity.role !== 'master') {
+      throw new Error(ERRORS.INACTIVE_MASTER);
+    }
+
+    // Проверка, что слот не создаётся в прошлом
+    if (datetime_start && isBeforeNow(datetime_start)) {
+      throw new Error(ERRORS.NO_PAST_SLOT);
+    }
+
+    // Проверка валидности времени
+    if (!datetime_start || !datetime_end) {
+      throw new Error(ERRORS.INVALID_TIME);
+    }
+
+    if (new Date(datetime_end) <= new Date(datetime_start)) {
+      throw new Error(ERRORS.INVALID_TIME);
+    }
+
+    const overlappingEntities = await this.getSlots({
+      filters: {
+        datetime_end: { gt: datetime_start },
+        datetime_start: { lt: datetime_end },
+        master: { telegramId: { eq: this._user.telegramId } },
+      },
+    });
+
+    if (overlappingEntities?.slots?.length) {
+      throw new Error(ERRORS.OVERLAPPING_TIME);
+    }
+  }
+
+  private async checkBeforeUpdateDatetime(variables: VariablesOf<typeof GQL.UpdateSlotDocument>) {
+    const { slot } = await this.getSlot({ documentId: variables.documentId });
+
+    if (!slot) throw new Error(ERRORS.NOT_FOUND_SLOT);
+
+    const { datetime_end, datetime_start } = variables.data;
+
+    const isTimeChanging = datetime_start || datetime_end;
+
+    if (!isTimeChanging) return;
+
+    if (!datetime_start) throw new Error(ERRORS.MISSING_DATETIME_START);
+    if (!datetime_end) throw new Error(ERRORS.MISSING_DATETIME_END);
+
+    // Проверка валидности времени
+    if (new Date(datetime_end) <= new Date(datetime_start)) {
+      throw new Error(ERRORS.INVALID_TIME);
+    }
+
+    const orders = slot?.orders;
+
+    if (
+      orders?.length &&
+      orders?.some(
+        (order) =>
+          order?.state &&
+          [
+            GQL.Enum_Order_State.Approved,
+            GQL.Enum_Order_State.Cancelled,
+            GQL.Enum_Order_State.Completed,
+            GQL.Enum_Order_State.Scheduled,
+          ].includes(order.state),
+      )
+    ) {
+      throw new Error(ERRORS.SLOT_HAS_ORDERS);
+    }
+
+    const { documentId } = slot;
+
+    const overlappingEntities = await this.getSlots({
+      filters: {
+        datetime_end: { gt: datetime_start },
+        datetime_start: { lt: datetime_end },
+        documentId: { not: { eq: documentId } },
+        master: { telegramId: { eq: this._user.telegramId } },
+      },
+    });
+
+    if (overlappingEntities?.slots?.length) {
+      throw new Error(ERRORS.OVERLAPPING_TIME);
+    }
+  }
+
   private async checkPermission(
     variables: Pick<VariablesOf<typeof GQL.GetSlotDocument>, 'documentId'>,
   ) {
@@ -170,6 +276,8 @@ export class SlotsService extends BaseService {
 
     const { slot } = await this.getSlot({ documentId: variables.documentId });
 
+    if (!slot) throw new Error(ERRORS.NOT_FOUND_SLOT);
+
     if (slot?.master?.documentId !== customer?.documentId) throw new Error(ERRORS.NO_PERMISSION);
   }
 }

packages/graphql/operations/orders.graphql

@@ -15,10 +15,10 @@ fragment OrderFields on Order {
   }
 }
 
-query GetOrders($filters: OrderFiltersInput, $pagination: PaginationArg) {
+query GetOrders($filters: OrderFiltersInput, $pagination: PaginationArg, $sort: [String!]) {
   orders(
     filters: $filters
-    sort: ["slot.datetime_start:desc", "datetime_start:asc"]
+    sort: $sort
     pagination: $pagination
   ) {
     ...OrderFields

packages/graphql/types/operations.generated.ts

@@ -665,29 +665,30 @@ export type UpdateCustomerMutationVariables = Exact<{
 
 export type UpdateCustomerMutation = { __typename?: 'Mutation', updateCustomer?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined };
 
-export type OrderFieldsFragment = { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
+export type OrderFieldsFragment = { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
 
 export type GetOrdersQueryVariables = Exact<{
   filters?: InputMaybe<OrderFiltersInput>;
   pagination?: InputMaybe<PaginationArg>;
+  sort?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;
 }>;
 
 
-export type GetOrdersQuery = { __typename?: 'Query', orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined> };
+export type GetOrdersQuery = { __typename?: 'Query', orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined> };
 
 export type GetOrderQueryVariables = Exact<{
   documentId: Scalars['ID']['input'];
 }>;
 
 
-export type GetOrderQuery = { __typename?: 'Query', order?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
+export type GetOrderQuery = { __typename?: 'Query', order?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
 
 export type CreateOrderMutationVariables = Exact<{
   input: OrderInput;
 }>;
 
 
-export type CreateOrderMutation = { __typename?: 'Mutation', createOrder?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
+export type CreateOrderMutation = { __typename?: 'Mutation', createOrder?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
 
 export type UpdateOrderMutationVariables = Exact<{
   documentId: Scalars['ID']['input'];
@@ -695,30 +696,30 @@ export type UpdateOrderMutationVariables = Exact<{
 }>;
 
 
-export type UpdateOrderMutation = { __typename?: 'Mutation', updateOrder?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
+export type UpdateOrderMutation = { __typename?: 'Mutation', updateOrder?: { __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined };
 
-export type ServiceFieldsFragment = { __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined };
+export type ServiceFieldsFragment = { __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined };
 
 export type GetServicesQueryVariables = Exact<{
   filters?: InputMaybe<ServiceFiltersInput>;
 }>;
 
 
-export type GetServicesQuery = { __typename?: 'Query', services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined> };
+export type GetServicesQuery = { __typename?: 'Query', services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined> };
 
 export type GetServiceQueryVariables = Exact<{
   documentId: Scalars['ID']['input'];
 }>;
 
 
-export type GetServiceQuery = { __typename?: 'Query', service?: { __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
+export type GetServiceQuery = { __typename?: 'Query', service?: { __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
 
 export type CreateServiceMutationVariables = Exact<{
   data: ServiceInput;
 }>;
 
 
-export type CreateServiceMutation = { __typename?: 'Mutation', createService?: { __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
+export type CreateServiceMutation = { __typename?: 'Mutation', createService?: { __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
 
 export type UpdateServiceMutationVariables = Exact<{
   documentId: Scalars['ID']['input'];
@@ -726,7 +727,7 @@ export type UpdateServiceMutationVariables = Exact<{
 }>;
 
 
-export type UpdateServiceMutation = { __typename?: 'Mutation', updateService?: { __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
+export type UpdateServiceMutation = { __typename?: 'Mutation', updateService?: { __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
 
 export type SlotFieldsFragment = { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined };
 
@@ -749,14 +750,14 @@ export type GetSlotsOrdersQueryVariables = Exact<{
 }>;
 
 
-export type GetSlotsOrdersQuery = { __typename?: 'Query', slots: Array<{ __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined>, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined> };
+export type GetSlotsOrdersQuery = { __typename?: 'Query', slots: Array<{ __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined>, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined> };
 
 export type GetSlotQueryVariables = Exact<{
   documentId: Scalars['ID']['input'];
 }>;
 
 
-export type GetSlotQuery = { __typename?: 'Query', slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name?: string | null | undefined, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined>, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
+export type GetSlotQuery = { __typename?: 'Query', slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, orders: Array<{ __typename?: 'Order', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Order_State | null | undefined, order_number?: number | null | undefined, services: Array<{ __typename?: 'Service', documentId: string, name: string, active?: boolean | null | undefined, duration: string, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined>, client?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined, slot?: { __typename?: 'Slot', documentId: string, datetime_start: string, datetime_end: string, state?: Enum_Slot_State | null | undefined, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined } | null | undefined>, master?: { __typename?: 'Customer', active?: boolean | null | undefined, documentId: string, name: string, phone: string, photoUrl?: string | null | undefined, role: Enum_Customer_Role, telegramId?: number | null | undefined } | null | undefined } | null | undefined };
 
 export type UpdateSlotMutationVariables = Exact<{
   documentId: Scalars['ID']['input'];
@@ -784,7 +785,7 @@ export const GetCustomerDocument = {"kind":"Document","definitions":[{"kind":"Op
 export const GetMastersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetMasters"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"phone"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"telegramId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Long"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filters"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"or"},"value":{"kind":"ListValue","values":[{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"phone"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"phone"}}}]}}]},{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"telegramId"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"telegramId"}}}]}}]},{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"documentId"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}}}]}}]}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"masters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}}]} as unknown as DocumentNode<GetMastersQuery, GetMastersQueryVariables>;
 export const GetClientsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetClients"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"phone"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"telegramId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Long"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filters"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"or"},"value":{"kind":"ListValue","values":[{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"phone"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"phone"}}}]}}]},{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"telegramId"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"telegramId"}}}]}}]}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"clients"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}}]} as unknown as DocumentNode<GetClientsQuery, GetClientsQueryVariables>;
 export const UpdateCustomerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCustomer"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CustomerInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCustomer"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"documentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}}]} as unknown as DocumentNode<UpdateCustomerMutation, UpdateCustomerMutationVariables>;
-export const GetOrdersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOrders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filters"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderFiltersInput"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"pagination"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"PaginationArg"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"orders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filters"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filters"}}},{"kind":"Argument","name":{"kind":"Name","value":"sort"},"value":{"kind":"ListValue","values":[{"kind":"StringValue","value":"slot.datetime_start:desc","block":false},{"kind":"StringValue","value":"datetime_start:asc","block":false}]}},{"kind":"Argument","name":{"kind":"Name","value":"pagination"},"value":{"kind":"Variable","name":{"kind":"Name","value":"pagination"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"OrderFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServiceFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Service"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SlotFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Slot"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"OrderFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Order"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"order_number"}},{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServiceFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"client"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"slot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SlotFields"}}]}}]}}]} as unknown as DocumentNode<GetOrdersQuery, GetOrdersQueryVariables>;
+export const GetOrdersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOrders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filters"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderFiltersInput"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"pagination"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"PaginationArg"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sort"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"orders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filters"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filters"}}},{"kind":"Argument","name":{"kind":"Name","value":"sort"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sort"}}},{"kind":"Argument","name":{"kind":"Name","value":"pagination"},"value":{"kind":"Variable","name":{"kind":"Name","value":"pagination"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"OrderFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServiceFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Service"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SlotFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Slot"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"OrderFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Order"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"order_number"}},{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServiceFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"client"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"slot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SlotFields"}}]}}]}}]} as unknown as DocumentNode<GetOrdersQuery, GetOrdersQueryVariables>;
 export const GetOrderDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOrder"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"order"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"documentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"OrderFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServiceFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Service"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SlotFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Slot"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"OrderFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Order"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"order_number"}},{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServiceFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"client"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"slot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SlotFields"}}]}}]}}]} as unknown as DocumentNode<GetOrderQuery, GetOrderQueryVariables>;
 export const CreateOrderDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOrder"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOrder"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"OrderFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServiceFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Service"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SlotFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Slot"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"OrderFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Order"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"order_number"}},{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServiceFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"client"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"slot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SlotFields"}}]}}]}}]} as unknown as DocumentNode<CreateOrderMutation, CreateOrderMutationVariables>;
 export const UpdateOrderDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOrder"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOrder"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"documentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"documentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"OrderFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CustomerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Customer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"phone"}},{"kind":"Field","name":{"kind":"Name","value":"photoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"telegramId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServiceFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Service"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"active"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SlotFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Slot"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"master"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"OrderFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Order"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"documentId"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_start"}},{"kind":"Field","name":{"kind":"Name","value":"datetime_end"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"order_number"}},{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServiceFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"client"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CustomerFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"slot"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SlotFields"}}]}}]}}]} as unknown as DocumentNode<UpdateOrderMutation, UpdateOrderMutationVariables>;

packages/graphql/utils/jwt.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/consistent-function-scoping */
-import { isTokenExpired } from './jwt.js';
+import { isTokenExpired } from './jwt';
 import * as jwt from 'jsonwebtoken';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 

packages/graphql/vitest.config.mts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'vitest/config';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  plugins: [tsconfigPaths()],
+  test: {
+    exclude: ['**/e2e/**', '**/*.spec.ts', '**/node_modules/**'],
+    include: ['**/*.test.{js,ts}'],
+  },
+});

packages/utils/src/datetime-format.ts

@@ -1,4 +1,5 @@
 /* eslint-disable import/no-unassigned-import */
+import { type OpUnitType } from 'dayjs';
 import dayjs, { type ConfigType } from 'dayjs';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
@@ -91,15 +92,22 @@ export function getTimeZoneLabel(tz: string = DEFAULT_TZ): string {
   return `GMT${offset}`;
 }
 
-export function isBeforeToday(date: Date | string) {
-  const nowUtc = dayjs().tz(DEFAULT_TZ);
-  const inputDateUtc = dayjs(date).tz(DEFAULT_TZ);
+/**
+ * This indicates whether the date is before the other supplied date-time.
+ * ```
+ * // Default unit - 'day':
+ * isBeforeNow(date, 'day')
+ * ```
+ */
+export function isBeforeNow(date: Date | string, unit: OpUnitType = 'day') {
+  const now = dayjs().tz(DEFAULT_TZ);
+  const inputDate = dayjs(date).tz(DEFAULT_TZ);
 
-  return inputDateUtc.isBefore(nowUtc, 'day');
+  return inputDate.isBefore(now, unit);
 }
 
-export function isTodayOrAfter(date: Date | string) {
-  return !isBeforeToday(date);
+export function isNowOrAfter(date: Date | string, unit: OpUnitType = 'day') {
+  return !isBeforeNow(date, unit);
 }
 
 export function sumTime(datetime: DateTime, durationMinutes: number) {