chore(prod): sync with main #4

Merged
dylan merged 67 commits from master into prod 2026-06-25 23:28:52 +01:00
3 changed files with 4 additions and 5 deletions
Showing only changes of commit 85615ebc54 - Show all commits

View File

@@ -26,7 +26,6 @@ services:
- WEB_SERVER_URL=http://host.docker.internal:8080 - WEB_SERVER_URL=http://host.docker.internal:8080
ports: ports:
- "1935:1935" - "1935:1935"
- "8088:8088"
volumes: volumes:
- ${STREAM_DATA}:/stream - ${STREAM_DATA}:/stream
pull_policy: build pull_policy: build

View File

@@ -20,10 +20,10 @@ public class Stream {
@JoinColumn(name = "user_id", nullable = false) @JoinColumn(name = "user_id", nullable = false)
private User user; private User user;
@Column(name = "start_date") @Column(name = "start_time")
private LocalDateTime startDate; private LocalDateTime startDate;
@Column(name = "end_date") @Column(name = "end_time")
private LocalDateTime endDate; private LocalDateTime endDate;
@Column(name = "last_seen") @Column(name = "last_seen")

View File

@@ -11,12 +11,12 @@ CREATE TABLE IF NOT EXISTS users (
profile_picture_url VARCHAR(255), profile_picture_url VARCHAR(255),
role INTEGER DEFAULT 0, role INTEGER DEFAULT 0,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
stream_key VARCHAR(64) NOT NULL stream_key VARCHAR(64) NOT NULL UNIQUE
); );
CREATE TABLE IF NOT EXISTS streams ( CREATE TABLE IF NOT EXISTS streams (
id BIGSERIAL PRIMARY KEY, id BIGSERIAL PRIMARY KEY,
user_id BIGSERIAL, user_id BIGINT,
start_time TIMESTAMPTZ DEFAULT NOW(), start_time TIMESTAMPTZ DEFAULT NOW(),
end_time TIMESTAMPTZ DEFAULT NULL, end_time TIMESTAMPTZ DEFAULT NULL,
last_seen TIMESTAMPTZ DEFAULT NULL, last_seen TIMESTAMPTZ DEFAULT NULL,