@purpleschool/gptbot 0.8.98 → 0.8.99

package/api/controllers/http/payment.ts

@@ -3,4 +3,5 @@ export const PAYMENT_CONTROLLER = 'payment' as const;
 export const PAYMENT_ROUTES = {
     HISTORY: 'history',
     REFUND: 'refund',
+    FIND_BY_CRITERIA: 'criteria',
 } as const;

package/api/routes.ts

@@ -863,6 +863,7 @@ export const REST_API = {
     PAYMENT: {
         HISTORY: `${ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.HISTORY}`,
         REFUND: `${ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.REFUND}`,
+        FIND_BY_CRITERIA: `${ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.FIND_BY_CRITERIA}`,
     },
     COURSE: {
         FIND_BY_UUID: `${ROOT}/${CONTROLLERS.COURSE_CONTROLLER}/${CONTROLLERS.COURSE_ROUTES.FIND_BY_UUID}`,

package/build/api/controllers/http/payment.js

@@ -5,4 +5,5 @@ exports.PAYMENT_CONTROLLER = 'payment';
 exports.PAYMENT_ROUTES = {
     HISTORY: 'history',
     REFUND: 'refund',
+    FIND_BY_CRITERIA: 'criteria',
 };

package/build/api/routes.js

@@ -660,6 +660,7 @@ exports.REST_API = {
     PAYMENT: {
         HISTORY: `${exports.ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.HISTORY}`,
         REFUND: `${exports.ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.REFUND}`,
+        FIND_BY_CRITERIA: `${exports.ROOT}/${CONTROLLERS.PAYMENT_CONTROLLER}/${CONTROLLERS.PAYMENT_ROUTES.FIND_BY_CRITERIA}`,
     },
     COURSE: {
         FIND_BY_UUID: `${exports.ROOT}/${CONTROLLERS.COURSE_CONTROLLER}/${CONTROLLERS.COURSE_ROUTES.FIND_BY_UUID}`,

package/build/commands/payment/find-payments-by-criteria.command.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindPaymentsByCriteriaCommand = void 0;
+const zod_1 = require("zod");
+const models_1 = require("../../models");
+const constants_1 = require("../../constants");
+var FindPaymentsByCriteriaCommand;
+(function (FindPaymentsByCriteriaCommand) {
+    FindPaymentsByCriteriaCommand.RequestSchema = zod_1.z.preprocess((input) => {
+        if (input && typeof input === 'object' && !Array.isArray(input)) {
+            const obj = Object.assign({}, input);
+            const onlyNormalize = ['createdAt', 'sum'];
+            const relevantBracketed = Object.keys(obj).some((key) => {
+                const match = key.match(/^(\w+)\[(\w+)\]$/);
+                return match && onlyNormalize.includes(match[1]);
+            });
+            if (!relevantBracketed) {
+                return obj;
+            }
+            const result = Object.assign({}, obj);
+            for (const key of Object.keys(obj)) {
+                const match = key.match(/^(\w+)\[(\w+)\]$/);
+                if (match && onlyNormalize.includes(match[1])) {
+                    const [, outer, inner] = match;
+                    result[outer] = result[outer] || {};
+                    result[outer][inner] = obj[key];
+                    delete result[key];
+                }
+            }
+            return result;
+        }
+        return input;
+    }, zod_1.z.object({
+        status: zod_1.z.nativeEnum(constants_1.PAYMENT_STATUS).optional(),
+        orderId: zod_1.z.string().optional(),
+        sum: models_1.NumberFilter.optional(),
+        userEmail: zod_1.z.string().optional(),
+        createdAt: models_1.DateFilter.optional(),
+        userId: zod_1.z.string().optional(),
+        signupMethod: zod_1.z.nativeEnum(constants_1.SIGNUP_METHOD).optional(),
+        vkId: zod_1.z.string().optional(),
+        yandexId: zod_1.z.string().optional(),
+        sortBy: zod_1.z.nativeEnum(constants_1.PAYMENT_SORT_BY).optional(),
+        sortOrder: zod_1.z.nativeEnum(constants_1.SORT_ORDER).default(constants_1.SORT_ORDER.DESC).optional(),
+        limit: zod_1.z.coerce.number().min(1),
+        offset: zod_1.z.coerce.number().min(0).default(0),
+    }));
+    FindPaymentsByCriteriaCommand.ResponseSchema = zod_1.z.object({
+        data: zod_1.z.array(models_1.PaymentWithUserDataSchema),
+        page: zod_1.z.number(),
+        totalPages: zod_1.z.number(),
+    });
+})(FindPaymentsByCriteriaCommand || (exports.FindPaymentsByCriteriaCommand = FindPaymentsByCriteriaCommand = {}));

package/build/commands/payment/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./pay.command"), exports);
 __exportStar(require("./receipt.command"), exports);
 __exportStar(require("./recurrent.command"), exports);
 __exportStar(require("./refund-payment.command"), exports);
+__exportStar(require("./find-payments-by-criteria.command"), exports);

package/build/commands/user/get-user-payments.command.js

@@ -21,6 +21,8 @@ var GetUserPaymentsCommand;
     })
         .partial();
     GetUserPaymentsCommand.ResponseSchema = zod_1.default.object({
-        data: zod_1.default.array(models_1.PaymentWithDescriptionSchema),
+        data: zod_1.default.array(models_1.PaymentWithUserDataSchema),
+        page: zod_1.default.number(),
+        totalPages: zod_1.default.number(),
     });
 })(GetUserPaymentsCommand || (exports.GetUserPaymentsCommand = GetUserPaymentsCommand = {}));

