Update deployment: fixed backend entities loading and nginx proxy

This commit is contained in:
Donat Magda
2025-11-26 00:17:58 +01:00
parent 1c1792e7e1
commit d53fe4bb3e
4 changed files with 181 additions and 237 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ server {
# API proxy to backend # API proxy to backend
location /api/ { location /api/ {
proxy_pass http://backend:3000/; proxy_pass http://backend:3000;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
Binary file not shown.
Binary file not shown.
+153 -209
View File
@@ -1,236 +1,180 @@
-- SerpentRace Database Schema -- This script was generated by the ERD tool in pgAdmin 4.
-- Generated from TypeORM Entity Aggregates -- Please log an issue at https://github.com/pgadmin-org/pgadmin4/issues/new/choose if you find any bugs, including reproduction steps.
-- This file creates the complete database schema without initial data BEGIN;
-- Enable UUID extension -- ===================================================================
-- STEP 1: Enable Required Extensions
-- ===================================================================
CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-- Create Users table -- ===================================================================
CREATE TABLE "Users" ( -- STEP 2: Create Tables
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), -- ===================================================================
"orgid" UUID NULL,
"username" VARCHAR(100) UNIQUE NOT NULL, CREATE TABLE IF NOT EXISTS public."ChatArchives"
"password" VARCHAR(255) NOT NULL, (
"email" VARCHAR(255) UNIQUE NOT NULL, id uuid NOT NULL DEFAULT uuid_generate_v4(),
"fname" VARCHAR(100) NOT NULL, "chatId" uuid NOT NULL,
"lname" VARCHAR(100) NOT NULL, "archivedMessages" json NOT NULL,
"token" VARCHAR(255) NULL, "archivedAt" timestamp without time zone NOT NULL,
"TokenExpires" TIMESTAMP NULL, "createDate" timestamp without time zone NOT NULL DEFAULT now(),
"phone" VARCHAR(20) NULL, "chatType" character varying(50) COLLATE pg_catalog."default" NOT NULL,
"state" INTEGER NOT NULL DEFAULT 0, "chatName" character varying(255) COLLATE pg_catalog."default",
"regdate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "gameId" uuid,
"updatedate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, participants uuid[] NOT NULL,
"Orglogindate" TIMESTAMP NULL CONSTRAINT "PK_fe62979fc2061d7afe278d3f14e" PRIMARY KEY (id)
); );
-- Create Organizations table CREATE TABLE IF NOT EXISTS public."Chats"
CREATE TABLE "Organizations" ( (
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), id uuid NOT NULL DEFAULT uuid_generate_v4(),
"name" VARCHAR(255) NOT NULL, type character varying(50) COLLATE pg_catalog."default" NOT NULL DEFAULT 'direct'::character varying,
"contactfname" VARCHAR(100) NOT NULL, name character varying(255) COLLATE pg_catalog."default",
"contactlname" VARCHAR(100) NOT NULL, "gameId" uuid,
"contactphone" VARCHAR(20) NOT NULL, "createdBy" uuid,
"contactemail" VARCHAR(255) NOT NULL, users uuid[] NOT NULL,
"state" INTEGER NOT NULL DEFAULT 0, messages json NOT NULL DEFAULT '[]'::json,
"regdate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "lastActivity" timestamp without time zone,
"updatedate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "createDate" timestamp without time zone NOT NULL DEFAULT now(),
"url" VARCHAR(500) NULL, "updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"userinorg" INTEGER NOT NULL DEFAULT 0, state integer NOT NULL DEFAULT 0,
"maxOrganizationalDecks" INTEGER NULL "archiveDate" timestamp without time zone,
CONSTRAINT "PK_64c36c2b8d86a0d5de4cf64de8d" PRIMARY KEY (id)
); );
-- Create Decks table CREATE TABLE IF NOT EXISTS public."Contacts"
CREATE TABLE "Decks" ( (
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), id uuid NOT NULL DEFAULT uuid_generate_v4(),
"name" VARCHAR(255) NOT NULL, name character varying(255) COLLATE pg_catalog."default" NOT NULL,
"type" INTEGER NOT NULL, email character varying(255) COLLATE pg_catalog."default" NOT NULL,
"user_id" UUID NOT NULL, userid uuid,
"creation_date" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, type integer NOT NULL,
"cards" JSONB NOT NULL DEFAULT '[]', txt text COLLATE pg_catalog."default" NOT NULL,
"played_number" INTEGER NOT NULL DEFAULT 0, state integer NOT NULL DEFAULT 0,
"ctype" INTEGER NOT NULL DEFAULT 0, "createDate" timestamp without time zone NOT NULL DEFAULT now(),
"update_date" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"state" INTEGER NOT NULL DEFAULT 0, "adminResponse" text COLLATE pg_catalog."default",
"organization_id" UUID NULL "responseDate" timestamp without time zone,
"respondedBy" uuid,
CONSTRAINT "PK_68782cec65c8eef577c62958273" PRIMARY KEY (id)
); );
-- Create Chats table CREATE TABLE IF NOT EXISTS public."Decks"
CREATE TABLE "Chats" ( (
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), id uuid NOT NULL DEFAULT uuid_generate_v4(),
"type" VARCHAR(50) NOT NULL DEFAULT 'direct', name character varying(255) COLLATE pg_catalog."default" NOT NULL,
"name" VARCHAR(255) NULL, type integer NOT NULL,
"gameId" UUID NULL, user_id uuid NOT NULL,
"createdBy" UUID NULL, creation_date timestamp without time zone NOT NULL DEFAULT now(),
"users" UUID[] NOT NULL, cards json NOT NULL,
"messages" JSONB NOT NULL DEFAULT '[]', played_number integer NOT NULL DEFAULT 0,
"lastActivity" TIMESTAMP NULL, ctype integer NOT NULL DEFAULT 0,
"createDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, state integer NOT NULL DEFAULT 0,
"state" INTEGER NOT NULL DEFAULT 0, organization_id uuid,
"archiveDate" TIMESTAMP NULL CONSTRAINT "PK_001f26cb3ec39c1f25269943473" PRIMARY KEY (id)
); );
-- Create Contacts table CREATE TABLE IF NOT EXISTS public."Games"
CREATE TABLE "Contacts" ( (
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), id uuid NOT NULL DEFAULT uuid_generate_v4(),
"name" VARCHAR(255) NOT NULL, gamecode character varying(10) COLLATE pg_catalog."default" NOT NULL,
"email" VARCHAR(255) NOT NULL, maxplayers integer NOT NULL,
"userid" UUID NULL, logintype integer NOT NULL DEFAULT 0,
"type" INTEGER NOT NULL, boardsize integer NOT NULL DEFAULT 50,
"txt" TEXT NOT NULL, "createdBy" uuid NOT NULL,
"state" INTEGER NOT NULL DEFAULT 0, organizationid uuid,
"createDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, decks jsonb NOT NULL DEFAULT '[]'::jsonb,
"updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, playerids uuid[] NOT NULL DEFAULT '{}'::uuid[],
"adminResponse" TEXT NULL, "winnerId" uuid,
"responseDate" TIMESTAMP NULL, state integer NOT NULL DEFAULT 0,
"respondedBy" UUID NULL "createDate" timestamp without time zone NOT NULL DEFAULT now(),
start_date timestamp without time zone,
"finishDate" timestamp without time zone,
"updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"organizationId" uuid,
CONSTRAINT "PK_1950492f583d31609c5e9fbbe12" PRIMARY KEY (id),
CONSTRAINT "UQ_9d52c646079cbe6f242a85c5c41" UNIQUE (gamecode)
); );
-- Create Games table CREATE TABLE IF NOT EXISTS public."Organizations"
CREATE TABLE "Games" ( (
"id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(), id uuid NOT NULL DEFAULT uuid_generate_v4(),
"gamecode" VARCHAR(10) UNIQUE NOT NULL, name character varying(255) COLLATE pg_catalog."default" NOT NULL,
"maxplayers" INTEGER NOT NULL, contactfname character varying(100) COLLATE pg_catalog."default" NOT NULL,
"logintype" INTEGER NOT NULL DEFAULT 0, contactlname character varying(100) COLLATE pg_catalog."default" NOT NULL,
"state" INTEGER NOT NULL DEFAULT 0, contactphone character varying(20) COLLATE pg_catalog."default" NOT NULL,
"playerids" UUID[] NOT NULL DEFAULT '{}', contactemail character varying(255) COLLATE pg_catalog."default" NOT NULL,
"decks" JSONB NOT NULL DEFAULT '[]', state integer NOT NULL DEFAULT 0,
"boardsize" INTEGER NOT NULL DEFAULT 50, regdate timestamp without time zone NOT NULL DEFAULT now(),
"createDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"updateDate" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, url character varying(500) COLLATE pg_catalog."default",
"finishDate" TIMESTAMP NULL, userinorg integer NOT NULL DEFAULT 0,
"winnerid" UUID NULL, "maxOrganizationalDecks" integer,
"createdBy" UUID NOT NULL, CONSTRAINT "PK_e0690a31419f6666194423526f2" PRIMARY KEY (id)
"organizationid" UUID NULL
); );
-- Add Foreign Key Constraints CREATE TABLE IF NOT EXISTS public."Users"
ALTER TABLE "Users" (
ADD CONSTRAINT "FK_Users_Organizations" id uuid NOT NULL DEFAULT uuid_generate_v4(),
FOREIGN KEY ("orgid") REFERENCES "Organizations"("id") ON DELETE SET NULL; orgid uuid,
username character varying(100) COLLATE pg_catalog."default" NOT NULL,
password character varying(255) COLLATE pg_catalog."default" NOT NULL,
email character varying(255) COLLATE pg_catalog."default" NOT NULL,
fname character varying(100) COLLATE pg_catalog."default" NOT NULL,
lname character varying(100) COLLATE pg_catalog."default" NOT NULL,
token character varying(255) COLLATE pg_catalog."default",
"TokenExpires" timestamp without time zone,
phone character varying(20) COLLATE pg_catalog."default",
state integer NOT NULL DEFAULT 0,
regdate timestamp without time zone NOT NULL DEFAULT now(),
"updateDate" timestamp without time zone NOT NULL DEFAULT now(),
"Orglogindate" timestamp without time zone,
CONSTRAINT "PK_16d4f7d636df336db11d87413e3" PRIMARY KEY (id),
CONSTRAINT "UQ_3c3ab3f49a87e6ddb607f3c4945" UNIQUE (email),
CONSTRAINT "UQ_ffc81a3b97dcbf8e320d5106c0d" UNIQUE (username)
);
ALTER TABLE "Decks" CREATE TABLE IF NOT EXISTS public.migrations
ADD CONSTRAINT "FK_Decks_Users" (
FOREIGN KEY ("user_id") REFERENCES "Users"("id") ON DELETE CASCADE; id serial NOT NULL,
"timestamp" bigint NOT NULL,
name character varying COLLATE pg_catalog."default" NOT NULL,
CONSTRAINT "PK_8c82d7f526340ab734260ea46be" PRIMARY KEY (id)
);
ALTER TABLE "Decks" ALTER TABLE IF EXISTS public."Decks"
ADD CONSTRAINT "FK_Decks_Organizations" ADD CONSTRAINT "FK_06ee28f90d68543a03b14aebe13" FOREIGN KEY (organization_id)
FOREIGN KEY ("organization_id") REFERENCES "Organizations"("id") ON DELETE SET NULL; REFERENCES public."Organizations" (id) MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION;
ALTER TABLE "Contacts"
ADD CONSTRAINT "FK_Contacts_Users"
FOREIGN KEY ("userid") REFERENCES "Users"("id") ON DELETE SET NULL;
ALTER TABLE "Contacts" ALTER TABLE IF EXISTS public."Decks"
ADD CONSTRAINT "FK_Contacts_RespondedBy" ADD CONSTRAINT "FK_a39059433e29882e1309d3a5e70" FOREIGN KEY (user_id)
FOREIGN KEY ("respondedBy") REFERENCES "Users"("id") ON DELETE SET NULL; REFERENCES public."Users" (id) MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION;
ALTER TABLE "Chats"
ADD CONSTRAINT "FK_Chats_CreatedBy"
FOREIGN KEY ("createdBy") REFERENCES "Users"("id") ON DELETE SET NULL;
ALTER TABLE "Chats" ALTER TABLE IF EXISTS public."Games"
ADD CONSTRAINT "FK_Chats_Games" ADD CONSTRAINT "FK_330362bff8b25bb573f31fb4023" FOREIGN KEY ("winnerId")
FOREIGN KEY ("gameId") REFERENCES "Games"("id") ON DELETE SET NULL; REFERENCES public."Users" (id) MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION;
ALTER TABLE "Games"
ADD CONSTRAINT "FK_Games_CreatedBy"
FOREIGN KEY ("createdBy") REFERENCES "Users"("id") ON DELETE CASCADE;
ALTER TABLE "Games" ALTER TABLE IF EXISTS public."Games"
ADD CONSTRAINT "FK_Games_Organizations" ADD CONSTRAINT "FK_e3c4e8898fa026a5551aefc4f62" FOREIGN KEY ("organizationId")
FOREIGN KEY ("organizationid") REFERENCES "Organizations"("id") ON DELETE SET NULL; REFERENCES public."Organizations" (id) MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION;
ALTER TABLE "Games"
ADD CONSTRAINT "FK_Games_Winner"
FOREIGN KEY ("winnerid") REFERENCES "Users"("id") ON DELETE SET NULL;
-- Create Indexes for Performance ALTER TABLE IF EXISTS public."Games"
CREATE INDEX "IDX_Users_Username" ON "Users" ("username"); ADD CONSTRAINT "FK_f32db60863a8a393b30aa222cd5" FOREIGN KEY ("createdBy")
CREATE INDEX "IDX_Users_Email" ON "Users" ("email"); REFERENCES public."Users" (id) MATCH SIMPLE
CREATE INDEX "IDX_Users_OrgId" ON "Users" ("orgid"); ON UPDATE NO ACTION
CREATE INDEX "IDX_Users_State" ON "Users" ("state"); ON DELETE NO ACTION;
CREATE INDEX "IDX_Organizations_Name" ON "Organizations" ("name");
CREATE INDEX "IDX_Organizations_State" ON "Organizations" ("state");
CREATE INDEX "IDX_Decks_UserId" ON "Decks" ("user_id");
CREATE INDEX "IDX_Decks_Type" ON "Decks" ("type");
CREATE INDEX "IDX_Decks_CType" ON "Decks" ("ctype");
CREATE INDEX "IDX_Decks_State" ON "Decks" ("state");
CREATE INDEX "IDX_Decks_OrganizationId" ON "Decks" ("organization_id");
CREATE INDEX "IDX_Chats_Type" ON "Chats" ("type");
CREATE INDEX "IDX_Chats_State" ON "Chats" ("state");
CREATE INDEX "IDX_Chats_GameId" ON "Chats" ("gameId");
CREATE INDEX "IDX_Chats_CreatedBy" ON "Chats" ("createdBy");
CREATE INDEX "IDX_Contacts_Type" ON "Contacts" ("type");
CREATE INDEX "IDX_Contacts_State" ON "Contacts" ("state");
CREATE INDEX "IDX_Contacts_UserId" ON "Contacts" ("userid");
CREATE INDEX "IDX_Games_GameCode" ON "Games" ("gamecode");
CREATE INDEX "IDX_Games_State" ON "Games" ("state");
CREATE INDEX "IDX_Games_CreatedBy" ON "Games" ("createdBy");
CREATE INDEX "IDX_Games_OrganizationId" ON "Games" ("organizationid");
-- Create update trigger for updatedate columns
CREATE OR REPLACE FUNCTION update_updatedate_column()
RETURNS TRIGGER AS $$
BEGIN
NEW.updatedate = CURRENT_TIMESTAMP;
RETURN NEW;
END; END;
$$ language 'plpgsql';
-- Apply update triggers
CREATE TRIGGER update_users_updatedate
BEFORE UPDATE ON "Users"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
CREATE TRIGGER update_organizations_updatedate
BEFORE UPDATE ON "Organizations"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
CREATE TRIGGER update_decks_updatedate
BEFORE UPDATE ON "Decks"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
CREATE TRIGGER update_chats_updatedate
BEFORE UPDATE ON "Chats"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
CREATE TRIGGER update_contacts_updatedate
BEFORE UPDATE ON "Contacts"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
CREATE TRIGGER update_games_updatedate
BEFORE UPDATE ON "Games"
FOR EACH ROW EXECUTE FUNCTION update_updatedate_column();
-- Comments for documentation
COMMENT ON TABLE "Users" IS 'User accounts with authentication and profile information';
COMMENT ON TABLE "Organizations" IS 'Organizations that can have multiple users and premium features';
COMMENT ON TABLE "Decks" IS 'Card decks for the game, can be public, private, or organizational';
COMMENT ON TABLE "Chats" IS 'Chat system supporting direct messages, groups, and game chats';
COMMENT ON TABLE "Contacts" IS 'Contact form submissions and support tickets';
COMMENT ON TABLE "Games" IS 'Game sessions with players, decks, and game state';
-- Enum value comments
COMMENT ON COLUMN "Users"."state" IS '0=REGISTERED_NOT_VERIFIED, 1=VERIFIED_REGULAR, 2=VERIFIED_PREMIUM, 3=SOFT_DELETE, 4=DEACTIVATED, 5=ADMIN';
COMMENT ON COLUMN "Organizations"."state" IS '0=REGISTERED, 1=ACTIVE, 2=SOFT_DELETE';
COMMENT ON COLUMN "Decks"."type" IS '0=LUCK, 1=JOKER, 2=QUESTION';
COMMENT ON COLUMN "Decks"."ctype" IS '0=PUBLIC, 1=PRIVATE, 2=ORGANIZATION';
COMMENT ON COLUMN "Decks"."state" IS '0=ACTIVE, 1=SOFT_DELETE';
COMMENT ON COLUMN "Chats"."type" IS 'direct, group, game';
COMMENT ON COLUMN "Chats"."state" IS '0=ACTIVE, 1=ARCHIVE, 2=SOFT_DELETE';
COMMENT ON COLUMN "Contacts"."type" IS '0=BUG, 1=PROBLEM, 2=QUESTION, 3=SALES, 4=OTHER';
COMMENT ON COLUMN "Contacts"."state" IS '0=ACTIVE, 1=RESOLVED, 2=SOFT_DELETE';
COMMENT ON COLUMN "Games"."state" IS '0=WAITING, 1=ACTIVE, 2=FINISHED, 3=CANCELLED';
COMMENT ON COLUMN "Games"."logintype" IS '0=PUBLIC, 1=PRIVATE, 2=ORGANIZATION';
-- Grant permissions for application user
-- Note: Replace 'serpentrace_app' with your actual application database user
-- GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO serpentrace_app;
-- GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO serpentrace_app;
-- GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO serpentrace_app;