chore: сохранение текущих изменений (deploy local-bundle/local-jar, request-service, slots UI markedObjectIds)

Безопасный коммит незакоммиченной работы перед реализацией бронирования слотов.
Вне коммита оставлены: package-lock.json (пустой, мусор), requests.json (scratch-данные).

deploy/local-bundle/scripts/import-images.sh

@@ -25,6 +25,10 @@ ensure_env_file() {
 }
 
 ensure_env_file
+set -a
+# shellcheck disable=SC1091
+source "$bundle_dir/.env"
+set +a
 
 if [[ ! -d "$images_dir" ]]; then
   echo "Images directory not found: $images_dir" >&2
@@ -49,7 +53,12 @@ if [[ -f "$images_dir/public-images.txt" ]]; then
 fi
 
 cd "$bundle_dir"
-echo "Starting postgres, kafka and spring-cloud-config-server..."
-compose up -d postgres kafka spring-cloud-config-server
+if [[ "${USE_EXTERNAL_INFRA:-false}" == "true" ]]; then
+  echo "Using external infrastructure. Starting spring-cloud-config-server only."
+  compose up -d spring-cloud-config-server
+else
+  echo "Starting postgres, kafka and spring-cloud-config-server..."
+  compose up -d postgres kafka spring-cloud-config-server
+fi
 
 echo "Images imported and base services requested."

deploy/local-bundle/scripts/init-db.sh

@@ -43,6 +43,26 @@ wait_for_postgres() {
   exit 1
 }
 
+wait_for_external_postgres() {
+  local container_name="${EXTERNAL_POSTGRES_CONTAINER:-}"
+  local attempt
+
+  if [[ -z "$container_name" ]]; then
+    echo "EXTERNAL_POSTGRES_CONTAINER is required when USE_EXTERNAL_INFRA=true and SKIP_DB_INIT is not true." >&2
+    exit 1
+  fi
+
+  for attempt in {1..60}; do
+    if docker exec "$container_name" pg_isready -U "${POSTGRES_USER:-postgres}" -d postgres >/dev/null 2>&1; then
+      return 0
+    fi
+    sleep 2
+  done
+
+  echo "External Postgres is not ready after 120 seconds: $container_name" >&2
+  exit 1
+}
+
 create_database_if_missing() {
   local db_name="$1"
   local exists
@@ -61,16 +81,35 @@ create_database_if_missing() {
   compose exec -T postgres createdb -U "${POSTGRES_USER:-postgres}" "$db_name"
 }
 
+create_external_database_if_missing() {
+  local db_name="$1"
+  local container_name="${EXTERNAL_POSTGRES_CONTAINER:-}"
+  local exists
+
+  exists="$(
+    docker exec "$container_name" psql -U "${POSTGRES_USER:-postgres}" -d postgres -tAc \
+      "SELECT 1 FROM pg_database WHERE datname = '$db_name'" | tr -d '[:space:]'
+  )"
+
+  if [[ "$exists" == "1" ]]; then
+    echo "Database already exists: $db_name"
+    return 0
+  fi
+
+  echo "Creating database: $db_name"
+  docker exec "$container_name" createdb -U "${POSTGRES_USER:-postgres}" "$db_name"
+}
+
 databases=(
   pcp_ballistics
   pcp_requests
+  pcp_route_processing
   pcp_missions
   pcp_slots
   pcp_complex_plan
   pcp_satellite_catalog
   pcp_stations
   pcp_tgu
-  pcp_tle
   pcp_satellites
 )
 
@@ -78,12 +117,20 @@ ensure_env_file
 load_env
 
 cd "$bundle_dir"
-compose up -d postgres
-wait_for_postgres
+if [[ "${USE_EXTERNAL_INFRA:-false}" == "true" ]]; then
+  wait_for_external_postgres
 
-for db_name in "${databases[@]}"; do
-  create_database_if_missing "$db_name"
-done
+  for db_name in "${databases[@]}"; do
+    create_external_database_if_missing "$db_name"
+  done
+else
+  compose up -d postgres
+  wait_for_postgres
+
+  for db_name in "${databases[@]}"; do
+    create_database_if_missing "$db_name"
+  done
+fi
 
 echo "Database initialization completed. Tables are left to service Flyway migrations."
 echo "No schema objects or seed data were created by this script."

deploy/local-bundle/scripts/start.sh

@@ -72,11 +72,34 @@ wait_for_kafka() {
   exit 1
 }
 
+wait_for_external_kafka() {
+  local container_name="${EXTERNAL_KAFKA_CONTAINER:-}"
+  local attempt
+
+  if [[ -z "$container_name" ]]; then
+    echo "External Kafka container is not configured; skipping Kafka readiness check."
+    return 0
+  fi
+
+  for attempt in {1..60}; do
+    if docker exec "$container_name" kafka-topics --bootstrap-server "${PCP_KAFKA_HOST:-kafka}:${PCP_KAFKA_PORT:-9092}" --list >/dev/null 2>&1 ||
+      docker exec "$container_name" kafka-topics.sh --bootstrap-server "${PCP_KAFKA_HOST:-kafka}:${PCP_KAFKA_PORT:-9092}" --list >/dev/null 2>&1; then
+      echo "External Kafka is ready in container $container_name."
+      return 0
+    fi
+    sleep 2
+  done
+
+  echo "External Kafka is not ready after 120 seconds: $container_name" >&2
+  exit 1
+}
+
 app_services=(
   pcp-srpring-boot-admin-server
   pcp-satellite-catalog-service
   pcp-ballistics-service
   pcp-request-service
+  pcp-route-processing-service
   slots-service
   pcp-complex-mission-service
   pcp-mission-planing-service
@@ -84,7 +107,6 @@ app_services=(
   pcp-dynamic-plan-service
   pcp-stations-service
   pcp-ui-service
-  tle-monitoring-service
   pcp-tgu-service
 )
 
@@ -93,9 +115,16 @@ load_env
 
 cd "$bundle_dir"
 
-echo "Starting infrastructure..."
-compose up -d postgres kafka
-wait_for_kafka
+if [[ "${USE_EXTERNAL_INFRA:-false}" == "true" ]]; then
+  echo "Using external infrastructure. Skipping local postgres/kafka startup."
+  echo "Postgres endpoint for services: ${PCP_POSTGRES_HOST:-postgres}:${PCP_POSTGRES_PORT:-5432}"
+  echo "Kafka endpoint for services: ${PCP_KAFKA_HOST:-kafka}:${PCP_KAFKA_PORT:-9092}"
+  wait_for_external_kafka
+else
+  echo "Starting infrastructure..."
+  compose up -d postgres kafka
+  wait_for_kafka
+fi
 
 if [[ "${SKIP_DB_INIT:-false}" != "true" ]]; then
   "$script_dir/init-db.sh"
@@ -106,7 +135,10 @@ compose up -d spring-cloud-config-server
 wait_for_http "spring-cloud-config-server" "http://localhost:${CONFIG_SERVER_PORT:-38888}/actuator/health"
 
 echo "Starting application services..."
-compose up -d "${app_services[@]}"
+for service_name in "${app_services[@]}"; do
+  echo "Starting $service_name..."
+  compose up -d "$service_name"
+done
 
 echo "Application startup requested."
 compose ps