* feat(profile): add subscription information to profile page - Integrated `SubscriptionInfoBar` component into the profile page for displaying subscription details. - Updated GraphQL types to include subscription-related fields and filters. - Enhanced the profile data management by adding subscription handling capabilities. - Added a new utility function `getRemainingDays` to calculate remaining days until a specified date. * refactor(tests): remove BOT_TOKEN from environment mocks in order and slots tests - Eliminated the hardcoded BOT_TOKEN from the environment mock in both orders.test.js and slots.test.js to streamline test configurations and improve security practices. * feat(env): add BOT_URL to environment variables and update related configurations - Introduced BOT_URL to the environment schema for enhanced configuration management. - Updated turbo.json to include BOT_URL in the environment variables list. - Modified subscription-bar.tsx to improve user messaging for subscription availability. * feat(pro-page): use next/link * feat(pro-page): enhance subscription messaging and add benefits section - Updated subscription status messaging for clarity and conciseness. - Improved button styling based on trial availability. - Added a new benefits section for non-active subscribers, highlighting key features of the Pro subscription. * fix(pro-page): adjust hero section layout for improved visual consistency - Reduced margin in the hero section to enhance alignment and overall aesthetics of the Pro page. * feat(subscriptions): add trial subscription functionality - Implemented `createTrialSubscription` action in the API for initiating trial subscriptions. - Enhanced the Pro page to include a `TryFreeButton` for users to activate their trial. - Updated GraphQL operations and types to support trial subscription features. - Improved subscription messaging and user experience across relevant components. * refactor(pro-page): streamline ProPage layout and improve bottom navigation visibility - Consolidated the main container for the ProPage to enhance layout consistency. - Updated the BottomNav component to conditionally hide on the Pro page, improving navigation clarity for users. * feat(subscriptions): add trial period validation for subscriptions - Implemented a check to verify if a user has already utilized their trial period before allowing access to subscription services. - Enhanced error handling to provide a clear message when a trial period has been previously used, improving user experience and subscription management. * style(pro-page, subscription-bar): enhance dark mode support and improve styling consistency - Updated gradient backgrounds in ProPage and SubscriptionInfoBar to support dark mode variations. - Refactored class names for better conditional styling based on subscription activity. - Improved text color handling for better readability in both active and inactive states. * feat(orders, subscriptions): implement banned user checks and improve remaining orders calculation - Added `checkIsBanned` method calls in the `createOrder`, `getOrder`, `getOrders`, and `updateOrder` methods of the `OrdersService` to prevent actions from banned users. - Updated the calculation of `remainingOrdersCount` in the `SubscriptionsService` to ensure it does not go below zero, enhancing subscription management accuracy. * feat(subscriptions): enhance error handling with centralized error messages - Introduced a centralized `ERRORS` object in the `subscriptions.ts` file to standardize error messages related to trial subscriptions. - Updated error handling in the `createSubscription` method to utilize the new error messages, improving maintainability and clarity for subscription-related errors. * feat(orders): implement order limit checks for clients and masters - Added order limit validation in the `OrdersService` to check if a master has reached their monthly order limit. - Introduced new error messages for exceeding order limits, enhancing user feedback for both clients and masters. - Integrated `SubscriptionsService` to manage subscription status and remaining order counts effectively. * order-card: fix order_number badge overlays navigation bar * fix(docker-compose): update healthcheck endpoint to include API path * feat(profile): add MasterServicesList component to display services for profile masters - Introduced the MasterServicesList component to show services associated with a master profile. - Updated ProfilePage to conditionally render MasterServicesList based on user role. - Refactored services fetching logic into a new useMasterServices hook for better reusability. * feat(profile): conditionally render SubscriptionInfoBar based on user role - Updated ProfilePage to check if the user is a master and conditionally render the SubscriptionInfoBar component. - Refactored customer fetching logic to include a utility function for determining user role. * fix tests * fix(typo): rename updateSlot to updateOrder for clarity * refactor(contact): remove customer master role checks and simplify contact addition - Updated the `addContact` function to allow all users to add contacts, removing the previous restriction that only masters could do so. - Deleted the `become-master` feature and related utility functions, streamlining the codebase. - Adjusted command settings to reflect the removal of the master role functionality. - Refactored components and hooks to eliminate dependencies on the master role, enhancing user experience and simplifying logic. * refactor(contacts): rename masters to invited and update related functionality - Changed the terminology from "masters" to "invited" and "invitedBy" across the codebase for clarity and consistency. - Updated the `addContact` function to reflect the new naming convention. - Refactored API actions and server methods to support the new invited structure. - Adjusted components and hooks to utilize the updated invited data, enhancing user experience and simplifying logic. * feat(profile): enhance user role checks in subscription and links components - Added conditional rendering in SubscriptionInfoBar and LinksCard to hide components for users with the Client role. - Updated ProfileDataCard to use Enum_Customer_Role for role management. - Improved error handling in OrdersService to differentiate between master and client order limit errors. * refactor(contacts): update grid components and improve customer role handling - Renamed InvitedByGrid to MastersGrid and InvitedGrid to ClientsGrid for clarity. - Enhanced customer role checks by using documentId for identifying the current user. - Updated the contacts passed to grid components to reflect the new naming and role structure. - Adjusted titles in grid components for better user experience. * feat(order): enhance order initialization logic with additional client selection step - Added a new step for client selection in the order initialization process when only a masterId is present. - Disabled cognitive complexity checks for improved code maintainability. * feat(contacts): add showServices prop to ContactRow for conditional rendering - Updated ContactsList to pass showServices prop to ContactRow. - Modified ContactRow to conditionally render services based on the showServices prop, enhancing the display of contact information. * feat(contacts): add DataNotFound component for empty states in contacts and services grids - Integrated DataNotFound component to display a message when no contacts or services are found in the respective grids. - Enhanced loading state handling in ServicesSelect and ScheduleCalendar components to improve user experience during data fetching. * feat(contacts): enhance contact display and improve user experience - Updated ContactsList to include a description prop in ContactRow for better service representation. - Renamed header in OrderContacts from "Контакты" to "Участники" for clarity. - Replaced Avatar components with UserAvatar in various components for consistent user representation. - Filtered active contacts in MastersGrid and ClientsGrid to improve data handling. - Adjusted customer query logic to ensure proper handling of telegramId. * feat(customers): add getCustomers API and enhance customer queries - Introduced getCustomers action and corresponding server method to fetch customer data with pagination and sorting. - Updated hooks to support infinite querying of customers, improving data handling in components. - Refactored ContactsList and related components to utilize the new customer fetching logic, enhancing user experience. - Adjusted filter labels in dropdowns for better clarity and user understanding. * refactor(contacts): consolidate customer queries and enhance contact handling - Replaced use of useCustomersInfiniteQuery with a new useContactsInfiniteQuery hook for improved data fetching. - Simplified ContactsList and MastersGrid components by removing unnecessary customer documentId filters. - Deleted outdated contact-related hooks and queries to streamline the codebase. - Enhanced loading state management across components for better user experience. * fix(avatar): update UserAvatar sizes for consistency across components - Changed UserAvatar size from 'xl' to 'lg' in PersonCard for better alignment with design. - Adjusted UserAvatar size from 'sm' to 'xs' in OrderCard to ensure uniformity in avatar presentation. - Updated sizeClasses in UserAvatar component to reflect the new 'xs' size, enhancing responsiveness. * fix(auth): ensure telegramId is a string for consistent handling - Updated the signIn calls in both Auth and useAuth functions to convert telegramId to a string. - Modified the JWT callback to store telegramId as a string in the token. - Enhanced session handling to correctly assign telegramId from the token to the session user. - Added type definitions for telegramId in next-auth to ensure proper type handling. * fix(auth): handle unregistered users in authentication flow - Updated the authentication logic in both Auth and useAuth functions to redirect unregistered users to the '/unregistered' page. - Enhanced error handling in the authOptions to check for user registration status using the Telegram ID. - Improved the matcher configuration in middleware to exclude the '/unregistered' route from authentication checks. * feat(subscriptions): add SubscriptionRewardFields and update related types - Introduced SubscriptionRewardFields fragment to encapsulate reward-related data for subscriptions. - Updated CustomerFiltersInput and SubscriptionHistoryFiltersInput to include subscription_rewards for enhanced filtering capabilities. - Added SubscriptionRewardFiltersInput and SubscriptionRewardInput types to support reward management in subscriptions. - Modified existing fragments and queries to reflect the new structure and ensure consistency across the codebase. * test payment * feat(subscriptions): refactor subscription handling and update related queries - Renamed `hasUserTrialSubscription` to `usedTrialSubscription` for clarity in the SubscriptionsService. - Updated subscription-related queries and fragments to use `active` instead of `isActive` for consistency. - Enhanced the ProPage component to utilize the new subscription checks and improve trial usage logic. - Removed unused subscription history query to streamline the codebase. - Adjusted the SubscriptionInfoBar to reflect the new subscription state handling. * feat(subscriptions): update subscription messages and enhance bot functionality - Renamed `msg-subscribe-active-until` to `msg-subscription-active-until` for consistency in localization. - Added `msg-subscription-active-days` to inform users about remaining subscription days. - Refactored subscription handling in the bot to utilize updated subscription checks and improve user messaging. - Enhanced conversation flow by integrating chat action for typing indication during subscription interactions. * feat(subscriptions): enhance subscription handling and localization updates - Added new message `msg-subscribe-disabled` to inform users when their subscription is disabled. - Updated `msg-subscription-active-days` to ensure proper localization formatting. - Refactored subscription command in the bot to check for subscription status and respond accordingly. - Enhanced ProfilePage to conditionally render the SubscriptionInfoBar based on subscription status. - Updated GraphQL types and queries to include `proEnabled` for better subscription management. * feat(bot): enhance conversation handling by removing redundant typing indication - Added a chat action for 'typing' indication at the start of the bot's conversation flow. - Removed the redundant 'typing' action from individual conversation handlers to streamline the code. * feat(localization): update Russian localization with support contact and message adjustments - Added a new support contact message for user inquiries. - Refactored existing messages to utilize the new support contact variable for consistency. - Cleaned up redundant messages and ensured proper localization formatting across various sections. * feat(localization): add Pro subscription information and update command list - Introduced new localization entry for Pro subscription information. - Updated command list to include 'pro' command for better user guidance. - Enhanced existing subscription messages for clarity and consistency. * feat(localization): update Pro access terminology and enhance subscription messages - Replaced instances of "подписка" with "доступ" to clarify Pro access terminology. - Updated subscription-related messages for improved user understanding and consistency. - Enhanced command list and bot responses to reflect changes in Pro access messaging. * feat(subscriptions): enhance subscription flow and localization updates - Updated default locale to Russian for improved user experience. - Refactored subscription messages to include expiration dates and active subscription status. - Enhanced keyboard display for subscription options with clear expiration information. - Improved handling of subscription-related queries and responses for better clarity. * update support contact * update bot description * .github\workflows\deploy.yml: add BOT_PROVIDER_TOKEN
307 lines
9.3 KiB
TypeScript
307 lines
9.3 KiB
TypeScript
/* eslint-disable @typescript-eslint/naming-convention */
|
||
import { getClientWithToken } from '../apollo/client';
|
||
import { ERRORS as SHARED_ERRORS } from '../constants/errors';
|
||
import * as GQL from '../types';
|
||
import { BaseService } from './base';
|
||
import { ServicesService } from './services';
|
||
import { type VariablesOf } from '@graphql-typed-document-node/core';
|
||
import { getMinutes, isBeforeNow } from '@repo/utils/datetime-format';
|
||
import dayjs from 'dayjs';
|
||
|
||
export const ERRORS = {
|
||
INACTIVE_MASTER: 'Пользователь не является активным или мастером',
|
||
INVALID_TIME: 'Некорректное время',
|
||
MISSING_DATETIME_END: 'Не указана дата окончания',
|
||
MISSING_DATETIME_START: 'Не указана дата начала',
|
||
MISSING_SERVICES_IDS: 'Не указаны услуги',
|
||
NO_PAST_SLOT: 'Нельзя создать слот в прошлом',
|
||
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.checkIsBanned();
|
||
|
||
await this.checkBeforeCreate(variables);
|
||
|
||
const { customer } = await this._getUser();
|
||
|
||
const { mutate } = await getClientWithToken();
|
||
|
||
const mutationResult = await mutate({
|
||
mutation: GQL.CreateSlotDocument,
|
||
variables: {
|
||
...variables,
|
||
input: {
|
||
...variables.input,
|
||
master: customer?.documentId,
|
||
},
|
||
},
|
||
});
|
||
|
||
const error = mutationResult.errors?.at(0);
|
||
if (error) throw new Error(error.message);
|
||
|
||
return mutationResult.data;
|
||
}
|
||
|
||
async deleteSlot(variables: VariablesOf<typeof GQL.DeleteSlotDocument>) {
|
||
await this.checkIsBanned();
|
||
|
||
await this.checkPermission(variables);
|
||
|
||
const { slot } = await this.getSlot({ documentId: variables.documentId });
|
||
|
||
if (slot?.orders?.length) {
|
||
throw new Error(ERRORS.SLOT_HAS_ORDERS);
|
||
}
|
||
|
||
const { mutate } = await getClientWithToken();
|
||
|
||
const mutationResult = await mutate({
|
||
mutation: GQL.DeleteSlotDocument,
|
||
variables,
|
||
});
|
||
|
||
const error = mutationResult.errors?.at(0);
|
||
if (error) throw new Error(error.message);
|
||
|
||
return mutationResult.data;
|
||
}
|
||
|
||
async getAvailableTimeSlots(
|
||
variables: VariablesOf<typeof GQL.GetSlotsDocument>,
|
||
context: { services: string[] },
|
||
) {
|
||
await this.checkIsBanned();
|
||
|
||
if (!variables.filters?.datetime_start) throw new Error(ERRORS.MISSING_DATETIME_START);
|
||
if (!context?.services?.length) throw new Error(ERRORS.MISSING_SERVICES_IDS);
|
||
|
||
const servicesService = new ServicesService(this._user);
|
||
|
||
// Получаем все услуги по массиву id`
|
||
const services: Array<{ duration: string }> = [];
|
||
for (const serviceId of context.services) {
|
||
const { service } = await servicesService.getService({
|
||
documentId: serviceId,
|
||
});
|
||
|
||
if (!service) throw new Error(ERRORS.NOT_FOUND_SERVICE);
|
||
|
||
services.push(service);
|
||
}
|
||
|
||
// Суммируем длительности всех услуг
|
||
const totalServiceDuration = services.reduce(
|
||
(sum, service) => sum + getMinutes(service.duration),
|
||
0,
|
||
);
|
||
|
||
const { query } = await getClientWithToken();
|
||
|
||
const getSlotsResult = await query({
|
||
query: GQL.GetSlotsOrdersDocument,
|
||
variables: {
|
||
filters: {
|
||
...variables.filters,
|
||
state: { eq: GQL.Enum_Slot_State.Open },
|
||
},
|
||
},
|
||
});
|
||
|
||
if (getSlotsResult.error) throw new Error(getSlotsResult.error.message);
|
||
|
||
const slots = getSlotsResult.data.slots;
|
||
|
||
const times: Array<{ slotId: string; time: string }> = [];
|
||
|
||
const now = dayjs();
|
||
|
||
for (const slot of slots) {
|
||
if (!slot?.datetime_start || !slot?.datetime_end) continue;
|
||
|
||
let datetimeStart = dayjs(slot.datetime_start);
|
||
const datetimeEnd = dayjs(slot.datetime_end).subtract(totalServiceDuration, 'minutes');
|
||
|
||
while (datetimeStart.valueOf() <= datetimeEnd.valueOf()) {
|
||
const slotStartTime = datetimeStart;
|
||
const potentialDatetimeEnd = datetimeStart.add(totalServiceDuration, 'minutes');
|
||
|
||
const hasConflict = slot.orders.some(
|
||
(order) =>
|
||
order?.state &&
|
||
![GQL.Enum_Order_State.Cancelled].includes(order.state) &&
|
||
slotStartTime.isBefore(dayjs(order.datetime_end)) &&
|
||
potentialDatetimeEnd.isAfter(dayjs(order.datetime_start)),
|
||
);
|
||
|
||
if (!hasConflict && datetimeStart.isAfter(now, 'minute')) {
|
||
times.push({ slotId: slot.documentId, time: datetimeStart.toISOString() });
|
||
}
|
||
|
||
datetimeStart = datetimeStart.add(15, 'minutes');
|
||
}
|
||
}
|
||
|
||
return { slots, times };
|
||
}
|
||
|
||
async getSlot(variables: VariablesOf<typeof GQL.GetSlotDocument>) {
|
||
await this.checkIsBanned();
|
||
|
||
const { query } = await getClientWithToken();
|
||
|
||
const result = await query({
|
||
query: GQL.GetSlotDocument,
|
||
variables,
|
||
});
|
||
|
||
return result.data;
|
||
}
|
||
|
||
async getSlots(variables: VariablesOf<typeof GQL.GetSlotsDocument>) {
|
||
await this.checkIsBanned();
|
||
|
||
const { query } = await getClientWithToken();
|
||
|
||
const result = await query({
|
||
query: GQL.GetSlotsDocument,
|
||
variables,
|
||
});
|
||
|
||
return result.data;
|
||
}
|
||
|
||
async updateSlot(variables: VariablesOf<typeof GQL.UpdateSlotDocument>) {
|
||
await this.checkIsBanned();
|
||
|
||
await this.checkPermission(variables);
|
||
await this.checkBeforeUpdateDatetime(variables);
|
||
|
||
const { mutate } = await getClientWithToken();
|
||
|
||
const mutationResult = await mutate({
|
||
mutation: GQL.UpdateSlotDocument,
|
||
variables,
|
||
});
|
||
|
||
const error = mutationResult.errors?.at(0);
|
||
if (error) throw new Error(error.message);
|
||
|
||
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) {
|
||
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'>,
|
||
) {
|
||
const { customer } = await this._getUser();
|
||
|
||
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(SHARED_ERRORS.NO_PERMISSION);
|
||
}
|
||
}
|