@purpleschool/gptbot 0.12.60 → 0.12.62

package/api/controllers/http/webmaster.ts

@@ -7,4 +7,5 @@ export const WEBMASTER_ROUTES = {
     CREATE_WITHDRAWAL_REQUEST: 'withdraw',
     CONFIRM_WITHDRAWAL: (uuid: string) => `withdraw/${uuid}`,
     UPDATE: (uuid: string) => `${uuid}`,
+    ADMIN_UPDATE: (uuid: string) => `admin/${uuid}`,
 } as const;

package/api/routes.ts

@@ -415,6 +415,8 @@ export const REST_API = {
         CREATE_WITHDRAWAL_REQUEST: `${ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.CREATE_WITHDRAWAL_REQUEST}`,
         UPDATE: (uuid: string) =>
             `${ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.UPDATE(uuid)}`,
+        ADMIN_UPDATE: (uuid: string) =>
+            `${ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.ADMIN_UPDATE(uuid)}`,
         CONFIRM_WITHDRAWAL: (uuid: string) =>
             `${ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.CONFIRM_WITHDRAWAL(uuid)}`,
     },

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

@@ -9,4 +9,5 @@ exports.WEBMASTER_ROUTES = {
     CREATE_WITHDRAWAL_REQUEST: 'withdraw',
     CONFIRM_WITHDRAWAL: (uuid) => `withdraw/${uuid}`,
     UPDATE: (uuid) => `${uuid}`,
+    ADMIN_UPDATE: (uuid) => `admin/${uuid}`,
 };

package/build/api/routes.js

