diff --git a/backend/application/logs_model.py b/backend/application/logs_model.py index 1e3e9e3..49e542c 100644 --- a/backend/application/logs_model.py +++ b/backend/application/logs_model.py @@ -1,16 +1,15 @@ from . import db - class Logs(db.Model): __bind_key__ = 'logs' id = db.Column(db.Integer, primary_key=True) date = db.Column(db.Date(), nullable=False) - user = db.Column(db.String(), nullable=False) + id_user = db.Column(db.Integer, nullable=False) ip = db.Column(db.String(), nullable=False) table = db.Column(db.String(), nullable=False) action = db.Column(db.String(), nullable=False) - status = db.Column(db.String(), nullable=False) + has_succeeded = db.Column(db.Boolean, nullable=False) status_code = db.Column(db.Integer, nullable=False) def __init__(self, date, user, ip, table, action, status): diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml new file mode 100644 index 0000000..1a67e6f --- /dev/null +++ b/backend/docker-compose.yml @@ -0,0 +1,28 @@ +version: '3.8' + +services: + flaskaled-db1: + image: postgres:latest + container_name: flaskaled-db1 + ports: + - 5433:5432 + volumes: + - ./init-db1.sql:/docker-entrypoint-initdb.d/init-db1.sql + environment: + - POSTGRES_USER=flaskaled1 + - POSTGRES_PASSWORD=aled1 + - POSTGRES_DB=flaskaledDb1 + restart: unless-stopped + + flaskaled-db2: + image: postgres:latest + container_name: flaskaled-db2 + ports: + - 5434:5432 + volumes: + - ./init-db2.sql:/docker-entrypoint-initdb.d/init-db2.sql + environment: + - POSTGRES_USER=flaskaled2 + - POSTGRES_PASSWORD=aled2 + - POSTGRES_DB=flaskaledDb2 + restart: unless-stopped \ No newline at end of file diff --git a/backend/init-db1.sql b/backend/init-db1.sql new file mode 100644 index 0000000..f29af0f --- /dev/null +++ b/backend/init-db1.sql @@ -0,0 +1,11 @@ +-- Table: users + +CREATE TABLE IF NOT EXISTS users +( + id integer NOT NULL, + email character varying(320) NOT NULL, + login character varying(32) NOT NULL, + hash_pass character varying(256) NOT NULL, + is_admin boolean NOT NULL DEFAULT FALSE, + CONSTRAINT users_pkey PRIMARY KEY(id) +) \ No newline at end of file diff --git a/backend/init-db2.sql b/backend/init-db2.sql new file mode 100644 index 0000000..c0b678d --- /dev/null +++ b/backend/init-db2.sql @@ -0,0 +1,14 @@ +-- Table: logs + +CREATE TABLE IF NOT EXISTS logs +( + id integer NOT NULL, + date date NOT NULL, + id_user integer NOT NULL, + ip character varying(15) NOT NULL, + "table" character varying(25) NOT NULL, + action character varying(50) NOT NULL, + has_succeeded boolean NOT NULL, + status_code smallint NOT NULL, + CONSTRAINT logs_pkey PRIMARY KEY(id) +) \ No newline at end of file