From f7e71dc0421394496fffbcfd22f74dbd4855ec6a Mon Sep 17 00:00:00 2001 From: harold Date: Thu, 6 Mar 2025 20:26:59 +0500 Subject: [PATCH] add fix --- dev.Dockerfile | 6 ++++-- docker-compose.yml | 4 +++- internal/model/sql/model.go | 2 +- internal/service/file/file.go | 1 - sql/init.sql | 9 ++++++++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index d266839..5960643 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,7 +1,9 @@ -FROM golang:1.23-alpine +FROM golang:1.23 + +# Установка mime-support через apk WORKDIR /root COPY . . RUN go mod tidy -CMD go run cmd/main.go \ No newline at end of file +CMD go run cmd/main.go diff --git a/docker-compose.yml b/docker-compose.yml index 69a1b64..2aa9d03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,9 @@ services: restart: always networks: - donat-network + volumes: + - ./storage:/storage + widget_db: image: postgres:16.3-alpine3.20 @@ -26,7 +29,6 @@ services: volumes: - ./sql/init.sql:/docker-entrypoint-initdb.d/init.sql - ./docker/postgres/data:/var/lib/postgresql/data - - ./storage:/storage networks: donat-network: external: true \ No newline at end of file diff --git a/internal/model/sql/model.go b/internal/model/sql/model.go index f65d83f..96b14c7 100644 --- a/internal/model/sql/model.go +++ b/internal/model/sql/model.go @@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS widgets ( CREATE TABLE IF NOT EXISTS files ( id UUID NOT NULL PRIMARY KEY DEFAULT uuid_generate_v4(), - file_type VARCHAR(15) NOT NULL, + file_type VARCHAR(30) NOT NULL, file_name VARCHAR(50) NOT NULL, extension VARCHAR(10) NOT NULL, streamer_id INTEGER NOT NULL, diff --git a/internal/service/file/file.go b/internal/service/file/file.go index 7fb3f7d..9ad714c 100644 --- a/internal/service/file/file.go +++ b/internal/service/file/file.go @@ -39,7 +39,6 @@ func (fileService *ServiceFile) AddNewFile( streamerID int, ) (string, error) { fileExt := path.Ext(file.Filename) - mimeType := mime.TypeByExtension(fileExt) if mimeType == "" { mimeType = "application/octet-stream" diff --git a/sql/init.sql b/sql/init.sql index bf0d268..2359a07 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -10,20 +10,27 @@ CREATE TABLE IF NOT EXISTS files ( streamer_id INTEGER NOT NULL, created_at TIMESTAMP DEFAULT now() ); - CREATE TABLE IF NOT EXISTS widgets ( id SERIAL PRIMARY KEY, streamer_id INTEGER NOT NULL, template_id INTEGER, + group_id INTEGER NOT NULL DEFAULT 1, + is_active BOOLEAN NOT NULL DEFAULT true, + name VARCHAR(50) NOT NULL, image UUID NOT NULL REFERENCES files(id) ON DELETE CASCADE, audio UUID NOT NULL REFERENCES files(id) ON DELETE CASCADE, + duration INTEGER NOT NULL, min_amount INTEGER NOT NULL, + max_amount INTEGER NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), updated_at TIMESTAMP NOT NULL DEFAULT now() ); + + CREATE TABLE IF NOT EXISTS donats ( id SERIAL PRIMARY KEY, streamer_id INTEGER NOT NULL,