feat: enhance Telegram notification heading for order updates

- Updated the heading emoji logic to display a checkered flag for completed orders and a pencil for updates, improving clarity in notifications. - Added specific handling for completed records in the notification heading to differentiate between updated and completed statuses.
refactor: consolidate order lifecycle validation logic and remove slot lifecycle
2025-08-11 15:00:48 +03:00 · 2025-08-11 14:41:12 +03:00
38 changed files with 221 additions and 741 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -9,25 +9,19 @@ jobs:
  build-and-push:
    name: Build and Push to Docker Hub
    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.vars.outputs.tag }}

    steps:
      - name: Checkout code
        uses: actions/checkout@v3

-      - name: Set image tag
-        id: vars
-        run: echo "tag=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
-
      - name: Login to Docker Hub
        run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin

      - name: Build image
-        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-strapi:${{ steps.vars.outputs.tag }} .
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-strapi:latest .

      - name: Push image to Docker Hub
-        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-strapi:${{ steps.vars.outputs.tag }}
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-strapi:latest

  deploy:
    name: Deploy to VPS
@ -64,8 +58,6 @@ jobs:
          echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env
          echo "DATABASE_SSL=false" >> .env
          echo "BOT_TOKEN=${{ secrets.BOT_TOKEN }}" >> .env
-          echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" >> .env
-          echo "STRAPI_IMAGE_TAG=${{ needs.build-and-push.outputs.tag }}" >> .env

      - name: Copy .env to VPS via SCP
        uses: appleboy/scp-action@master
--- a/.gitignore
+++ b/.gitignore
@ -128,6 +128,4 @@ exports
 dist
 build
 .strapi-updater.json
-.strapi-cloud.json
-
-*.cmd
+.strapi-cloud.json
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -1,28 +0,0 @@
-services:
-  postgres:
-    image: postgres
-    ports:
-      - '127.0.0.1:5432:5432'
-    environment:
-      POSTGRES_USER: ${DATABASE_USERNAME}
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_DB: ${DATABASE_NAME}
-  strapi:
-    build: .
-    ports:
-      - '127.0.0.1:1337:1337'
-    environment:
-      APP_KEYS: ${APP_KEYS}
-      API_TOKEN_SALT: ${API_TOKEN_SALT}
-      ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET}
-      TRANSFER_TOKEN_SALT: ${TRANSFER_TOKEN_SALT}
-      JWT_SECRET: ${JWT_SECRET}
-      DATABASE_HOST: ${DATABASE_HOST}
-      DATABASE_PORT: ${DATABASE_PORT}
-      DATABASE_NAME: ${DATABASE_NAME}
-      DATABASE_USERNAME: ${DATABASE_USERNAME}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-      DATABASE_SSL: 'false'
-      BOT_TOKEN: ${BOT_TOKEN}
-
-
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,6 +1,6 @@
 services:
  strapi:
-    image: ${DOCKERHUB_USERNAME}/zapishis-strapi:${STRAPI_IMAGE_TAG}
+    image: vchikalkin/zapishis-strapi:latest
    ports:
      - "127.0.0.1:1337:1337"
    environment:
