@purpleschool/multisite 0.0.21 → 0.0.23

package/build/queries/user/get-my-products.command.d.ts

@@ -51,9 +51,9 @@ export declare namespace GetMyProductsCommand {
         }, "strip", z.ZodTypeAny, {
             uuid: string;
             status: USER_TO_PRODUCT_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             product: {
                 price: number;
                 uuid: string;
@@ -69,9 +69,9 @@ export declare namespace GetMyProductsCommand {
         }, {
             uuid: string;
             status: USER_TO_PRODUCT_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             product: {
                 price: number;
                 uuid: string;
@@ -89,9 +89,9 @@ export declare namespace GetMyProductsCommand {
         data: {
             uuid: string;
             status: USER_TO_PRODUCT_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             product: {
                 price: number;
                 uuid: string;
@@ -109,9 +109,9 @@ export declare namespace GetMyProductsCommand {
         data: {
             uuid: string;
             status: USER_TO_PRODUCT_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             product: {
                 price: number;
                 uuid: string;

package/build/queries/user/get-my-subscriptions.command.d.ts

@@ -67,10 +67,11 @@ export declare namespace GetMySubscriptionsCommand {
             active: boolean;
             uuid: string;
             status: USER_TO_SUBSCRIPTION_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             carriedOverTokenBalance: number;
+            endDate: string | Date | null;
             subscription: {
                 price: number;
                 interval: string;
@@ -87,15 +88,15 @@ export declare namespace GetMySubscriptionsCommand {
                 discount: number;
                 carryoverPercent: number;
             };
-            endDate: string | Date | null;
         }, {
             active: boolean;
             uuid: string;
             status: USER_TO_SUBSCRIPTION_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             carriedOverTokenBalance: number;
+            endDate: string | Date | null;
             subscription: {
                 price: number;
                 interval: string;
@@ -112,17 +113,17 @@ export declare namespace GetMySubscriptionsCommand {
                 discount: number;
                 carryoverPercent: number;
             };
-            endDate: string | Date | null;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
         data: {
             active: boolean;
             uuid: string;
             status: USER_TO_SUBSCRIPTION_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             carriedOverTokenBalance: number;
+            endDate: string | Date | null;
             subscription: {
                 price: number;
                 interval: string;
@@ -139,17 +140,17 @@ export declare namespace GetMySubscriptionsCommand {
                 discount: number;
                 carryoverPercent: number;
             };
-            endDate: string | Date | null;
         }[];
     }, {
         data: {
             active: boolean;
             uuid: string;
             status: USER_TO_SUBSCRIPTION_STATUS;
-            createdAt: string | Date;
-            tokenBalance: number;
             initTokenBalance: number;
+            tokenBalance: number;
+            createdAt: string | Date;
             carriedOverTokenBalance: number;
+            endDate: string | Date | null;
             subscription: {
                 price: number;
                 interval: string;
@@ -166,7 +167,6 @@ export declare namespace GetMySubscriptionsCommand {
                 discount: number;
                 carryoverPercent: number;
             };
-            endDate: string | Date | null;
         }[];
     }>;
     type Response = z.infer<typeof ResponseSchema>;

package/build/queries/user/get-user-payments.command.d.ts

@@ -19,14 +19,14 @@ export declare namespace GetUserPaymentsCommand {
     }, "strip", z.ZodTypeAny, {
         uuid: string;
         description: string;
-        currency: string;
-        updatedAt: string | Date;
         userId: string;
+        productId: string | null;
+        updatedAt: string | Date;
         subscriptionId: string | null;
+        currency: string;
         sum: number;
         orderType: ORDER_TYPE;
         orderStatus: ORDER_STATUS;
-        productId: string | null;
         productName: string | null;
         subscriptionName: string | null;
         paymentStatus: PAYMENT_STATUS;
@@ -34,14 +34,14 @@ export declare namespace GetUserPaymentsCommand {
     }, {
         uuid: string;
         description: string;
-        currency: string;
-        updatedAt: string | Date;
         userId: string;
+        productId: string | null;
+        updatedAt: string | Date;
         subscriptionId: string | null;
+        currency: string;
         sum: number;
         orderType: ORDER_TYPE;
         orderStatus: ORDER_STATUS;
-        productId: string | null;
         productName: string | null;
         subscriptionName: string | null;
         paymentStatus: PAYMENT_STATUS;
@@ -66,14 +66,14 @@ export declare namespace GetUserPaymentsCommand {
         }, "strip", z.ZodTypeAny, {
             uuid: string;
             description: string;
-            currency: string;
-            updatedAt: string | Date;
             userId: string;
+            productId: string | null;
+            updatedAt: string | Date;
             subscriptionId: string | null;
+            currency: string;
             sum: number;
             orderType: ORDER_TYPE;
             orderStatus: ORDER_STATUS;
-            productId: string | null;
             productName: string | null;
             subscriptionName: string | null;
             paymentStatus: PAYMENT_STATUS;
@@ -81,14 +81,14 @@ export declare namespace GetUserPaymentsCommand {
         }, {
             uuid: string;
             description: string;
-            currency: string;
-            updatedAt: string | Date;
             userId: string;
+            productId: string | null;
+            updatedAt: string | Date;
             subscriptionId: string | null;
+            currency: string;
             sum: number;
             orderType: ORDER_TYPE;
             orderStatus: ORDER_STATUS;
-            productId: string | null;
             productName: string | null;
             subscriptionName: string | null;
             paymentStatus: PAYMENT_STATUS;
@@ -98,14 +98,14 @@ export declare namespace GetUserPaymentsCommand {
         data: {
             uuid: string;
             description: string;
-            currency: string;
-            updatedAt: string | Date;
             userId: string;
+            productId: string | null;
+            updatedAt: string | Date;
             subscriptionId: string | null;
+            currency: string;
             sum: number;
             orderType: ORDER_TYPE;
             orderStatus: ORDER_STATUS;
-            productId: string | null;
             productName: string | null;
             subscriptionName: string | null;
             paymentStatus: PAYMENT_STATUS;
@@ -115,14 +115,14 @@ export declare namespace GetUserPaymentsCommand {
         data: {
             uuid: string;
             description: string;
-            currency: string;
-            updatedAt: string | Date;
             userId: string;
+            productId: string | null;
+            updatedAt: string | Date;
             subscriptionId: string | null;
+            currency: string;
             sum: number;
             orderType: ORDER_TYPE;
             orderStatus: ORDER_STATUS;
-            productId: string | null;
             productName: string | null;
             subscriptionName: string | null;
             paymentStatus: PAYMENT_STATUS;

package/commands/index.ts

@@ -1,6 +1,8 @@
 export * from './auth';
 export * from './product';
 export * from './subscription';
+export * from './user-to-product';
+export * from './user-to-subscription';
 export * from './payment';
 export * from './transaction';
 export * from './image-generation';

package/commands/user-to-product/delete-user-to-product.command.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+export namespace DeleteUserToProductCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.boolean(),
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-product/get-user-to-product-by-uuid.command.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { UserToProductSchema } from '../../models';
+
+export namespace GetUserToProductByUuidCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.object({
+        data: UserToProductSchema,
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-product/index.ts

@@ -0,0 +1,3 @@
+export * from './get-user-to-product-by-uuid.command';
+export * from './update-user-to-product.command';
+export * from './delete-user-to-product.command';

package/commands/user-to-product/update-user-to-product.command.ts

@@ -0,0 +1,23 @@
+import { z } from 'zod';
+import { USER_TO_PRODUCT_STATUS } from '../../constants';
+import { UserToProductSchema } from '../../models';
+
+export namespace UpdateUserToProductCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const RequestSchema = z.object({
+        initTokenBalance: z.number().int().min(0).optional(),
+        tokenBalance: z.number().int().min(0).optional(),
+        status: z.nativeEnum(USER_TO_PRODUCT_STATUS).optional(),
+        orderId: z.string().uuid().nullable().optional(),
+    });
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: UserToProductSchema,
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-subscription/admin-cancel-subscription.command.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export namespace AdminCancelSubscriptionCommand {
+    export const RequestParamSchema = z.object({
+        uuidSiteUserToSubscription: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.void();
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-subscription/delete-user-to-subscription.command.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+export namespace DeleteUserToSubscriptionCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.boolean(),
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-subscription/get-user-to-subscription-by-uuid.command.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { UserToSubscriptionSchema } from '../../models';
+
+export namespace GetUserToSubscriptionByUuidCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const ResponseSchema = z.object({
+        data: UserToSubscriptionSchema,
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user-to-subscription/index.ts

@@ -0,0 +1,4 @@
+export * from './get-user-to-subscription-by-uuid.command';
+export * from './update-user-to-subscription.command';
+export * from './delete-user-to-subscription.command';
+export * from './admin-cancel-subscription.command';

package/commands/user-to-subscription/update-user-to-subscription.command.ts

@@ -0,0 +1,31 @@
+import { z } from 'zod';
+import { USER_TO_SUBSCRIPTION_STATUS, USER_TO_SUBSCRIPTION_TYPE } from '../../constants';
+import { UserToSubscriptionSchema } from '../../models';
+
+export namespace AdminUpdateUserToSubscriptionCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const RequestSchema = z.object({
+        orderId: z.string().uuid().nullable().optional(),
+        cloudPaymentsSubscriptionId: z.string().nullable().optional(),
+        type: z.nativeEnum(USER_TO_SUBSCRIPTION_TYPE).optional(),
+        initTokenBalance: z.number().int().min(0).optional(),
+        tokenBalance: z.number().int().min(0).optional(),
+        initCarriedOverTokenBalance: z.number().int().min(0).optional(),
+        carriedOverTokenBalance: z.number().int().min(0).optional(),
+        status: z.nativeEnum(USER_TO_SUBSCRIPTION_STATUS).optional(),
+        active: z.boolean().optional(),
+        startDate: z.coerce.date().nullable().optional(),
+        intervalEndDate: z.coerce.date().nullable().optional(),
+        endDate: z.coerce.date().nullable().optional(),
+    });
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: UserToSubscriptionSchema,
+    });
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constants/errors/errors.ts

@@ -184,6 +184,38 @@ export const ERRORS = {
         code: 'PRODUCT_004',
         httpCode: 500,
     },
+    PRODUCT_UPDATE_ERROR: {
+        message: 'Ошибка при обновлении продукта',
+        code: 'PRODUCT_005',
+        httpCode: 500,
+    },
+    PRODUCT_DELETE_ERROR: {
+        message: 'Ошибка при удалении продукта',
+        code: 'PRODUCT_006',
+        httpCode: 500,
+    },
+
+    // USER TO PRODUCT
+    USER_TO_PRODUCT_NOT_FOUND: {
+        message: 'Продукт пользователя не найден',
+        code: 'USER_TO_PRODUCT_001',
+        httpCode: 404,
+    },
+    USER_TO_PRODUCT_FIND_ERROR: {
+        message: 'Ошибка при поиске продукта пользователя',
+        code: 'USER_TO_PRODUCT_002',
+        httpCode: 500,
+    },
+    USER_TO_PRODUCT_UPDATE_ERROR: {
+        message: 'Ошибка при обновлении продукта пользователя',
+        code: 'USER_TO_PRODUCT_003',
+        httpCode: 500,
+    },
+    USER_TO_PRODUCT_DELETE_ERROR: {
+        message: 'Ошибка при удалении продукта пользователя',
+        code: 'USER_TO_PRODUCT_004',
+        httpCode: 500,
+    },
 
     // SUBSCRIPTION
     SUBSCRIPTION_NOT_FOUND: {
@@ -226,6 +258,38 @@ export const ERRORS = {
         code: 'SUBSCRIPTION_008',
         httpCode: 500,
     },
+    SUBSCRIPTION_UPDATE_ERROR: {
+        message: 'Ошибка при обновлении подписки',
+        code: 'SUBSCRIPTION_009',
+        httpCode: 500,
+    },
+    SUBSCRIPTION_DELETE_ERROR: {
+        message: 'Ошибка при удалении подписки',
+        code: 'SUBSCRIPTION_010',
+        httpCode: 500,
+    },
+
+    // USER TO SUBSCRIPTION
+    USER_TO_SUBSCRIPTION_NOT_FOUND: {
+        message: 'Подписка пользователя не найдена',
+        code: 'USER_TO_SUBSCRIPTION_001',
+        httpCode: 404,
+    },
+    USER_TO_SUBSCRIPTION_FIND_ERROR: {
+        message: 'Ошибка при поиске подписки пользователя',
+        code: 'USER_TO_SUBSCRIPTION_002',
+        httpCode: 500,
+    },
+    USER_TO_SUBSCRIPTION_UPDATE_ERROR: {
+        message: 'Ошибка при обновлении подписки пользователя',
+        code: 'USER_TO_SUBSCRIPTION_003',
+        httpCode: 500,
+    },
+    USER_TO_SUBSCRIPTION_DELETE_ERROR: {
+        message: 'Ошибка при удалении подписки пользователя',
+        code: 'USER_TO_SUBSCRIPTION_004',
+        httpCode: 500,
+    },
 
     // ORDER
     ORDER_NOT_FOUND: {

package/models/index.ts

@@ -1,6 +1,8 @@
 export * from './user.schema';
 export * from './product.schema';
 export * from './subscription.schema';
+export * from './user-to-product.schema';
+export * from './user-to-subscription.schema';
 export * from './cloud-payments-widget.schema';
 export * from './cloud-payments-widget-data.schema';
 export * from './image-generation';

package/models/user-to-product.schema.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+import { USER_TO_PRODUCT_STATUS } from '../constants';
+
+export const UserToProductSchema = z.object({
+    uuid: z.string().uuid(),
+    siteId: z.string().uuid(),
+    userId: z.string().uuid(),
+    productId: z.string().uuid(),
+    orderId: z.string().uuid().nullable(),
+    initTokenBalance: z.number().int().min(0),
+    tokenBalance: z.number().int().min(0),
+    status: z.nativeEnum(USER_TO_PRODUCT_STATUS),
+    createdAt: z.date(),
+    updatedAt: z.date(),
+});

package/models/user-to-subscription.schema.ts

@@ -0,0 +1,23 @@
+import { z } from 'zod';
+import { USER_TO_SUBSCRIPTION_STATUS, USER_TO_SUBSCRIPTION_TYPE } from '../constants';
+
+export const UserToSubscriptionSchema = z.object({
+    uuid: z.string().uuid(),
+    siteId: z.string().uuid(),
+    userId: z.string().uuid(),
+    subscriptionId: z.string().uuid(),
+    orderId: z.string().uuid().nullable(),
+    cloudPaymentsSubscriptionId: z.string().nullable(),
+    type: z.nativeEnum(USER_TO_SUBSCRIPTION_TYPE),
+    initTokenBalance: z.number().int().min(0),
+    tokenBalance: z.number().int().min(0),
+    initCarriedOverTokenBalance: z.number().int().min(0),
+    carriedOverTokenBalance: z.number().int().min(0),
+    status: z.nativeEnum(USER_TO_SUBSCRIPTION_STATUS),
+    active: z.boolean(),
+    startDate: z.date().nullable(),
+    intervalEndDate: z.date().nullable(),
+    endDate: z.date().nullable(),
+    createdAt: z.date(),
+    updatedAt: z.date(),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/multisite",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Multisite API contracts (DTO schemas, routes, constants)",
   "type": "commonjs",
   "main": "build/index.js",