feat: enhance user management with bulk operations and error handling

- Added new bulk operations for user management, including bulk delete, revoke subscriptions, reset traffic, and update users.
- Introduced error handling constants for bulk operations to improve error reporting.
- Updated UsersService to incorporate new bulk operations and handle user inbounds more effectively.
- Enhanced API routes and commands to support the new bulk functionalities.
- Bumped version to 0.3.45 in package.json for the contract library.

Author: kastov

Dockerfile

@@ -42,7 +42,8 @@ COPY docker-entrypoint.sh ./
 RUN npm ci --omit=dev --legacy-peer-deps \
     && npm run migrate:generate \
     && npm cache clean --force \
-    && npm install pm2 -g
+    && npm install pm2 -g \
+    && npm link
 
 # CMD [ "npm", "run", "migrate:deploy", "&&", "pm2-runtime", "start", "ecosystem.config.js", "--env", "production" ]
 

DockerfileDev

@@ -38,6 +38,7 @@ COPY docker-entrypoint.sh ./
 RUN npm ci --omit=dev --legacy-peer-deps \
     && npm run migrate:generate \
     && npm cache clean --force \
-    && npm install pm2 -g
+    && npm install pm2 -g \
+    && npm link
 
 CMD [ "/bin/sh", "docker-entrypoint.sh" ]

libs/contract/api/controllers/users.ts

@@ -15,6 +15,15 @@ export const USERS_ROUTES = {
     RESET_USER_TRAFFIC: 'reset-traffic',
     BULK: {
         DELETE_BY_STATUS: 'bulk/delete-by-status',
+        UPDATE: 'bulk/update',
+        RESET_TRAFFIC: 'bulk/reset-traffic',
+        REVOKE_SUBSCRIPTION: 'bulk/revoke-subscription',
+        DELETE: 'bulk/delete',
+        UPDATE_INBOUNDS: 'bulk/update-inbounds',
+        ALL: {
+            UPDATE: 'bulk/all/update',
+            RESET_TRAFFIC: 'bulk/all/reset-traffic',
+        },
     },
     GET_BY_TELEGRAM_ID: 'tg',
     GET_BY_EMAIL: 'email',

libs/contract/api/routes.ts

@@ -79,6 +79,15 @@ export const REST_API = {
             `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.RESET_USER_TRAFFIC}/${uuid}`,
         BULK: {
             DELETE_BY_STATUS: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.DELETE_BY_STATUS}`,
+            UPDATE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.UPDATE}`,
+            RESET_TRAFFIC: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.RESET_TRAFFIC}`,
+            REVOKE_SUBSCRIPTION: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.REVOKE_SUBSCRIPTION}`,
+            DELETE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.DELETE}`,
+            UPDATE_INBOUNDS: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.UPDATE_INBOUNDS}`,
+            ALL: {
+                UPDATE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.ALL.UPDATE}`,
+                RESET_TRAFFIC: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.ALL.RESET_TRAFFIC}`,
+            },
         },
         GET_BY_TELEGRAM_ID: (telegramId: string) =>
             `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.GET_BY_TELEGRAM_ID}/${telegramId}`,

libs/contract/commands/auth/register.command.ts

@@ -12,7 +12,7 @@ export namespace RegisterCommand {
             .min(24, 'Password must contain at least 24 characters')
             .regex(
                 /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{24,}$/,
-                'Password must contain uppercase and lowercase letters and numbers',
+                'Password must contain uppercase and lowercase letters and numbers, and be at least 24 characters long.',
             ),
     });
 

libs/contract/commands/users/bulk-all/bulk-all-reset-traffic-users.command.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+import { REST_API } from '../../../api';
+
+export namespace BulkAllResetTrafficUsersCommand {
+    export const url = REST_API.USERS.BULK.ALL.RESET_TRAFFIC;
+    export const TSQ_url = url;
+
+    export const ResponseSchema = z.object({
+        response: z.object({
+            eventSent: z.boolean(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

libs/contract/commands/users/bulk-all/bulk-all-update-users.command.ts

@@ -0,0 +1,53 @@
+import { z } from 'zod';
+
+import { RESET_PERIODS } from '../../../constants';
+import { UsersSchema } from '../../../models';
+import { REST_API } from '../../../api';
+
+export namespace BulkAllUpdateUsersCommand {
+    export const url = REST_API.USERS.BULK.ALL.UPDATE;
+    export const TSQ_url = url;
+
+    export const RequestSchema = z.object({
+        status: UsersSchema.shape.status.optional(),
+        trafficLimitBytes: z.optional(
+            z
+                .number({
+                    invalid_type_error: 'Traffic limit must be a number',
+                })
+                .int('Traffic limit must be an integer')
+                .min(0, 'Traffic limit must be greater than 0')
+                .describe('Traffic limit in bytes. 0 - unlimited'),
+        ),
+        trafficLimitStrategy: z.optional(
+            z
+                .nativeEnum(RESET_PERIODS, {
+                    description: 'Available reset periods',
+                })
+                .describe('Traffic limit reset strategy'),
+        ),
+        expireAt: z.optional(
+            z
+                .string()
+                .datetime({ local: true, offset: true, message: 'Invalid date format' })
+                .transform((str) => new Date(str))
+                .refine((date) => date > new Date(), {
+                    message: 'Expiration date cannot be in the past',
+                })
+                .describe('Expiration date: 2025-01-17T15:38:45.065Z'),
+        ),
+        description: z.optional(z.string().nullable()),
+        telegramId: z.optional(z.number().nullable()),
+        email: z.optional(z.string().email('Invalid email format').nullable()),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        response: z.object({
+            eventSent: z.boolean(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

libs/contract/commands/users/bulk-all/index.ts

@@ -0,0 +1,2 @@
+export * from './bulk-all-reset-traffic-users.command';
+export * from './bulk-all-update-users.command';

libs/contract/commands/users/bulk/bulk-delete-users.command.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+
+import { REST_API } from '../../../api';
+
+export namespace BulkDeleteUsersCommand {
+    export const url = REST_API.USERS.BULK.DELETE;
+    export const TSQ_url = url;
+
+    export const RequestSchema = z.object({
+        uuids: z.array(z.string().uuid()),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        response: z.object({
+            affectedRows: z.number(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

libs/contract/commands/users/bulk/bulk-reset-traffic-users.command.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+
+import { REST_API } from '../../../api';
+
+export namespace BulkResetTrafficUsersCommand {
+    export const url = REST_API.USERS.BULK.RESET_TRAFFIC;
+    export const TSQ_url = url;
+
+    export const RequestSchema = z.object({
+        uuids: z.array(z.string().uuid()),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        response: z.object({
+            affectedRows: z.number(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}