--- a/src/api/block/content-types/block/schema.json
+++ b/src/api/block/content-types/block/schema.json
@ -0,0 +1,60 @@
+{
+  "kind": "collectionType",
+  "collectionName": "blocks",
+  "info": {
+    "singularName": "block",
+    "pluralName": "blocks",
+    "displayName": "Block",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "datetime_start": {
+      "type": "datetime",
+      "required": true
+    },
+    "datetime_end": {
+      "type": "datetime",
+      "required": true
+    },
+    "state": {
+      "type": "enumeration",
+      "enum": [
+        "created",
+        "paid",
+        "deleted"
+      ],
+      "default": "created"
+    },
+    "sessions_total": {
+      "type": "integer",
+      "default": 10,
+      "required": true
+    },
+    "sessions_completed": {
+      "type": "integer",
+      "default": 0
+    },
+    "master": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "api::customer.customer",
+      "inversedBy": "blocks"
+    },
+    "client": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "api::customer.customer",
+      "inversedBy": "blocks"
+    },
+    "orders": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::order.order",
+      "mappedBy": "block"
+    }
+  }
+}
--- a/src/api/block/controllers/block.ts
+++ b/src/api/block/controllers/block.ts
@ -0,0 +1,7 @@
+/**
+ * block controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::block.block');
--- a/src/api/block/routes/block.ts
+++ b/src/api/block/routes/block.ts
@ -0,0 +1,7 @@
+/**
+ * block router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::block.block');
--- a/src/api/block/services/block.ts
+++ b/src/api/block/services/block.ts
@ -0,0 +1,7 @@
+/**
+ * block service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::block.block');
--- a/src/api/customer/content-types/customer-setting/schema.json
+++ b/src/api/customer/content-types/customer-setting/schema.json
@ -1,24 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "customer_settings",
-  "info": {
-    "singularName": "customer-setting",
-    "pluralName": "customer-settings",
-    "displayName": "CustomerSettings"
-  },
-  "options": {
-    "draftAndPublish": false
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "autoRenewSubscription": {
-      "type": "boolean"
-    },
-    "customer": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::customer.customer",
-      "mappedBy": "customer_setting"
-    }
-  }
-}
--- a/src/api/customer/content-types/customer/schema.json
+++ b/src/api/customer/content-types/customer/schema.json
@ -17,11 +17,6 @@
      "maxLength": 100,
      "required": true
    },
-    "surname": {
-      "type": "string",
-      "maxLength": 100,
-      "required": false
-    },
    "telegramId": {
      "type": "biginteger",
      "unique": true
@ -45,17 +40,23 @@
      "required": false,
      "default": false
    },
-    "invited": {
+    "clients": {
      "type": "relation",
      "relation": "manyToMany",
      "target": "api::customer.customer",
-      "inversedBy": "invitedBy"
+      "inversedBy": "masters"
    },
-    "invitedBy": {
+    "masters": {
      "type": "relation",
      "relation": "manyToMany",
      "target": "api::customer.customer",
-      "mappedBy": "invited"
+      "mappedBy": "clients"
+    },
+    "blocks": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::block.block",
+      "mappedBy": "client"
    },
    "slots": {
      "type": "relation",
@ -77,27 +78,6 @@
      "relation": "oneToMany",
      "target": "api::service.service",
      "mappedBy": "master"
-    },
-    "subscriptions": {
-      "type": "relation",
-      "relation": "oneToMany",
-      "target": "api::subscription.subscription",
-      "mappedBy": "customer"
-    },
-    "bannedUntil": {
-      "type": "datetime"
-    },
-    "subscription_rewards": {
-      "type": "relation",
-      "relation": "oneToMany",
-      "target": "api::subscription-reward.subscription-reward",
-      "mappedBy": "owner"
-    },
-    "customer_setting": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::customer.customer-setting",
-      "inversedBy": "customer"
    }
  }
 }
--- a/src/api/order/content-types/order/lifecycles.ts
+++ b/src/api/order/content-types/order/lifecycles.ts
@ -106,37 +106,20 @@ async function sendTelegramNotification(orderEntity: Order, isUpdate = false) {

    const clientName = order.client?.name || '-';
    const masterName = slot.master?.name || '-';
-    
-    // Формируем список всех услуг и вычисляем общую стоимость
-    let servicesList = '-';
-    let totalPrice = 0;
-    
-    if (order.services?.length) {
-      servicesList = order.services.map(service => service.name).join(', ');
-      
-      // Вычисляем общую стоимость
-      totalPrice = order.services.reduce((sum, service) => {
-        return sum + (service.price || 0);
-      }, 0);
-    }
-    
-    // Форматируем цену для отображения
-    const priceText = totalPrice > 0 ? `${totalPrice.toLocaleString('ru-RU')} ₽` : 'Не указана';
-    
+    const serviceName = order.services?.[0]?.name || '-';
+
    const messageForMaster = `${heading}
 <b>Дата:</b> ${date}
 <b>Время:</b> ${timeStartString} - ${timeEndString}
 <b>Клиент:</b> ${clientName}
-<b>Услуги:</b> ${servicesList}
-<b>Стоимость:</b> ${priceText}
+<b>Услуга:</b> ${serviceName}
 <b>Статус:</b> ${emojiForState} ${stateLabel}`;

    const messageForClient = `${heading}
 <b>Дата:</b> ${date}
 <b>Время:</b> ${timeStartString} - ${timeEndString}
 <b>Мастер:</b> ${masterName}
-<b>Услуги:</b> ${servicesList}
-<b>Стоимость:</b> ${priceText}
+<b>Услуга:</b> ${serviceName}
 <b>Статус:</b> ${emojiForState} ${stateLabel}`;

    if (masterTelegramId) {
--- a/src/api/order/content-types/order/schema.json
+++ b/src/api/order/content-types/order/schema.json
@ -30,6 +30,12 @@
      "target": "api::customer.customer",
      "inversedBy": "orders"
    },
+    "block": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "api::block.block",
+      "inversedBy": "orders"
+    },
    "order_number": {
      "type": "integer"
    },
--- a/src/api/service/content-types/service/schema.json
+++ b/src/api/service/content-types/service/schema.json
@ -4,7 +4,7 @@
  "info": {
    "singularName": "service",
    "pluralName": "services",
-    "displayName": "Service",
+    "displayName": "service",
    "description": ""
  },
  "options": {
@ -37,13 +37,6 @@
    "active": {
      "type": "boolean",
      "default": false
-    },
-    "price": {
-      "type": "decimal",
-      "min": 1
-    },
-    "description": {
-      "type": "text"
    }
  }
 }
--- a/src/api/setting/content-types/setting/schema.json
+++ b/src/api/setting/content-types/setting/schema.json
@ -0,0 +1,20 @@
+{
+  "kind": "collectionType",
+  "collectionName": "settings",
+  "info": {
+    "singularName": "setting",
+    "pluralName": "settings",
+    "displayName": "Setting",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "recording_by_blocks": {
+      "type": "boolean",
+      "default": false
+    }
+  }
+}
--- a/src/api/setting/controllers/setting.ts
+++ b/src/api/setting/controllers/setting.ts
@ -0,0 +1,7 @@
+/**
+ * setting controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::setting.setting');
--- a/src/api/setting/routes/setting.ts
+++ b/src/api/setting/routes/setting.ts
@ -0,0 +1,7 @@
+/**
+ * setting router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::setting.setting');
--- a/src/api/setting/services/setting.ts
+++ b/src/api/setting/services/setting.ts
@ -0,0 +1,7 @@
+/**
+ * setting service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::setting.setting');
--- a/src/api/subscription-history/content-types/subscription-history/schema.json
+++ b/src/api/subscription-history/content-types/subscription-history/schema.json
@ -1,67 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "subscription_histories",
-  "info": {
-    "singularName": "subscription-history",
-    "pluralName": "subscription-histories",
-    "displayName": "SubscriptionHistory"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "subscription": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::subscription.subscription",
-      "mappedBy": "subscription_history"
-    },
-    "subscription_price": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::subscription-price.subscription-price"
-    },
-    "amount": {
-      "type": "decimal",
-      "required": true
-    },
-    "currency": {
-      "type": "string",
-      "default": "RUB",
-      "required": false
-    },
-    "state": {
-      "type": "enumeration",
-      "required": true,
-      "enum": [
-        "success",
-        "failed",
-        "pending"
-      ]
-    },
-    "paymentId": {
-      "type": "string",
-      "required": false
-    },
-    "source": {
-      "type": "enumeration",
-      "required": true,
-      "default": "payment",
-      "enum": [
-        "payment",
-        "trial",
-        "reward",
-        "admin",
-        "renewal"
-      ]
-    },
-    "description": {
-      "type": "text"
-    },
-    "period": {
-      "type": "string",
-      "maxLength": 20
-    }
-  }
-}
--- a/src/api/subscription-history/controllers/subscription-history.ts
+++ b/src/api/subscription-history/controllers/subscription-history.ts
@ -1,7 +0,0 @@
-/**
- * subscription-history controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::subscription-history.subscription-history');
--- a/src/api/subscription-history/routes/subscription-history.ts
+++ b/src/api/subscription-history/routes/subscription-history.ts
@ -1,7 +0,0 @@
-/**
- * subscription-history router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::subscription-history.subscription-history');
--- a/src/api/subscription-history/services/subscription-history.ts
+++ b/src/api/subscription-history/services/subscription-history.ts
@ -1,7 +0,0 @@
-/**
- * subscription-history service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::subscription-history.subscription-history');
--- a/src/api/subscription-price/content-types/subscription-price/schema.json
+++ b/src/api/subscription-price/content-types/subscription-price/schema.json
@ -1,48 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "subscription_prices",
-  "info": {
-    "singularName": "subscription-price",
-    "pluralName": "subscription-prices",
-    "displayName": "SubscriptionPrice"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "period": {
-      "type": "enumeration",
-      "required": true,
-      "enum": [
-        "trial",
-        "day",
-        "week",
-        "month",
-        "half_year",
-        "year"
-      ]
-    },
-    "amount": {
-      "type": "decimal",
-      "required": true
-    },
-    "currency": {
-      "type": "string",
-      "default": "RUB",
-      "required": false
-    },
-    "active": {
-      "type": "boolean",
-      "required": false,
-      "default": true
-    },
-    "description": {
-      "type": "text"
-    },
-    "days": {
-      "type": "integer",
-      "required": true
-    }
-  }
-}
--- a/src/api/subscription-price/controllers/subscription-price.ts
+++ b/src/api/subscription-price/controllers/subscription-price.ts
@ -1,7 +0,0 @@
-/**
- * subscription-price controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::subscription-price.subscription-price');
--- a/src/api/subscription-price/routes/subscription-price.ts
+++ b/src/api/subscription-price/routes/subscription-price.ts
@ -1,7 +0,0 @@
-/**
- * subscription-price router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::subscription-price.subscription-price');
--- a/src/api/subscription-price/services/subscription-price.ts
+++ b/src/api/subscription-price/services/subscription-price.ts
@ -1,7 +0,0 @@
-/**
- * subscription-price service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::subscription-price.subscription-price');
--- a/src/api/subscription-reward/content-types/subscription-reward/schema.json
+++ b/src/api/subscription-reward/content-types/subscription-reward/schema.json
@ -1,47 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "subscription_rewards",
-  "info": {
-    "singularName": "subscription-reward",
-    "pluralName": "subscription-rewards",
-    "displayName": "SubscriptionReward"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "activated": {
-      "type": "boolean",
-      "default": false
-    },
-    "owner": {
-      "type": "relation",
-      "relation": "manyToOne",
-      "target": "api::customer.customer",
-      "inversedBy": "subscription_rewards"
-    },
-    "invited": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::customer.customer"
-    },
-    "days": {
-      "type": "integer",
-      "required": true
-    },
-    "expiresAt": {
-      "type": "datetime",
-      "required": true
-    },
-    "description": {
-      "type": "text"
-    },
-    "subscription": {
-      "type": "relation",
-      "relation": "manyToOne",
-      "target": "api::subscription.subscription",
-      "inversedBy": "subscription_rewards"
-    }
-  }
-}
--- a/src/api/subscription-reward/controllers/subscription-reward.ts
+++ b/src/api/subscription-reward/controllers/subscription-reward.ts
@ -1,7 +0,0 @@
-/**
- * subscription-reward controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::subscription-reward.subscription-reward');
--- a/src/api/subscription-reward/routes/subscription-reward.ts
+++ b/src/api/subscription-reward/routes/subscription-reward.ts
@ -1,7 +0,0 @@
-/**
- * subscription-reward router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::subscription-reward.subscription-reward');
--- a/src/api/subscription-reward/services/subscription-reward.ts
+++ b/src/api/subscription-reward/services/subscription-reward.ts
@ -1,7 +0,0 @@
-/**
- * subscription-reward service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::subscription-reward.subscription-reward');
--- a/src/api/subscription-setting/content-types/subscription-setting/schema.json
+++ b/src/api/subscription-setting/content-types/subscription-setting/schema.json
@ -1,29 +0,0 @@
-{
-  "kind": "singleType",
-  "collectionName": "subscription_settings",
-  "info": {
-    "singularName": "subscription-setting",
-    "pluralName": "subscription-settings",
-    "displayName": "SubscriptionSettings"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "maxOrdersPerMonth": {
-      "type": "integer",
-      "required": true,
-      "default": 20
-    },
-    "referralRewardDays": {
-      "type": "integer",
-      "required": true,
-      "default": 1
-    },
-    "proEnabled": {
-      "type": "boolean",
-      "default": false
-    }
-  }
-}
--- a/src/api/subscription-setting/controllers/subscription-setting.ts
+++ b/src/api/subscription-setting/controllers/subscription-setting.ts
@ -1,7 +0,0 @@
-/**
- * subscription-setting controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::subscription-setting.subscription-setting');
--- a/src/api/subscription-setting/routes/subscription-setting.ts
+++ b/src/api/subscription-setting/routes/subscription-setting.ts
@ -1,7 +0,0 @@
-/**
- * subscription-setting router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::subscription-setting.subscription-setting');
--- a/src/api/subscription-setting/services/subscription-setting.ts
+++ b/src/api/subscription-setting/services/subscription-setting.ts
@ -1,7 +0,0 @@
-/**
- * subscription-setting service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::subscription-setting.subscription-setting');
--- a/src/api/subscription/content-types/subscription/schema.json
+++ b/src/api/subscription/content-types/subscription/schema.json
@ -1,47 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "subscriptions",
-  "info": {
-    "singularName": "subscription",
-    "pluralName": "subscriptions",
-    "displayName": "Subscription"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "customer": {
-      "type": "relation",
-      "relation": "manyToOne",
-      "target": "api::customer.customer",
-      "inversedBy": "subscriptions"
-    },
-    "active": {
-      "type": "boolean",
-      "required": true,
-      "default": false
-    },
-    "expiresAt": {
-      "type": "datetime",
-      "required": true
-    },
-    "subscription_history": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::subscription-history.subscription-history",
-      "inversedBy": "subscription"
-    },
-    "subscription_rewards": {
-      "type": "relation",
-      "relation": "oneToMany",
-      "target": "api::subscription-reward.subscription-reward",
-      "mappedBy": "subscription"
-    },
-    "nextSubscription": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::subscription.subscription"
-    }
-  }
-}
--- a/src/api/subscription/controllers/subscription.ts
+++ b/src/api/subscription/controllers/subscription.ts
@ -1,7 +0,0 @@
-/**
- * subscription controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::subscription.subscription');
--- a/src/api/subscription/routes/subscription.ts
+++ b/src/api/subscription/routes/subscription.ts
@ -1,7 +0,0 @@
-/**
- * subscription router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::subscription.subscription');
--- a/src/api/subscription/services/subscription.ts
+++ b/src/api/subscription/services/subscription.ts
@ -1,7 +0,0 @@
-/**
- * subscription service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::subscription.subscription');
--- a/types/generated/contentTypes.d.ts
+++ b/types/generated/contentTypes.d.ts
@ -373,6 +373,43 @@ export interface AdminUser extends Struct.CollectionTypeSchema {
  };
 }

+export interface ApiBlockBlock extends Struct.CollectionTypeSchema {
+  collectionName: 'blocks';
+  info: {
+    description: '';
+    displayName: 'Block';
+    pluralName: 'blocks';
+    singularName: 'block';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    client: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
+    createdAt: Schema.Attribute.DateTime;
+    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+    datetime_end: Schema.Attribute.DateTime & Schema.Attribute.Required;
+    datetime_start: Schema.Attribute.DateTime & Schema.Attribute.Required;
+    locale: Schema.Attribute.String & Schema.Attribute.Private;
+    localizations: Schema.Attribute.Relation<'oneToMany', 'api::block.block'> &
+      Schema.Attribute.Private;
+    master: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
+    orders: Schema.Attribute.Relation<'oneToMany', 'api::order.order'>;
+    publishedAt: Schema.Attribute.DateTime;
+    sessions_completed: Schema.Attribute.Integer &
+      Schema.Attribute.DefaultTo<0>;
+    sessions_total: Schema.Attribute.Integer &
+      Schema.Attribute.Required &
+      Schema.Attribute.DefaultTo<10>;
+    state: Schema.Attribute.Enumeration<['created', 'paid', 'deleted']> &
+      Schema.Attribute.DefaultTo<'created'>;
+    updatedAt: Schema.Attribute.DateTime;
+    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+  };
+}
+
 export interface ApiCustomerCustomer extends Struct.CollectionTypeSchema {
  collectionName: 'customers';
  info: {
@ -386,25 +423,18 @@ export interface ApiCustomerCustomer extends Struct.CollectionTypeSchema {
  };
  attributes: {
    active: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
-    bannedUntil: Schema.Attribute.DateTime;
+    blocks: Schema.Attribute.Relation<'oneToMany', 'api::block.block'>;
+    clients: Schema.Attribute.Relation<'manyToMany', 'api::customer.customer'>;
    createdAt: Schema.Attribute.DateTime;
    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
      Schema.Attribute.Private;
-    customer_setting: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::customer.customer-setting'
-    >;
-    invited: Schema.Attribute.Relation<'manyToMany', 'api::customer.customer'>;
-    invitedBy: Schema.Attribute.Relation<
-      'manyToMany',
-      'api::customer.customer'
-    >;
    locale: Schema.Attribute.String & Schema.Attribute.Private;
    localizations: Schema.Attribute.Relation<
      'oneToMany',
      'api::customer.customer'
    > &
      Schema.Attribute.Private;
+    masters: Schema.Attribute.Relation<'manyToMany', 'api::customer.customer'>;
    name: Schema.Attribute.String &
      Schema.Attribute.Required &
      Schema.Attribute.SetMinMaxLength<{
@ -423,18 +453,6 @@ export interface ApiCustomerCustomer extends Struct.CollectionTypeSchema {
      Schema.Attribute.Required;
    services: Schema.Attribute.Relation<'oneToMany', 'api::service.service'>;
    slots: Schema.Attribute.Relation<'oneToMany', 'api::slot.slot'>;
-    subscription_rewards: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-reward.subscription-reward'
-    >;
-    subscriptions: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription.subscription'
-    >;
-    surname: Schema.Attribute.String &
-      Schema.Attribute.SetMinMaxLength<{
-        maxLength: 100;
-      }>;
    telegramId: Schema.Attribute.BigInteger & Schema.Attribute.Unique;
    updatedAt: Schema.Attribute.DateTime;
    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@ -442,36 +460,6 @@ export interface ApiCustomerCustomer extends Struct.CollectionTypeSchema {
  };
 }

-export interface ApiCustomerCustomerSetting
-  extends Struct.CollectionTypeSchema {
-  collectionName: 'customer_settings';
-  info: {
-    displayName: 'CustomerSettings';
-    pluralName: 'customer-settings';
-    singularName: 'customer-setting';
-  };
-  options: {
-    draftAndPublish: false;
-  };
-  attributes: {
-    autoRenewSubscription: Schema.Attribute.Boolean;
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    customer: Schema.Attribute.Relation<'oneToOne', 'api::customer.customer'>;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::customer.customer-setting'
-    > &
-      Schema.Attribute.Private;
-    publishedAt: Schema.Attribute.DateTime;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
 export interface ApiOrderOrder extends Struct.CollectionTypeSchema {
  collectionName: 'orders';
  info: {
@ -484,6 +472,7 @@ export interface ApiOrderOrder extends Struct.CollectionTypeSchema {
    draftAndPublish: true;
  };
  attributes: {
+    block: Schema.Attribute.Relation<'manyToOne', 'api::block.block'>;
    client: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
    createdAt: Schema.Attribute.DateTime;
    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@ -518,7 +507,7 @@ export interface ApiServiceService extends Struct.CollectionTypeSchema {
  collectionName: 'services';
  info: {
    description: '';
-    displayName: 'Service';
+    displayName: 'service';
    pluralName: 'services';
    singularName: 'service';
  };
@ -530,7 +519,6 @@ export interface ApiServiceService extends Struct.CollectionTypeSchema {
    createdAt: Schema.Attribute.DateTime;
    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
      Schema.Attribute.Private;
-    description: Schema.Attribute.Text;
    duration: Schema.Attribute.Time &
      Schema.Attribute.Required &
      Schema.Attribute.DefaultTo<'01:00:00.000'>;
@ -547,13 +535,6 @@ export interface ApiServiceService extends Struct.CollectionTypeSchema {
        maxLength: 100;
      }>;
    orders: Schema.Attribute.Relation<'manyToMany', 'api::order.order'>;
-    price: Schema.Attribute.Decimal &
-      Schema.Attribute.SetMinMax<
-        {
-          min: 1;
-        },
-        number
-      >;
    publishedAt: Schema.Attribute.DateTime;
    updatedAt: Schema.Attribute.DateTime;
    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@ -561,6 +542,36 @@ export interface ApiServiceService extends Struct.CollectionTypeSchema {
  };
 }

+export interface ApiSettingSetting extends Struct.CollectionTypeSchema {
+  collectionName: 'settings';
+  info: {
+    description: '';
+    displayName: 'Setting';
+    pluralName: 'settings';
+    singularName: 'setting';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    createdAt: Schema.Attribute.DateTime;
+    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+    locale: Schema.Attribute.String & Schema.Attribute.Private;
+    localizations: Schema.Attribute.Relation<
+      'oneToMany',
+      'api::setting.setting'
+    > &
+      Schema.Attribute.Private;
+    publishedAt: Schema.Attribute.DateTime;
+    recording_by_blocks: Schema.Attribute.Boolean &
+      Schema.Attribute.DefaultTo<false>;
+    updatedAt: Schema.Attribute.DateTime;
+    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+  };
+}
+
 export interface ApiSlotSlot extends Struct.CollectionTypeSchema {
  collectionName: 'slots';
  info: {
@ -591,212 +602,6 @@ export interface ApiSlotSlot extends Struct.CollectionTypeSchema {
  };
 }

-export interface ApiSubscriptionHistorySubscriptionHistory
-  extends Struct.CollectionTypeSchema {
-  collectionName: 'subscription_histories';
-  info: {
-    displayName: 'SubscriptionHistory';
-    pluralName: 'subscription-histories';
-    singularName: 'subscription-history';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    amount: Schema.Attribute.Decimal & Schema.Attribute.Required;
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    currency: Schema.Attribute.String & Schema.Attribute.DefaultTo<'RUB'>;
-    description: Schema.Attribute.Text;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-history.subscription-history'
-    > &
-      Schema.Attribute.Private;
-    paymentId: Schema.Attribute.String;
-    period: Schema.Attribute.String &
-      Schema.Attribute.SetMinMaxLength<{
-        maxLength: 20;
-      }>;
-    publishedAt: Schema.Attribute.DateTime;
-    source: Schema.Attribute.Enumeration<
-      ['payment', 'trial', 'reward', 'admin', 'renewal']
-    > &
-      Schema.Attribute.Required &
-      Schema.Attribute.DefaultTo<'payment'>;
-    state: Schema.Attribute.Enumeration<['success', 'failed', 'pending']> &
-      Schema.Attribute.Required;
-    subscription: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::subscription.subscription'
-    >;
-    subscription_price: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::subscription-price.subscription-price'
-    >;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
-export interface ApiSubscriptionPriceSubscriptionPrice
-  extends Struct.CollectionTypeSchema {
-  collectionName: 'subscription_prices';
-  info: {
-    displayName: 'SubscriptionPrice';
-    pluralName: 'subscription-prices';
-    singularName: 'subscription-price';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    active: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<true>;
-    amount: Schema.Attribute.Decimal & Schema.Attribute.Required;
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    currency: Schema.Attribute.String & Schema.Attribute.DefaultTo<'RUB'>;
-    days: Schema.Attribute.Integer & Schema.Attribute.Required;
-    description: Schema.Attribute.Text;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-price.subscription-price'
-    > &
-      Schema.Attribute.Private;
-    period: Schema.Attribute.Enumeration<
-      ['trial', 'day', 'week', 'month', 'half_year', 'year']
-    > &
-      Schema.Attribute.Required;
-    publishedAt: Schema.Attribute.DateTime;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
-export interface ApiSubscriptionRewardSubscriptionReward
-  extends Struct.CollectionTypeSchema {
-  collectionName: 'subscription_rewards';
-  info: {
-    displayName: 'SubscriptionReward';
-    pluralName: 'subscription-rewards';
-    singularName: 'subscription-reward';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    activated: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    days: Schema.Attribute.Integer & Schema.Attribute.Required;
-    description: Schema.Attribute.Text;
-    expiresAt: Schema.Attribute.DateTime & Schema.Attribute.Required;
-    invited: Schema.Attribute.Relation<'oneToOne', 'api::customer.customer'>;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-reward.subscription-reward'
-    > &
-      Schema.Attribute.Private;
-    owner: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
-    publishedAt: Schema.Attribute.DateTime;
-    subscription: Schema.Attribute.Relation<
-      'manyToOne',
-      'api::subscription.subscription'
-    >;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
-export interface ApiSubscriptionSettingSubscriptionSetting
-  extends Struct.SingleTypeSchema {
-  collectionName: 'subscription_settings';
-  info: {
-    displayName: 'SubscriptionSettings';
-    pluralName: 'subscription-settings';
-    singularName: 'subscription-setting';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-setting.subscription-setting'
-    > &
-      Schema.Attribute.Private;
-    maxOrdersPerMonth: Schema.Attribute.Integer &
-      Schema.Attribute.Required &
-      Schema.Attribute.DefaultTo<20>;
-    proEnabled: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo<false>;
-    publishedAt: Schema.Attribute.DateTime;
-    referralRewardDays: Schema.Attribute.Integer &
-      Schema.Attribute.Required &
-      Schema.Attribute.DefaultTo<1>;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
-export interface ApiSubscriptionSubscription
-  extends Struct.CollectionTypeSchema {
-  collectionName: 'subscriptions';
-  info: {
-    displayName: 'Subscription';
-    pluralName: 'subscriptions';
-    singularName: 'subscription';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    active: Schema.Attribute.Boolean &
-      Schema.Attribute.Required &
-      Schema.Attribute.DefaultTo<false>;
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    customer: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
-    expiresAt: Schema.Attribute.DateTime & Schema.Attribute.Required;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription.subscription'
-    > &
-      Schema.Attribute.Private;
-    nextSubscription: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::subscription.subscription'
-    >;
-    publishedAt: Schema.Attribute.DateTime;
-    subscription_history: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::subscription-history.subscription-history'
-    >;
-    subscription_rewards: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::subscription-reward.subscription-reward'
-    >;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
 export interface PluginContentReleasesRelease
  extends Struct.CollectionTypeSchema {
  collectionName: 'strapi_releases';
@ -1306,16 +1111,12 @@ declare module '@strapi/strapi' {
      'admin::transfer-token': AdminTransferToken;
      'admin::transfer-token-permission': AdminTransferTokenPermission;
      'admin::user': AdminUser;
+      'api::block.block': ApiBlockBlock;
      'api::customer.customer': ApiCustomerCustomer;
-      'api::customer.customer-setting': ApiCustomerCustomerSetting;
      'api::order.order': ApiOrderOrder;
      'api::service.service': ApiServiceService;
+      'api::setting.setting': ApiSettingSetting;
      'api::slot.slot': ApiSlotSlot;
-      'api::subscription-history.subscription-history': ApiSubscriptionHistorySubscriptionHistory;
-      'api::subscription-price.subscription-price': ApiSubscriptionPriceSubscriptionPrice;
-      'api::subscription-reward.subscription-reward': ApiSubscriptionRewardSubscriptionReward;
-      'api::subscription-setting.subscription-setting': ApiSubscriptionSettingSubscriptionSetting;
-      'api::subscription.subscription': ApiSubscriptionSubscription;
      'plugin::content-releases.release': PluginContentReleasesRelease;
      'plugin::content-releases.release-action': PluginContentReleasesReleaseAction;
      'plugin::i18n.locale': PluginI18NLocale;