@@ -361,6 +361,7 @@ exports.REST_API = {
         CREATE: `${exports.ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.CREATE}`,
         CREATE_WITHDRAWAL_REQUEST: `${exports.ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.CREATE_WITHDRAWAL_REQUEST}`,
         UPDATE: (uuid) => `${exports.ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.UPDATE(uuid)}`,
+        ADMIN_UPDATE: (uuid) => `${exports.ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.ADMIN_UPDATE(uuid)}`,
         CONFIRM_WITHDRAWAL: (uuid) => `${exports.ROOT}/${CONTROLLERS.WEBMASTER_CONTROLLER_PRIVATE}/${CONTROLLERS.WEBMASTER_ROUTES.CONFIRM_WITHDRAWAL(uuid)}`,
     },
     TOOL: {

package/build/commands/team-account/find-team-accounts-by-name.command.js

@@ -8,6 +8,8 @@ var FindTeamAccountsByNameCommand;
 (function (FindTeamAccountsByNameCommand) {
     FindTeamAccountsByNameCommand.RequestSchema = zod_1.z.object({
         name: zod_1.z.string().trim().min(1).optional(),
+        creatorEmail: zod_1.z.string().trim().min(1).optional(),
+        hasPaidSubscription: zod_1.z.boolean().optional(),
         limit: zod_1.z.coerce.number().int().min(1).max(100).default(20).optional(),
         offset: zod_1.z.coerce.number().int().min(0).default(0).optional(),
         sortBy: zod_1.z

package/build/commands/webmaster/update-webmaster.command.js

@@ -1,13 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpdateWebmasterCommand = void 0;
+exports.AdminUpdateWebmasterCommand = exports.UpdateWebmasterCommand = void 0;
 const zod_1 = require("zod");
 const models_1 = require("../../models");
 var UpdateWebmasterCommand;
 (function (UpdateWebmasterCommand) {
     UpdateWebmasterCommand.RequestParamSchema = models_1.WebmasterSchema.pick({ uuid: true });
-    UpdateWebmasterCommand.RequestSchema = models_1.WebmasterSchema.partial();
+    UpdateWebmasterCommand.RequestSchema = models_1.WebmasterSchema.pick({
+        organization: true,
+        organizationType: true,
+        tin: true,
+        alias: true,
+    }).partial();
     UpdateWebmasterCommand.ResponseSchema = zod_1.z.object({
         data: models_1.WebmasterSchema,
     });
 })(UpdateWebmasterCommand || (exports.UpdateWebmasterCommand = UpdateWebmasterCommand = {}));
+var AdminUpdateWebmasterCommand;
+(function (AdminUpdateWebmasterCommand) {
+    AdminUpdateWebmasterCommand.RequestParamSchema = models_1.WebmasterSchema.pick({ uuid: true });
+    AdminUpdateWebmasterCommand.RequestSchema = models_1.WebmasterSchema.pick({
+        organization: true,
+        organizationType: true,
+        tin: true,
+        alias: true,
+        isPremium: true,
+    }).partial();
+    AdminUpdateWebmasterCommand.ResponseSchema = zod_1.z.object({
+        data: models_1.WebmasterSchema,
+    });
+})(AdminUpdateWebmasterCommand || (exports.AdminUpdateWebmasterCommand = AdminUpdateWebmasterCommand = {}));

package/build/models/webmaster.schema.js

@@ -13,6 +13,7 @@ exports.WebmasterSchema = zod_1.default.object({
     organizationType: zod_1.default.nativeEnum(webmaster_1.ORGANIZATION_TYPE),
     tin: zod_1.default.string().regex(/^\d{10}$|^\d{12}$/, 'ИНН должен быть длинной в 10 или 12 цифр'),
     alias: zod_1.default.string(),
+    isPremium: zod_1.default.boolean(),
     createdAt: zod_1.default.date(),
     updatedAt: zod_1.default.date(),
 });

package/commands/team-account/find-team-accounts-by-name.command.ts

@@ -5,6 +5,8 @@ import { SORT_ORDER, TEAM_ACCOUNT_ADMIN_SORT_BY } from '../../constants';
 export namespace FindTeamAccountsByNameCommand {
     export const RequestSchema = z.object({
         name: z.string().trim().min(1).optional(),
+        creatorEmail: z.string().trim().min(1).optional(),
+        hasPaidSubscription: z.boolean().optional(),
         limit: z.coerce.number().int().min(1).max(100).default(20).optional(),
         offset: z.coerce.number().int().min(0).default(0).optional(),
         sortBy: z

package/commands/webmaster/update-webmaster.command.ts

@@ -6,7 +6,34 @@ export namespace UpdateWebmasterCommand {
 
     export type RequestParam = z.infer<typeof RequestParamSchema>;
 
-    export const RequestSchema = WebmasterSchema.partial();
+    export const RequestSchema = WebmasterSchema.pick({
+        organization: true,
+        organizationType: true,
+        tin: true,
+        alias: true,
+    }).partial();
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: WebmasterSchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}
+
+export namespace AdminUpdateWebmasterCommand {
+    export const RequestParamSchema = WebmasterSchema.pick({ uuid: true });
+
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const RequestSchema = WebmasterSchema.pick({
+        organization: true,
+        organizationType: true,
+        tin: true,
+        alias: true,
+        isPremium: true,
+    }).partial();
 
     export type Request = z.infer<typeof RequestSchema>;
 

package/helpers/image-generation/calculate-gpt-image-2-price-with-margin.helper.ts

@@ -52,10 +52,7 @@ export function estimateGptImage2OutputCostUsdFromTokens(params: {
     return (outputTokens / 1_000_000) * outputPricePer1MUsd;
 }
 
-export function applyTargetMargin(params: {
-    cost: number;
-    targetMargin?: number;
-}): number {
+export function applyTargetMargin(params: { cost: number; targetMargin?: number }): number {
     const { cost, targetMargin = DEFAULT_TARGET_MARGIN } = params;
     if (targetMargin < 0 || targetMargin >= 1) {
         throw new Error(`targetMargin must be in [0, 1), got ${targetMargin}`);
@@ -64,10 +61,7 @@ export function applyTargetMargin(params: {
     return cost / (1 - targetMargin);
 }
 
-export function convertUsdToStarsCeil(params: {
-    usd: number;
-    starPriceUsd?: number;
-}): number {
+export function convertUsdToStarsCeil(params: { usd: number; starPriceUsd?: number }): number {
     const { usd, starPriceUsd = DEFAULT_STAR_PRICE_USD } = params;
     if (starPriceUsd <= 0) {
         throw new Error(`starPriceUsd must be > 0, got ${starPriceUsd}`);

package/models/webmaster.schema.ts

@@ -8,6 +8,7 @@ export const WebmasterSchema = z.object({
     organizationType: z.nativeEnum(ORGANIZATION_TYPE),
     tin: z.string().regex(/^\d{10}$|^\d{12}$/, 'ИНН должен быть длинной в 10 или 12 цифр'),
     alias: z.string(),
+    isPremium: z.boolean(),
 
     createdAt: z.date(),
     updatedAt: z.date(),

package/package.json

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