package/build/models/payment.schema.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentWithDescriptionSchema = exports.PaymentSchema = void 0;
+exports.PaymentWithUserDataSchema = exports.PaymentSchema = void 0;
 const zod_1 = require("zod");
+const constants_1 = require("../constants");
 exports.PaymentSchema = zod_1.z.object({
     uuid: zod_1.z.string().uuid(),
-    link: zod_1.z.nullable(zod_1.z.string()),
     status: zod_1.z.string(),
     sum: zod_1.z.number(),
     orderId: zod_1.z.string().uuid(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
 });
-exports.PaymentWithDescriptionSchema = exports.PaymentSchema.extend({
+exports.PaymentWithUserDataSchema = exports.PaymentSchema.extend({
     description: zod_1.z.string(),
+    userId: zod_1.z.string().uuid(),
+    email: zod_1.z.string().email(),
+    singupMethod: zod_1.z.nativeEnum(constants_1.SIGNUP_METHOD),
+    vkId: zod_1.z.string().nullable(),
+    yandexId: zod_1.z.string().nullable(),
 });

package/commands/payment/find-payments-by-criteria.command.ts

@@ -0,0 +1,63 @@
+import { z } from 'zod';
+import { DateFilter, NumberFilter, PaymentWithUserDataSchema } from '../../models';
+import { PAYMENT_SORT_BY, PAYMENT_STATUS, SIGNUP_METHOD, SORT_ORDER } from '../../constants';
+
+export namespace FindPaymentsByCriteriaCommand {
+    export const RequestSchema = z.preprocess(
+        (input) => {
+            if (input && typeof input === 'object' && !Array.isArray(input)) {
+                const obj = { ...input } as Record<string, any>;
+                const onlyNormalize = ['createdAt', 'sum'];
+
+                const relevantBracketed = Object.keys(obj).some((key) => {
+                    const match = key.match(/^(\w+)\[(\w+)\]$/);
+                    return match && onlyNormalize.includes(match[1]);
+                });
+
+                if (!relevantBracketed) {
+                    return obj;
+                }
+
+                const result = { ...obj };
+                for (const key of Object.keys(obj)) {
+                    const match = key.match(/^(\w+)\[(\w+)\]$/);
+                    if (match && onlyNormalize.includes(match[1])) {
+                        const [, outer, inner] = match;
+                        result[outer] = result[outer] || {};
+                        result[outer][inner] = obj[key];
+                        delete result[key];
+                    }
+                }
+                return result;
+            }
+            return input;
+        },
+        z.object({
+            status: z.nativeEnum(PAYMENT_STATUS).optional(),
+            orderId: z.string().optional(),
+            sum: NumberFilter.optional(),
+            userEmail: z.string().optional(),
+            createdAt: DateFilter.optional(),
+            userId: z.string().optional(),
+            signupMethod: z.nativeEnum(SIGNUP_METHOD).optional(),
+            vkId: z.string().optional(),
+            yandexId: z.string().optional(),
+
+            sortBy: z.nativeEnum(PAYMENT_SORT_BY).optional(),
+            sortOrder: z.nativeEnum(SORT_ORDER).default(SORT_ORDER.DESC).optional(),
+
+            limit: z.coerce.number().min(1),
+            offset: z.coerce.number().min(0).default(0),
+        }),
+    );
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.array(PaymentWithUserDataSchema),
+        page: z.number(),
+        totalPages: z.number(),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/payment/index.ts

@@ -4,3 +4,4 @@ export * from './pay.command';
 export * from './receipt.command';
 export * from './recurrent.command';
 export * from './refund-payment.command';
+export * from './find-payments-by-criteria.command';

package/commands/user/get-user-payments.command.ts

@@ -1,6 +1,6 @@
 import z from 'zod';
 import { PAYMENT_SORT_BY, PAYMENT_STATUS, SORT_ORDER } from '../../constants';
-import { PaymentWithDescriptionSchema } from '../../models';
+import { PaymentWithUserDataSchema } from '../../models';
 
 export namespace GetUserPaymentsCommand {
     export const RequestParamSchema = z.object({
@@ -20,7 +20,9 @@ export namespace GetUserPaymentsCommand {
         .partial();
 
     export const ResponseSchema = z.object({
-        data: z.array(PaymentWithDescriptionSchema),
+        data: z.array(PaymentWithUserDataSchema),
+        page: z.number(),
+        totalPages: z.number(),
     });
 
     export type Response = z.infer<typeof ResponseSchema>;

package/models/payment.schema.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
+import { SIGNUP_METHOD } from '../constants';
 
 export const PaymentSchema = z.object({
     uuid: z.string().uuid(),
-    link: z.nullable(z.string()),
     status: z.string(),
     sum: z.number(),
     orderId: z.string().uuid(),
@@ -11,6 +11,11 @@ export const PaymentSchema = z.object({
     updatedAt: z.date(),
 });
 
-export const PaymentWithDescriptionSchema = PaymentSchema.extend({
+export const PaymentWithUserDataSchema = PaymentSchema.extend({
     description: z.string(),
+    userId: z.string().uuid(),
+    email: z.string().email(),
+    singupMethod: z.nativeEnum(SIGNUP_METHOD),
+    vkId: z.string().nullable(),
+    yandexId: z.string().nullable(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot",
-  "version": "0.8.98",
+  "version": "0.8.99",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",