refactor: update Dockerfile and Prisma schema for improved structure and consistency

- Updated Prisma schema to replace uuid fields with id fields of type BigInt.
- Refactored repository interfaces to use ICrudWithId for better clarity in CRUD operations.
- Removed deprecated methods for UUID handling in repositories, enhancing code maintainability.

Author: kastov

Dockerfile

@@ -1,36 +1,35 @@
-FROM node:22 AS build
-WORKDIR /opt/app
+FROM alpine:3.19 AS frontend
+WORKDIR /opt/frontend
 
-RUN apt-get update \
-    && apt-get install -y curl unzip \
+RUN apk add --no-cache curl unzip ca-certificates \
     && curl -L https://github.com/remnawave/frontend/releases/latest/download/remnawave-frontend.zip -o frontend.zip \
-    && unzip frontend.zip -d frontend_temp \
-    && mkdir frontend \
-    && cp -r frontend_temp/dist/* frontend/ \
-    && rm -rf frontend_temp frontend.zip \
-    && apt-get purge -y curl unzip \
-    && apt-get autoremove -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && unzip frontend.zip -d frontend_temp
+
+FROM node:22 AS backend-build
+WORKDIR /opt/app
 
 COPY package*.json ./
 COPY prisma ./prisma
 
-RUN npm ci --legacy-peer-deps
+RUN npm ci
 
 COPY . .
 
-RUN npm run migrate:generate
 RUN npm run build
-RUN npm run build:seed
+
+RUN npm run migrate:generate
+
+RUN npm cache clean --force 
+
+RUN npm prune --omit=dev
 
 FROM node:22
 WORKDIR /opt/app
 
-COPY --from=build /opt/app/dist ./dist
-COPY --from=build /opt/app/frontend ./frontend
-COPY --from=build /opt/app/prisma/schema.prisma ./prisma/
-COPY --from=build /opt/app/prisma/migrations ./prisma/migrations
+COPY --from=backend-build /opt/app/dist ./dist
+COPY --from=frontend /opt/frontend/frontend_temp/dist ./frontend
+COPY --from=backend-build /opt/app/prisma ./prisma
+COPY --from=backend-build /opt/app/node_modules ./node_modules
 
 COPY configs /var/lib/remnawave/configs
 COPY package*.json ./
@@ -39,12 +38,7 @@ COPY libs ./libs
 COPY ecosystem.config.js ./
 COPY docker-entrypoint.sh ./
 
-RUN npm ci --omit=dev --legacy-peer-deps \
-    && npm run migrate:generate \
-    && npm cache clean --force \
-    && npm install pm2 -g \
+RUN npm install pm2 -g \
     && npm link
 
-# CMD [ "npm", "run", "migrate:deploy", "&&", "pm2-runtime", "start", "ecosystem.config.js", "--env", "production" ]
-
 CMD [ "/bin/sh", "docker-entrypoint.sh" ]

prisma/migrations/20250404230114_replace_uuid_with_id_in_a_few_tables_drop_uuid_for_active_user_inbounds/migration.sql

@@ -0,0 +1,86 @@
+/*
+  Warnings:
+
+  - The primary key for the `active_user_inbounds` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `uuid` on the `active_user_inbounds` table. All the data in the column will be lost.
+  - The primary key for the `nodes_traffic_usage_history` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `uuid` on the `nodes_traffic_usage_history` table. All the data in the column will be lost.
+  - The primary key for the `nodes_usage_history` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `uuid` on the `nodes_usage_history` table. All the data in the column will be lost.
+  - The primary key for the `nodes_user_usage_history` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `uuid` on the `nodes_user_usage_history` table. All the data in the column will be lost.
+  - The primary key for the `user_traffic_history` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `uuid` on the `user_traffic_history` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "active_user_inbounds_user_uuid_inbound_uuid_key";
+
+-- DropIndex
+DROP INDEX "nodes_usage_history_node_uuid_created_at_key";
+
+-- DropIndex
+DROP INDEX "nodes_user_usage_history_node_uuid_user_uuid_created_at_key";
+
+-- AlterTable
+ALTER TABLE "active_user_inbounds" DROP CONSTRAINT "active_user_inbounds_pkey",
+DROP COLUMN "uuid",
+ADD CONSTRAINT "active_user_inbounds_pkey" PRIMARY KEY ("user_uuid", "inbound_uuid");
+
+-- AlterTable
+ALTER TABLE "admin" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "api_tokens" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "keygen" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "nodes" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "nodes_traffic_usage_history" DROP CONSTRAINT "nodes_traffic_usage_history_pkey",
+DROP COLUMN "uuid",
+ADD COLUMN     "id" BIGSERIAL NOT NULL,
+ALTER COLUMN "reset_at" SET DEFAULT now(),
+ADD CONSTRAINT "nodes_traffic_usage_history_pkey" PRIMARY KEY ("id");
+
+-- AlterTable
+ALTER TABLE "nodes_usage_history" DROP CONSTRAINT "nodes_usage_history_pkey",
+DROP COLUMN "uuid",
+ALTER COLUMN "created_at" SET DEFAULT date_trunc('hour', now()),
+ADD CONSTRAINT "nodes_usage_history_pkey" PRIMARY KEY ("node_uuid", "created_at");
+
+-- AlterTable
+ALTER TABLE "nodes_user_usage_history" DROP CONSTRAINT "nodes_user_usage_history_pkey",
+DROP COLUMN "uuid",
+ALTER COLUMN "created_at" SET DEFAULT date_trunc('hour', now()),
+ALTER COLUMN "updated_at" SET DEFAULT now(),
+ADD CONSTRAINT "nodes_user_usage_history_pkey" PRIMARY KEY ("node_uuid", "user_uuid", "created_at");
+
+-- AlterTable
+ALTER TABLE "subscription_settings" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "subscription_templates" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "user_traffic_history" DROP CONSTRAINT "user_traffic_history_pkey",
+DROP COLUMN "uuid",
+ADD COLUMN     "id" BIGSERIAL NOT NULL,
+ALTER COLUMN "reset_at" SET DEFAULT now(),
+ADD CONSTRAINT "user_traffic_history_pkey" PRIMARY KEY ("id");
+
+-- AlterTable
+ALTER TABLE "users" ALTER COLUMN "created_at" SET DEFAULT now(),
+ALTER COLUMN "updated_at" SET DEFAULT now();
+
+-- AlterTable
+ALTER TABLE "xray_config" ALTER COLUMN "updated_at" SET DEFAULT now();

prisma/schema.prisma

@@ -146,7 +146,7 @@ model NodeInboundExclusions {
 }
 
 model NodesTrafficUsageHistory {
-  uuid         String   @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  id           BigInt   @id @default(autoincrement())
   nodeUuid     String   @map("node_uuid") @db.Uuid
   trafficBytes BigInt   @map("traffic_bytes")
   resetAt      DateTime @default(dbgenerated("now()")) @map("reset_at")
@@ -157,7 +157,6 @@ model NodesTrafficUsageHistory {
 }
 
 model NodesUserUsageHistory {
-  uuid          String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   nodeUuid      String @map("node_uuid") @db.Uuid
   userUuid      String @map("user_uuid") @db.Uuid
   downloadBytes BigInt @map("download_bytes")
@@ -170,12 +169,11 @@ model NodesUserUsageHistory {
   node Nodes @relation(fields: [nodeUuid], references: [uuid], onDelete: Cascade)
   user Users @relation(fields: [userUuid], references: [uuid], onDelete: Cascade)
 
-  @@unique([nodeUuid, userUuid, createdAt])
+  @@id([nodeUuid, userUuid, createdAt])
   @@map("nodes_user_usage_history")
 }
 
 model NodesUsageHistory {
-  uuid          String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   nodeUuid      String @map("node_uuid") @db.Uuid
   downloadBytes BigInt @map("download_bytes")
   uploadBytes   BigInt @map("upload_bytes")
@@ -185,12 +183,12 @@ model NodesUsageHistory {
 
   node Nodes @relation(fields: [nodeUuid], references: [uuid], onDelete: Cascade)
 
-  @@unique([nodeUuid, createdAt])
+  @@id([nodeUuid, createdAt])
   @@map("nodes_usage_history")
 }
 
 model UserTrafficHistory {
-  uuid      String   @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  id        BigInt   @id @default(autoincrement())
   userUuid  String   @map("user_uuid") @db.Uuid
   usedBytes BigInt   @map("used_bytes")
   resetAt   DateTime @default(dbgenerated("now()")) @map("reset_at")
@@ -245,14 +243,13 @@ model Hosts {
 }
 
 model ActiveUserInbounds {
-  uuid        String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
   userUuid    String @map("user_uuid") @db.Uuid
   inboundUuid String @map("inbound_uuid") @db.Uuid
 
   user    Users    @relation(fields: [userUuid], references: [uuid], onDelete: Cascade)
   inbound Inbounds @relation(fields: [inboundUuid], references: [uuid], onDelete: Cascade)
 
-  @@unique([userUuid, inboundUuid])
+  @@id([userUuid, inboundUuid])
   @@map("active_user_inbounds")
 }
 

src/common/types/crud-port.ts

@@ -5,3 +5,16 @@ export interface ICrud<ENTITY> {
     findByUUID: (uuid: string) => Promise<ENTITY | null>;
     update: (entity: ENTITY) => Promise<ENTITY | null>;
 }
+
+export interface ICrudWithId<ENTITY> {
+    create: (entity: ENTITY) => Promise<ENTITY>;
+    deleteById: (id: bigint | number) => Promise<boolean>;
+    findByCriteria: (entity: Partial<ENTITY>) => Promise<ENTITY[]>;
+    findById: (id: bigint | number) => Promise<ENTITY | null>;
+    update: (entity: ENTITY) => Promise<ENTITY | null>;
+}
+
+export interface ICrudHistoricalRecords<ENTITY> {
+    create: (entity: ENTITY) => Promise<ENTITY>;
+    findByCriteria: (entity: Partial<ENTITY>) => Promise<ENTITY[]>;
+}

src/modules/inbounds/builders/remove-inbound-from-nodes/remove-inbound-from-nodes.builder.ts

@@ -5,7 +5,6 @@ export class RemoveInboundFromNodesBuilder {
 
     constructor(inboundUuid: string) {
         this.query = this.getQuery(inboundUuid);
-        return this;
     }
 
     public getQuery(inboundUuid: string): Prisma.Sql {

src/modules/inbounds/builders/remove-inbound-from-users/remove-inbound-from-users.builder.ts

@@ -9,10 +9,10 @@ export class RemoveInboundFromUsersBuilder {
     }
 
     public getQuery(inboundUuid: string): Prisma.Sql {
-        const query = `
+        const query = Prisma.sql`
 DELETE FROM "public"."active_user_inbounds"
-WHERE "inbound_uuid" = '${inboundUuid}';
+WHERE "inbound_uuid" = ${inboundUuid};
     `;
-        return Prisma.raw(query);
+        return query;
     }
 }

src/modules/inbounds/converters/active-user-inbounds.converter.ts

@@ -12,7 +12,6 @@ const modelToEntity = (model: ActiveUserInbounds): ActiveUserInboundEntity => {
 
 const entityToModel = (entity: ActiveUserInboundEntity): ActiveUserInbounds => {
     return {
-        uuid: entity.uuid,
         userUuid: entity.userUuid,
         inboundUuid: entity.inboundUuid,
     };

src/modules/inbounds/entities/active-user-inbound.entity.ts

@@ -1,7 +1,6 @@
 import { ActiveUserInbounds } from '@prisma/client';
 
 export class ActiveUserInboundEntity implements ActiveUserInbounds {
-    uuid: string;
     userUuid: string;
     inboundUuid: string;
 

src/modules/inbounds/entities/base-inbound.entity.ts

@@ -6,7 +6,5 @@ export class BaseInboundEntity extends InboundsEntity {
     constructor(entity: InboundsEntity, port: number) {
         super(entity);
         this.port = port;
-
-        return this;
     }
 }

src/modules/inbounds/entities/inbound-with-stats.entity.ts

@@ -43,7 +43,5 @@ export class InboundWithStatsEntity {
             enabled: Number(data.enabledNodes),
             disabled: Number(data.disabledNodes),
         };
-
-        return this;
     }
 }