add service
This commit is contained in:
@@ -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 "$@"
|
|
||||||
@@ -95,7 +95,7 @@ func (r *requestRepository) GetByUserID(ctx context.Context, userID int) ([]*mod
|
|||||||
query := r.qb.Select(
|
query := r.qb.Select(
|
||||||
"r.id", "r.request_txt", "ms.status_name as mailing_status",
|
"r.id", "r.request_txt", "ms.status_name as mailing_status",
|
||||||
).From("requests_for_suppliers r").
|
).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}).
|
Where(sq.Eq{"r.user_id": userID}).
|
||||||
OrderBy("r.created_at DESC")
|
OrderBy("r.created_at DESC")
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
-- +goose Up
|
-- +goose Up
|
||||||
CREATE TABLE IF NOT EXISTS mailing_status (
|
CREATE TABLE IF NOT EXISTS mailling_status (
|
||||||
id SERIAL PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
status_name TEXT NOT NULL UNIQUE
|
status_name TEXT NOT NULL UNIQUE
|
||||||
);
|
);
|
||||||
|
|
||||||
INSERT INTO mailing_status (status_name) VALUES
|
INSERT INTO mailling_status (status_name) VALUES
|
||||||
('pending'),
|
('PENDING'),
|
||||||
('in_progress'),
|
('IN_PROGRESS'),
|
||||||
('completed'),
|
('COMPLETED'),
|
||||||
('failed')
|
('FAILED')
|
||||||
ON CONFLICT (status_name) DO NOTHING;
|
ON CONFLICT (status_name) DO NOTHING;
|
||||||
|
|
||||||
-- +goose Down
|
-- +goose Down
|
||||||
DROP TABLE mailing_status;
|
DROP TABLE mailling_status;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS requests_for_suppliers (
|
|||||||
final_tz TEXT,
|
final_tz TEXT,
|
||||||
generated_final_tz BOOLEAN DEFAULT false,
|
generated_final_tz BOOLEAN DEFAULT false,
|
||||||
final_update_tz TEXT,
|
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()
|
created_at TIMESTAMP DEFAULT now()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user