feat: add bulk extend expiration date functionality for users

kastov · kastov · commit 3176b56c4575 · 2025-11-29T23:01:02.000+03:00
- Introduced commands and routes for bulk extending users expiration dates.
- Updated user repository methods to handle bulk operations efficiently.
diff --git a/libs/contract/api/controllers/users.ts b/libs/contract/api/controllers/users.ts
@@ -33,9 +33,11 @@ export const USERS_ROUTES = {
         REVOKE_SUBSCRIPTION: 'bulk/revoke-subscription',
         DELETE: 'bulk/delete',
         UPDATE_SQUADS: 'bulk/update-squads',
+        EXTEND_EXPIRATION_DATE: 'bulk/extend-expiration-date',
         ALL: {
             UPDATE: 'bulk/all/update',
             RESET_TRAFFIC: 'bulk/all/reset-traffic',
+            EXTEND_EXPIRATION_DATE: 'bulk/all/extend-expiration-date',
         },
     },
 
diff --git a/libs/contract/api/routes.ts b/libs/contract/api/routes.ts
@@ -156,9 +156,11 @@ export const REST_API = {
             REVOKE_SUBSCRIPTION: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.REVOKE_SUBSCRIPTION}`,
             DELETE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.DELETE}`,
             UPDATE_SQUADS: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.UPDATE_SQUADS}`,
+            EXTEND_EXPIRATION_DATE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.EXTEND_EXPIRATION_DATE}`,
             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}`,
+                EXTEND_EXPIRATION_DATE: `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.BULK.ALL.EXTEND_EXPIRATION_DATE}`,
             },
         },
         STATS: {
diff --git a/libs/contract/commands/users/bulk-all/bulk-all-extend-expiration-date.command.ts b/libs/contract/commands/users/bulk-all/bulk-all-extend-expiration-date.command.ts
@@ -0,0 +1,29 @@
+import { z } from 'zod';
+
+import { getEndpointDetails } from '../../../constants';
+import { REST_API, USERS_ROUTES } from '../../../api';
+
+export namespace BulkAllExtendExpirationDateCommand {
+    export const url = REST_API.USERS.BULK.ALL.EXTEND_EXPIRATION_DATE;
+    export const TSQ_url = url;
+
+    export const endpointDetails = getEndpointDetails(
+        USERS_ROUTES.BULK.ALL.EXTEND_EXPIRATION_DATE,
+        'post',
+        'Extend expiration date for all users by days',
+    );
+
+    export const RequestSchema = z.object({
+        extendDays: z.number().int().min(1, 'Extend days must be greater than 0'),
+    });
+
+    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>;
+}
diff --git a/libs/contract/commands/users/bulk-all/index.ts b/libs/contract/commands/users/bulk-all/index.ts
@@ -1,2 +1,3 @@
+export * from './bulk-all-extend-expiration-date.command';
 export * from './bulk-all-reset-traffic-users.command';
 export * from './bulk-all-update-users.command';
diff --git a/libs/contract/commands/users/bulk/bulk-delete-users.command.ts b/libs/contract/commands/users/bulk/bulk-delete-users.command.ts
@@ -14,7 +14,10 @@ export namespace BulkDeleteUsersCommand {
     );
 
     export const RequestSchema = z.object({
-        uuids: z.array(z.string().uuid()),
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
diff --git a/libs/contract/commands/users/bulk/bulk-extend-expiration-date.command.ts b/libs/contract/commands/users/bulk/bulk-extend-expiration-date.command.ts
@@ -0,0 +1,38 @@
+import { z } from 'zod';
+
+import { getEndpointDetails } from '../../../constants';
+import { REST_API, USERS_ROUTES } from '../../../api';
+
+export namespace BulkExtendExpirationDateCommand {
+    export const url = REST_API.USERS.BULK.EXTEND_EXPIRATION_DATE;
+    export const TSQ_url = url;
+
+    export const endpointDetails = getEndpointDetails(
+        USERS_ROUTES.BULK.EXTEND_EXPIRATION_DATE,
+        'post',
+        'Extend expiration date for specified users by days',
+    );
+
+    export const RequestSchema = z.object({
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
+
+        extendDays: z
+            .number()
+            .int()
+            .min(1, 'Extend days must be greater than 0')
+            .max(9999, 'Maximum 9999 days'),
+    });
+
+    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>;
+}
diff --git a/libs/contract/commands/users/bulk/bulk-reset-traffic-users.command.ts b/libs/contract/commands/users/bulk/bulk-reset-traffic-users.command.ts
@@ -14,7 +14,10 @@ export namespace BulkResetTrafficUsersCommand {
     );
 
     export const RequestSchema = z.object({
-        uuids: z.array(z.string().uuid()),
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
diff --git a/libs/contract/commands/users/bulk/bulk-revoke-users-subscription.command.ts b/libs/contract/commands/users/bulk/bulk-revoke-users-subscription.command.ts
@@ -14,7 +14,10 @@ export namespace BulkRevokeUsersSubscriptionCommand {
     );
 
     export const RequestSchema = z.object({
-        uuids: z.array(z.string().uuid()),
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
diff --git a/libs/contract/commands/users/bulk/bulk-update-users-squads.command.ts b/libs/contract/commands/users/bulk/bulk-update-users-squads.command.ts
@@ -14,7 +14,10 @@ export namespace BulkUpdateUsersSquadsCommand {
     );
 
     export const RequestSchema = z.object({
-        uuids: z.array(z.string().uuid()),
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
         activeInternalSquads: z.array(z.string().uuid(), {
             invalid_type_error: 'Enabled internal squads must be an array of UUIDs',
         }),
diff --git a/libs/contract/commands/users/bulk/bulk-update-users.command.ts b/libs/contract/commands/users/bulk/bulk-update-users.command.ts
@@ -16,7 +16,10 @@ export namespace BulkUpdateUsersCommand {
     );
 
     export const RequestSchema = z.object({
-        uuids: z.array(z.string().uuid()),
+        uuids: z
+            .array(z.string().uuid())
+            .min(1, 'Must be at least 1 user UUID')
+            .max(500, 'Maximum 500 user UUIDs'),
         fields: z.object({
             status: UsersSchema.shape.status.optional(),
             trafficLimitBytes: z.optional(
diff --git a/libs/contract/commands/users/bulk/index.ts b/libs/contract/commands/users/bulk/index.ts
@@ -1,5 +1,6 @@
 export * from './bulk-delete-users-by-status.command';
 export * from './bulk-delete-users.command';
+export * from './bulk-extend-expiration-date.command';
 export * from './bulk-reset-traffic-users.command';
 export * from './bulk-revoke-users-subscription.command';
 export * from './bulk-update-users-squads.command';
diff --git a/libs/contract/constants/errors/errors.ts b/libs/contract/constants/errors/errors.ts
@@ -1029,4 +1029,9 @@ export const ERRORS = {
         message: 'HWID device not found',
         httpCode: 404,
     },
+    BULK_EXTEND_EXPIRATION_DATE_ERROR: {
+        code: 'A205',
+        message: 'Bulk extend expiration date error',
+        httpCode: 500,
+    },
 } as const;
diff --git a/libs/contract/package.json b/libs/contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.3.29",
+  "version": "2.3.31",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",
diff --git a/prisma/migrations/20251129171418_change_status/migration.sql b/prisma/migrations/20251129171418_change_status/migration.sql
@@ -0,0 +1,17 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `status` on the `users` table. The data in that column could be lost. The data in that column will be cast from `Text` to `VarChar(10)`.
+
+*/
+-- DropIndex
+DROP INDEX "users_created_at_idx";
+
+-- DropIndex
+DROP INDEX "users_status_idx";
+
+-- DropIndex
+DROP INDEX "users_tag_idx";
+
+-- AlterTable
+ALTER TABLE "users" ALTER COLUMN "status" SET DATA TYPE VARCHAR(10);
diff --git a/prisma/migrations/20251129171707_change_pk/migration.sql b/prisma/migrations/20251129171707_change_pk/migration.sql
@@ -0,0 +1,46 @@
+-- 1. Drop ALL FK
+-- DropForeignKey
+ALTER TABLE "hwid_user_devices" DROP CONSTRAINT "hwid_user_devices_user_uuid_fkey";
+
+-- DropForeignKey
+ALTER TABLE "internal_squad_members" DROP CONSTRAINT "internal_squad_members_user_uuid_fkey";
+
+-- DropForeignKey
+ALTER TABLE "nodes_user_usage_history" DROP CONSTRAINT "nodes_user_usage_history_user_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "user_subscription_request_history" DROP CONSTRAINT "user_subscription_request_history_user_uuid_fkey";
+
+-- DropForeignKey
+ALTER TABLE "user_traffic" DROP CONSTRAINT "user_traffic_t_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "user_traffic_history" DROP CONSTRAINT "user_traffic_history_user_uuid_fkey";
+
+-- 2. Drop unique index on t_id  
+DROP INDEX "users_t_id_key";
+
+-- 3. Change PK
+ALTER TABLE "users" DROP CONSTRAINT "users_pkey";
+ALTER TABLE "users" ADD CONSTRAINT "users_pkey" PRIMARY KEY ("t_id");
+
+-- 4. Create unique index on uuid
+CREATE UNIQUE INDEX "users_uuid_key" ON "users"("uuid");
+
+-- AddForeignKey
+ALTER TABLE "user_traffic" ADD CONSTRAINT "user_traffic_t_id_fkey" FOREIGN KEY ("t_id") REFERENCES "users"("t_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "nodes_user_usage_history" ADD CONSTRAINT "nodes_user_usage_history_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("t_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "user_traffic_history" ADD CONSTRAINT "user_traffic_history_user_uuid_fkey" FOREIGN KEY ("user_uuid") REFERENCES "users"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "hwid_user_devices" ADD CONSTRAINT "hwid_user_devices_user_uuid_fkey" FOREIGN KEY ("user_uuid") REFERENCES "users"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "internal_squad_members" ADD CONSTRAINT "internal_squad_members_user_uuid_fkey" FOREIGN KEY ("user_uuid") REFERENCES "users"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "user_subscription_request_history" ADD CONSTRAINT "user_subscription_request_history_user_uuid_fkey" FOREIGN KEY ("user_uuid") REFERENCES "users"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20251129180538_stricter_host_columns/migration.sql b/prisma/migrations/20251129180538_stricter_host_columns/migration.sql
@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `remark` on the `hosts` table. The data in that column could be lost. The data in that column will be cast from `Text` to `VarChar(50)`.
+  - You are about to alter the column `server_description` on the `hosts` table. The data in that column could be lost. The data in that column will be cast from `Text` to `VarChar(30)`.
+
+*/
+-- AlterTable
+ALTER TABLE "hosts" 
+    ALTER COLUMN "remark" SET DATA TYPE VARCHAR(50) USING LEFT("remark", 50),
+    ALTER COLUMN "server_description" SET DATA TYPE VARCHAR(30) USING LEFT("server_description", 30);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -15,7 +15,7 @@ generator kysely {
   camelCase          = true
   bigIntTypeOverride = "bigint"
   jsonTypeOverride   = "object"
-  enumFileName       = "kyselyEnums"
+  enumFileName       = "kyselyEnums.ts"
 }
 
 generator json {
@@ -47,12 +47,12 @@ model RemnawaveSettings {
 }
 
 model Users {
-  uuid                   String    @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  tId                    BigInt    @unique @default(autoincrement()) @map("t_id")
+  tId                    BigInt    @id @default(autoincrement()) @map("t_id")
+  uuid                   String    @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   shortUuid              String    @unique @map("short_uuid")
   username               String    @unique @map("username")
   /// @kyselyType('ACTIVE' | 'DISABLED' | 'LIMITED' | 'EXPIRED')
-  status                 String    @default("ACTIVE") @map("status")
+  status                 String    @default("ACTIVE") @map("status") @db.VarChar(10)
   trafficLimitBytes      BigInt    @default(0) @map("traffic_limit_bytes")
   /// @kyselyType('NO_RESET' | 'DAY' | 'WEEK' | 'MONTH')
   trafficLimitStrategy   String    @default("NO_RESET") @map("traffic_limit_strategy")
@@ -84,9 +84,6 @@ model Users {
 
   externalSquad ExternalSquads? @relation(fields: [externalSquadUuid], references: [uuid], onDelete: SetNull)
 
-  @@index([tag])
-  @@index([status], type: Hash)
-  @@index([createdAt(sort: Asc)])
   @@map("users")
 }
 
@@ -283,7 +280,7 @@ model UserTrafficHistory {
 model Hosts {
   uuid                 String  @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   viewPosition         Int     @default(autoincrement()) @map("view_position")
-  remark               String  @map("remark")
+  remark               String  @map("remark") @db.VarChar(50)
   address              String  @map("address")
   port                 Int     @map("port")
   path                 String? @map("path")
@@ -296,7 +293,7 @@ model Hosts {
   muxParams            Json?   @map("mux_params")
   sockoptParams        Json?   @map("sockopt_params")
   isDisabled           Boolean @default(false) @map("is_disabled")
-  serverDescription    String? @map("server_description")
+  serverDescription    String? @map("server_description") @db.VarChar(30)
   vlessRouteId         Int?    @map("vless_route_id")
   allowInsecure        Boolean @default(false) @map("allow_insecure")
   shuffleHost          Boolean @default(false) @map("shuffle_host")
diff --git a/src/modules/users/commands/update-expired-users/update-expired-users.handler.ts b/src/modules/users/commands/update-expired-users/update-expired-users.handler.ts
@@ -11,9 +11,10 @@ import { UpdateExpiredUsersCommand } from './update-expired-users.command';
 import { UsersRepository } from '../../repositories/users.repository';
 
 @CommandHandler(UpdateExpiredUsersCommand)
-export class UpdateExpiredUsersHandler
-    implements ICommandHandler<UpdateExpiredUsersCommand, ICommandResponse<{ tId: bigint }[]>>
-{
+export class UpdateExpiredUsersHandler implements ICommandHandler<
+    UpdateExpiredUsersCommand,
+    ICommandResponse<{ tId: bigint }[]>
+> {
     public readonly logger = new Logger(UpdateExpiredUsersHandler.name);
 
     constructor(private readonly usersRepository: UsersRepository) {}
diff --git a/src/modules/users/controllers/users-bulk-actions.controller.ts b/src/modules/users/controllers/users-bulk-actions.controller.ts
diff --git a/src/modules/users/dtos/bulk/bulk-operations.dto.ts b/src/modules/users/dtos/bulk/bulk-operations.dto.ts
diff --git a/src/modules/users/repositories/users.repository.ts b/src/modules/users/repositories/users.repository.ts
diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+export * from './bulk-all-extend-expiration-date.command';`
`1`	`2`	`export * from './bulk-all-reset-traffic-users.command';`
`2`	`3`	`export * from './bulk-all-update-users.command';`