From 15f37033420823bbbbc21b9d46c1ce9d73a83e9a Mon Sep 17 00:00:00 2001 From: vallyenfail Date: Sat, 17 Jan 2026 23:56:00 +0300 Subject: [PATCH] add service --- docker-entrypoint.sh | 16 ---------------- internal/repository/request.go | 2 +- migrations/00004_create_mailing_status.sql | 14 +++++++------- .../00005_create_requests_for_suppliers.sql | 2 +- 4 files changed, 9 insertions(+), 25 deletions(-) delete mode 100755 docker-entrypoint.sh diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index 4868e7f..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e - -echo "=== Smart Search Backend Entrypoint ===" - -# Wait for database to be ready -echo "Waiting for database to be ready..." -until PGPASSWORD=$DB_PASSWORD psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c '\q' 2>/dev/null; do - echo "Database is unavailable - sleeping" - sleep 2 -done - -echo "Database is ready!" - -echo "Starting server..." -exec "$@" diff --git a/internal/repository/request.go b/internal/repository/request.go index 0584922..d31215e 100644 --- a/internal/repository/request.go +++ b/internal/repository/request.go @@ -95,7 +95,7 @@ func (r *requestRepository) GetByUserID(ctx context.Context, userID int) ([]*mod query := r.qb.Select( "r.id", "r.request_txt", "ms.status_name as mailing_status", ).From("requests_for_suppliers r"). - Join("mailing_status ms ON r.mailling_status_id = ms.id"). + Join("mailling_status ms ON r.mailling_status_id = ms.id"). Where(sq.Eq{"r.user_id": userID}). OrderBy("r.created_at DESC") diff --git a/migrations/00004_create_mailing_status.sql b/migrations/00004_create_mailing_status.sql index 709ddaf..86ba238 100644 --- a/migrations/00004_create_mailing_status.sql +++ b/migrations/00004_create_mailing_status.sql @@ -1,15 +1,15 @@ -- +goose Up -CREATE TABLE IF NOT EXISTS mailing_status ( +CREATE TABLE IF NOT EXISTS mailling_status ( id SERIAL PRIMARY KEY, status_name TEXT NOT NULL UNIQUE ); -INSERT INTO mailing_status (status_name) VALUES - ('pending'), - ('in_progress'), - ('completed'), - ('failed') +INSERT INTO mailling_status (status_name) VALUES + ('PENDING'), + ('IN_PROGRESS'), + ('COMPLETED'), + ('FAILED') ON CONFLICT (status_name) DO NOTHING; -- +goose Down -DROP TABLE mailing_status; +DROP TABLE mailling_status; diff --git a/migrations/00005_create_requests_for_suppliers.sql b/migrations/00005_create_requests_for_suppliers.sql index b61ed4e..8299c80 100644 --- a/migrations/00005_create_requests_for_suppliers.sql +++ b/migrations/00005_create_requests_for_suppliers.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS requests_for_suppliers ( final_tz TEXT, generated_final_tz BOOLEAN DEFAULT false, final_update_tz TEXT, - mailling_status_id INT REFERENCES mailing_status(id) DEFAULT 1, + mailling_status_id INT REFERENCES mailling_status(id) DEFAULT 1, created_at TIMESTAMP DEFAULT now() );