fix: Remove TMDB fallback and add ID conversion for strict id_type handling

ПРОБЛЕМА:
- При id_type='kp' код делал fallback на TMDB если фильм не найден
- Если передан TMDB ID с id_type='kp', возвращались данные из TMDB
- Нарушалась явная логика выбора источника

РЕШЕНИЕ:
1. Убран автоматический fallback на TMDB при id_type='kp'
2. Добавлена конвертация ID:
   - Если id_type='kp' и фильм не найден напрямую
   - Пробуем конвертировать TMDB ID → KP ID через TmdbIdToKPId
   - Запрашиваем данные по сконвертированному KP ID
3. Если конвертация не удалась → возвращаем ошибку

ЛОГИКА:
- id_type='kp' + ID=550 (TMDB):
  1. Поиск KP фильма с id=550 → не найдено
  2. Конвертация 550 (TMDB) → получаем KP ID (например 326)
  3. Поиск KP фильма с id=326 → успех
  4. Возврат данных из Kinopoisk ✅

- id_type='kp' + несуществующий ID:
  1. Поиск KP фильма → не найдено
  2. Конвертация → не удалась
  3. Возврат ошибки (НЕ fallback на TMDB) ✅

ИЗМЕНЕНИЯ:
- pkg/services/movie.go: добавлена конвертация и удален fallback
- pkg/services/tv.go: добавлена конвертация и удален fallback
- Добавлен import fmt для форматирования ошибок

РЕЗУЛЬТАТ:
✅ Строгое соблюдение id_type параметра
✅ Умная конвертация между TMDB и KP ID
✅ Нет неожиданного fallback на другой источник

.env.example

@@ -1,15 +1,15 @@
 MONGO_URI=mongodb://localhost:27017/neomovies
 MONGO_DB_NAME=neomovies
 
-TMDB_ACCESS_TOKEN=your_tmdb_access_token
+TMDB_ACCESS_TOKEN=your_tmdb_access_token_here
 
-KPAPI_KEY=your_kp_api_key
+KPAPI_KEY=920aaf6a-9f64-46f7-bda7-209fb1069440
 KPAPI_BASE_URL=https://kinopoiskapiunofficial.tech/api
 
-HDVB_TOKEN=your_hdvb_token
+HDVB_TOKEN=b9ae5f8c4832244060916af4aa9d1939
 
 VIBIX_HOST=https://vibix.org
-VIBIX_TOKEN=your_vibix_token
+VIBIX_TOKEN=18745|NzecUXT4gikPUtFkSEFlDLPmr9kWnQACTo1N0Ixq9240bcf1
 
 LUMEX_URL=https://p.lumex.space
 
@@ -18,7 +18,7 @@ ALLOHA_TOKEN=your_alloha_token
 REDAPI_BASE_URL=http://redapi.cfhttp.top
 REDAPI_KEY=your_redapi_key
 
-JWT_SECRET=your_jwt_secret_key
+JWT_SECRET=your_jwt_secret_key_here
 
 GMAIL_USER=your_gmail@gmail.com
 GMAIL_APP_PASSWORD=your_gmail_app_password

README.md

@@ -1,4 +1,4 @@
-# Neo Movies API (Unified)
+# Neo Movies API
 
 REST API для поиска и получения информации о фильмах, использующий TMDB API.
 
@@ -57,7 +57,7 @@ TMDB_ACCESS_TOKEN=your_tmdb_access_token
 JWT_SECRET=your_jwt_secret_key
 
 # Kinopoisk API
-KPAPI_KEY=your_kp_api_key
+KPAPI_KEY=920aaf6a-9f64-46f7-bda7-209fb1069440
 KPAPI_BASE_URL=https://kinopoiskapiunofficial.tech/api
 
 # Сервис
@@ -74,8 +74,8 @@ GMAIL_APP_PASSWORD=your_gmail_app_password
 LUMEX_URL=https://p.lumex.space
 ALLOHA_TOKEN=your_alloha_token
 VIBIX_HOST=https://vibix.org
-VIBIX_TOKEN=your_vibix_token
-HDVB_TOKEN=your_hdvb_token
+VIBIX_TOKEN=18745|NzecUXT4gikPUtFkSEFlDLPmr9kWnQACTo1N0Ixq9240bcf1
+HDVB_TOKEN=b9ae5f8c4832244060916af4aa9d1939
 
 # Торренты (RedAPI)
 REDAPI_BASE_URL=http://redapi.cfhttp.top
@@ -89,7 +89,7 @@ GOOGLE_REDIRECT_URL=http://localhost:3000/api/v1/auth/google/callback
 
 ## 📋 API Endpoints
 
-### 🔓 Публичные маршруты (старые)
+### 🔓 Публичные маршруты
 
 ```http
 # Система
@@ -114,7 +114,7 @@ GET  /api/v1/movies/popular                  # Популярные
 GET  /api/v1/movies/top-rated                # Топ-рейтинговые
 GET  /api/v1/movies/upcoming                 # Предстоящие
 GET  /api/v1/movies/now-playing              # В прокате
-GET  /api/v1/movies/{id}                     # Детали фильма (устар.)
+GET  /api/v1/movies/{id}                     # Детали фильма
 GET  /api/v1/movies/{id}/recommendations     # Рекомендации
 GET  /api/v1/movies/{id}/similar             # Похожие
 
@@ -124,86 +124,7 @@ GET  /api/v1/tv/popular                      # Популярные
 GET  /api/v1/tv/top-rated                    # Топ-рейтинговые
 GET  /api/v1/tv/on-the-air                   # В эфире
 GET  /api/v1/tv/airing-today                 # Сегодня в эфире
-GET  /api/v1/tv/{id}                         # Детали сериала (устар.)
-### 🔓 Публичные маршруты (унифицированные)
-
-```http
-# Единый формат ID: SOURCE_ID = kp_123 | tmdb_456
-GET  /api/v1/movie/{SOURCE_ID}               # Детали фильма (унифицированный ответ)
-GET  /api/v1/tv/{SOURCE_ID}                  # Детали сериала (унифицированный ответ, с seasons[])
-GET  /api/v1/search?query=...&source=kp|tmdb # Мультипоиск (унифицированные элементы)
-```
-
-Примеры:
-
-```http
-GET /api/v1/movie/tmdb_550
-GET /api/v1/movie/kp_666
-GET /api/v1/tv/tmdb_1399
-GET /api/v1/search?query=matrix&source=tmdb
-```
-
-Схема ответа см. раздел «Unified responses» ниже.
-
-## Unified responses
-
-Пример карточки:
-
-```json
-{
-  "success": true,
-  "data": {
-    "id": "550",
-    "sourceId": "tmdb_550",
-    "title": "Fight Club",
-    "originalTitle": "Fight Club",
-    "description": "…",
-    "releaseDate": "1999-10-15",
-    "endDate": null,
-    "type": "movie",
-    "genres": [{ "id": "drama", "name": "Drama" }],
-    "rating": 8.8,
-    "posterUrl": "https://image.tmdb.org/t/p/w500/...jpg",
-    "backdropUrl": "https://image.tmdb.org/t/p/w1280/...jpg",
-    "director": "",
-    "cast": [],
-    "duration": 139,
-    "country": "US",
-    "language": "en",
-    "budget": 63000000,
-    "revenue": 100853753,
-    "imdbId": "0137523",
-    "externalIds": { "kp": null, "tmdb": 550, "imdb": "0137523" },
-    "seasons": []
-  },
-  "source": "tmdb",
-  "metadata": { "fetchedAt": "...", "apiVersion": "3.0", "responseTime": 12 }
-}
-```
-
-Пример мультипоиска:
-
-```json
-{
-  "success": true,
-  "data": [
-    {
-      "id": "550",
-      "sourceId": "tmdb_550",
-      "title": "Fight Club",
-      "type": "movie",
-      "releaseDate": "1999-10-15",
-      "posterUrl": "https://image.tmdb.org/t/p/w500/...jpg",
-      "rating": 8.8,
-      "description": "…",
-      "externalIds": { "kp": null, "tmdb": 550, "imdb": "" }
-    }
-  ],
-  "source": "tmdb",
-  "pagination": { "page": 1, "totalPages": 5, "totalResults": 42, "pageSize": 20 },
-  "metadata": { "fetchedAt": "...", "apiVersion": "3.0", "responseTime": 20, "query": "fight" }
-}
-```
+GET  /api/v1/tv/{id}                         # Детали сериала
 GET  /api/v1/tv/{id}/recommendations         # Рекомендации
 GET  /api/v1/tv/{id}/similar                 # Похожие
 
@@ -278,15 +199,18 @@ curl -X POST https://api.neomovies.ru/api/v1/auth/login \
   }'
 ```
 
-### Поиск (унифицированный)
+### Поиск фильмов
 
 ```bash
-# Мультипоиск (источник обязателен)
-curl "https://api.neomovies.ru/api/v1/search?query=matrix&source=tmdb&page=1"
+# Поиск фильмов
+curl "https://api.neomovies.ru/api/v1/movies/search?query=marvel&page=1"
 
-# Детали по униф. ID
-curl "https://api.neomovies.ru/api/v1/movie/tmdb_550"
-curl "https://api.neomovies.ru/api/v1/tv/kp_61365"
+# Детали фильма
+curl "https://api.neomovies.ru/api/v1/movies/550"
+
+# Добавить в избранное (с JWT токеном)
+curl -X POST https://api.neomovies.ru/api/v1/favorites/550 \
+  -H "Authorization: Bearer YOUR_JWT_TOKEN"
 ```
 
 ### Поиск торрентов

api/index.go

@@ -67,9 +67,8 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	tvHandler := handlersPkg.NewTVHandler(tvService)
 	favoritesHandler := handlersPkg.NewFavoritesHandler(favoritesService, globalCfg)
 	docsHandler := handlersPkg.NewDocsHandler()
-    searchHandler := handlersPkg.NewSearchHandler(tmdbService, kpService)
-    unifiedHandler := handlersPkg.NewUnifiedHandler(tmdbService, kpService)
-    categoriesHandler := handlersPkg.NewCategoriesHandler(tmdbService).WithKinopoisk(kpService)
+	searchHandler := handlersPkg.NewSearchHandler(tmdbService, kpService)
+	categoriesHandler := handlersPkg.NewCategoriesHandler(tmdbService)
 	playersHandler := handlersPkg.NewPlayersHandler(globalCfg)
 	torrentsHandler := handlersPkg.NewTorrentsHandler(torrentService, tmdbService)
 	reactionsHandler := handlersPkg.NewReactionsHandler(reactionsService)
@@ -96,8 +95,7 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	api.HandleFunc("/categories/{id}/movies", categoriesHandler.GetMoviesByCategory).Methods("GET")
 	api.HandleFunc("/categories/{id}/media", categoriesHandler.GetMediaByCategory).Methods("GET")
 
-    api.HandleFunc("/players/alloha/{id_type}/{id}", playersHandler.GetAllohaPlayer).Methods("GET")
-    api.HandleFunc("/players/alloha/meta/kp/{kp_id}", playersHandler.GetAllohaMetaByKP).Methods("GET")
+	api.HandleFunc("/players/alloha/{id_type}/{id}", playersHandler.GetAllohaPlayer).Methods("GET")
 	api.HandleFunc("/players/lumex/{id_type}/{id}", playersHandler.GetLumexPlayer).Methods("GET")
 	api.HandleFunc("/players/vibix/{id_type}/{id}", playersHandler.GetVibixPlayer).Methods("GET")
 	api.HandleFunc("/players/hdvb/{id_type}/{id}", playersHandler.GetHDVBPlayer).Methods("GET")
@@ -125,11 +123,7 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	api.HandleFunc("/movies/top-rated", movieHandler.TopRated).Methods("GET")
 	api.HandleFunc("/movies/upcoming", movieHandler.Upcoming).Methods("GET")
 	api.HandleFunc("/movies/now-playing", movieHandler.NowPlaying).Methods("GET")
-    api.HandleFunc("/movies/{id}", movieHandler.GetByID).Methods("GET")
-    // Unified prefixed routes
-    api.HandleFunc("/movie/{id}", unifiedHandler.GetMovie).Methods("GET")
-    api.HandleFunc("/tv/{id}", unifiedHandler.GetTV).Methods("GET")
-    api.HandleFunc("/search", unifiedHandler.Search).Methods("GET")
+	api.HandleFunc("/movies/{id}", movieHandler.GetByID).Methods("GET")
 	api.HandleFunc("/movies/{id}/recommendations", movieHandler.GetRecommendations).Methods("GET")
 	api.HandleFunc("/movies/{id}/similar", movieHandler.GetSimilar).Methods("GET")
 	api.HandleFunc("/movies/{id}/external-ids", movieHandler.GetExternalIDs).Methods("GET")

main.go

@@ -47,9 +47,8 @@ func main() {
 	tvHandler := appHandlers.NewTVHandler(tvService)
 	favoritesHandler := appHandlers.NewFavoritesHandler(favoritesService, cfg)
 	docsHandler := appHandlers.NewDocsHandler()
-    searchHandler := appHandlers.NewSearchHandler(tmdbService, kpService)
-    unifiedHandler := appHandlers.NewUnifiedHandler(tmdbService, kpService)
-    categoriesHandler := appHandlers.NewCategoriesHandler(tmdbService).WithKinopoisk(kpService)
+	searchHandler := appHandlers.NewSearchHandler(tmdbService, kpService)
+	categoriesHandler := appHandlers.NewCategoriesHandler(tmdbService)
 	playersHandler := appHandlers.NewPlayersHandler(cfg)
 	torrentsHandler := appHandlers.NewTorrentsHandler(torrentService, tmdbService)
 	reactionsHandler := appHandlers.NewReactionsHandler(reactionsService)
@@ -101,11 +100,7 @@ func main() {
 	api.HandleFunc("/movies/top-rated", movieHandler.TopRated).Methods("GET")
 	api.HandleFunc("/movies/upcoming", movieHandler.Upcoming).Methods("GET")
 	api.HandleFunc("/movies/now-playing", movieHandler.NowPlaying).Methods("GET")
-    api.HandleFunc("/movies/{id}", movieHandler.GetByID).Methods("GET")
-    // Unified prefixed routes
-    api.HandleFunc("/movie/{id}", unifiedHandler.GetMovie).Methods("GET")
-    api.HandleFunc("/tv/{id}", unifiedHandler.GetTV).Methods("GET")
-    api.HandleFunc("/search", unifiedHandler.Search).Methods("GET")
+	api.HandleFunc("/movies/{id}", movieHandler.GetByID).Methods("GET")
 	api.HandleFunc("/movies/{id}/recommendations", movieHandler.GetRecommendations).Methods("GET")
 	api.HandleFunc("/movies/{id}/similar", movieHandler.GetSimilar).Methods("GET")
 	api.HandleFunc("/movies/{id}/external-ids", movieHandler.GetExternalIDs).Methods("GET")

netlify.toml

@@ -1,15 +0,0 @@
-[build]
-  functions = "netlify/functions"
-
-[build.environment]
-  GO_VERSION = "1.22.6"
-
-# Optional: include static assets used by handlers (placeholders, etc.)
-[functions]
-  included_files = ["assets/**", "public/**", "static/**"]
-
-# Route all API requests to the serverless function "api"
-[[redirects]]
-  from = "/api/*"
-  to = "/.netlify/functions/api/:splat"
-  status = 200

netlify/functions/api.go

@@ -1,15 +0,0 @@
-package main
-
-import (
-	"context"
-	"net/http"
-
-	bridge "github.com/vercel/go-bridge/go/bridge"
-	handler "neomovies-api/api"
-)
-
-func main() {
-	bridge.Start(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		handler.Handler(w, r.WithContext(context.Background()))
-	}))
-}

pkg/handlers/categories.go

@@ -12,18 +12,13 @@ import (
 )
 
 type CategoriesHandler struct {
-    tmdbService *services.TMDBService
-    kpService   *services.KinopoiskService
+	tmdbService *services.TMDBService
 }
 
 func NewCategoriesHandler(tmdbService *services.TMDBService) *CategoriesHandler {
-    // Для совместимости, kpService может быть добавлен позже через setter при инициализации в main.go/api/index.go
-    return &CategoriesHandler{tmdbService: tmdbService}
-}
-
-func (h *CategoriesHandler) WithKinopoisk(kp *services.KinopoiskService) *CategoriesHandler {
-    h.kpService = kp
-    return h
+	return &CategoriesHandler{
+		tmdbService: tmdbService,
+	}
 }
 
 type Category struct {
@@ -33,14 +28,14 @@ type Category struct {
 }
 
 func (h *CategoriesHandler) GetCategories(w http.ResponseWriter, r *http.Request) {
-    // Получаем все жанры
-    genresResponse, err := h.tmdbService.GetAllGenres()
+	// Получаем все жанры
+	genresResponse, err := h.tmdbService.GetAllGenres()
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-    // Преобразуем жанры в категории (пока TMDB). Для KP — можно замаппить фиксированный список
+	// Преобразуем жанры в категории
 	var categories []Category
 	for _, genre := range genresResponse.Genres {
 		slug := generateSlug(genre.Name)
@@ -72,7 +67,7 @@ func (h *CategoriesHandler) GetMediaByCategory(w http.ResponseWriter, r *http.Re
 		language = "ru-RU"
 	}
 
-    mediaType := r.URL.Query().Get("type")
+	mediaType := r.URL.Query().Get("type")
 	if mediaType == "" {
 		mediaType = "movie" // По умолчанию фильмы для обратной совместимости
 	}
@@ -82,28 +77,16 @@ func (h *CategoriesHandler) GetMediaByCategory(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-    source := r.URL.Query().Get("source") // "kp" | "tmdb"
-    var data interface{}
-    var err2 error
+	var data interface{}
+	var err2 error
 
-    if source == "kp" && h.kpService != nil {
-        // KP не имеет прямого discover по genre id TMDB — здесь можно реализовать маппинг slug->поисковый запрос
-        // Для простоты: используем keyword поиск по имени категории (slug как ключевое слово)
-        // Получим человекочитаемое имя жанра из TMDB как приближение
-        if mediaType == "movie" {
-            // Поиском KP (keyword) эмулируем категорию
-            data, err2 = h.kpService.SearchFilms(r.URL.Query().Get("name"), page)
-        } else {
-            // Для сериалов у KP: используем тот же поиск (KP выдаёт и сериалы в некоторых случаях)
-            data, err2 = h.kpService.SearchFilms(r.URL.Query().Get("name"), page)
-        }
-    } else {
-        if mediaType == "movie" {
-            data, err2 = h.tmdbService.DiscoverMoviesByGenre(categoryID, page, language)
-        } else {
-            data, err2 = h.tmdbService.DiscoverTVByGenre(categoryID, page, language)
-        }
-    }
+	if mediaType == "movie" {
+		// Используем discover API для получения фильмов по жанру
+		data, err2 = h.tmdbService.DiscoverMoviesByGenre(categoryID, page, language)
+	} else {
+		// Используем discover API для получения сериалов по жанру
+		data, err2 = h.tmdbService.DiscoverTVByGenre(categoryID, page, language)
+	}
 
 	if err2 != nil {
 		http.Error(w, err2.Error(), http.StatusInternalServerError)

pkg/handlers/docs.go

@@ -161,8 +161,8 @@ func getOpenAPISpecWithURL(baseURL string) *OpenAPISpec {
 		OpenAPI: "3.0.0",
 		Info: Info{
 			Title:       "Neo Movies API",
-            Description: "Унифицированный API (TMDB/Kinopoisk) с префиксными ID (kp_*, tmdb_*) и единым форматом данных",
-            Version:     "3.0.0",
+			Description: "Современный API для поиска фильмов и сериалов с интеграцией TMDB и поддержкой авторизации",
+			Version:     "2.0.0",
 			Contact: Contact{
 				Name: "API Support",
 				URL:  "https://github.com/your-username/neomovies-api-go",
@@ -194,10 +194,10 @@ func getOpenAPISpecWithURL(baseURL string) *OpenAPISpec {
 					},
 				},
 			},
-            "/api/v1/search": map[string]interface{}{
+			"/api/v1/search/multi": map[string]interface{}{
 				"get": map[string]interface{}{
-                    "summary":     "Унифицированный поиск",
-                    "description": "Поиск фильмов и сериалов в источниках TMDB или Kinopoisk",
+					"summary":     "Мультипоиск",
+					"description": "Поиск фильмов, сериалов и актеров",
 					"tags":        []string{"Search"},
 					"parameters": []map[string]interface{}{
 						{
@@ -207,13 +207,6 @@ func getOpenAPISpecWithURL(baseURL string) *OpenAPISpec {
 							"schema":      map[string]string{"type": "string"},
 							"description": "Поисковый запрос",
 						},
-                        {
-                            "name":        "source",
-                            "in":          "query",
-                            "required":    true,
-                            "schema":      map[string]interface{}{"type": "string", "enum": []string{"kp", "tmdb"}},
-                            "description": "Источник: kp или tmdb",
-                        },
 						{
 							"name":        "page",
 							"in":          "query",
@@ -223,7 +216,7 @@ func getOpenAPISpecWithURL(baseURL string) *OpenAPISpec {
 					},
 					"responses": map[string]interface{}{
 						"200": map[string]interface{}{
-                            "description": "Результаты поиска (унифицированные)",
+							"description": "Результаты поиска",
 						},
 					},
 				},

pkg/handlers/favorites.go

@@ -1,18 +1,17 @@
 package handlers
 
 import (
-    "encoding/json"
-    "fmt"
-    "io"
-    "net/http"
-    "time"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
 
-    "github.com/gorilla/mux"
+	"github.com/gorilla/mux"
 
-    "neomovies-api/pkg/config"
-    "neomovies-api/pkg/middleware"
-    "neomovies-api/pkg/models"
-    "neomovies-api/pkg/services"
+	"neomovies-api/pkg/config"
+	"neomovies-api/pkg/middleware"
+	"neomovies-api/pkg/models"
+	"neomovies-api/pkg/services"
 )
 
 type FavoritesHandler struct {
@@ -178,8 +177,7 @@ func (h *FavoritesHandler) fetchMediaInfoRussian(mediaID, mediaType string) (*mo
 		url = fmt.Sprintf("https://api.themoviedb.org/3/tv/%s?api_key=%s&language=ru-RU", mediaID, h.config.TMDBAccessToken)
 	}
 
-    client := &http.Client{Timeout: 6 * time.Second}
-    resp, err := client.Get(url)
+	resp, err := http.Get(url)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch from TMDB: %w", err)
 	}

pkg/handlers/images.go

@@ -1,17 +1,15 @@
 package handlers
 
 import (
-    "fmt"
-    "io"
-    "net/http"
-    "net/url"
-    "os"
-    "path/filepath"
-    "strings"
-    "time"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
 
-    "github.com/gorilla/mux"
-    "neomovies-api/pkg/config"
+	"github.com/gorilla/mux"
+	"neomovies-api/pkg/config"
 )
 
 type ImagesHandler struct{}
@@ -28,13 +26,7 @@ func (h *ImagesHandler) GetImage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-    // Попробуем декодировать путь заранее (на фронте абсолютные URL передаются как encodeURIComponent)
-    decodedPath := imagePath
-    if dp, err := url.QueryUnescape(imagePath); err == nil {
-        decodedPath = dp
-    }
-
-    if imagePath == "placeholder.jpg" || decodedPath == "placeholder.jpg" {
+	if imagePath == "placeholder.jpg" {
 		h.servePlaceholder(w, r)
 		return
 	}
@@ -44,85 +36,14 @@ func (h *ImagesHandler) GetImage(w http.ResponseWriter, r *http.Request) {
 		size = "original"
 	}
 
-    var imageURL string
-    // Нормализуем абсолютные ссылки вида "https:/..." → "https://...", а также "//..." → "https://..."
-    normalized := decodedPath
-    if strings.HasPrefix(normalized, "//") {
-        normalized = "https:" + normalized
-    }
-    if strings.HasPrefix(normalized, "http:/") && !strings.HasPrefix(normalized, "http://") {
-        normalized = strings.Replace(normalized, "http:/", "http://", 1)
-    }
-    if strings.HasPrefix(normalized, "https:/") && !strings.HasPrefix(normalized, "https://") {
-        normalized = strings.Replace(normalized, "https:/", "https://", 1)
-    }
+	imageURL := fmt.Sprintf("%s/%s/%s", config.TMDBImageBaseURL, size, imagePath)
 
-    if strings.HasPrefix(normalized, "http://") || strings.HasPrefix(normalized, "https://") {
-        // Проксируем внешний абсолютный URL (например, Kinopoisk)
-        imageURL = normalized
-    } else {
-        // TMDB относительный путь
-        imageURL = fmt.Sprintf("%s/%s/%s", config.TMDBImageBaseURL, size, imagePath)
-    }
-
-    client := &http.Client{Timeout: 12 * time.Second}
-
-    // Подготовим несколько вариантов заголовков для обхода ограничений источников
-    buildRequest := func(targetURL string, attempt int) (*http.Request, error) {
-        req, err := http.NewRequest("GET", targetURL, nil)
-        if err != nil {
-            return nil, err
-        }
-        // Универсальные заголовки как у браузера
-        req.Header.Set("Accept", "image/avif,image/webp,image/apng,image/*,*/*;q=0.8")
-        req.Header.Set("Accept-Language", "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7")
-        if ua := r.Header.Get("User-Agent"); ua != "" {
-            req.Header.Set("User-Agent", ua)
-        } else {
-            req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0 Safari/537.36")
-        }
-
-        // Настройка Referer: для Yandex/Kinopoisk ставим kinopoisk.ru, иначе — origin URL
-        parsed, _ := url.Parse(targetURL)
-        host := strings.ToLower(parsed.Host)
-        switch attempt {
-        case 0:
-            if strings.Contains(host, "kinopoisk") || strings.Contains(host, "yandex") {
-                req.Header.Set("Referer", "https://www.kinopoisk.ru/")
-            } else if parsed.Scheme != "" && parsed.Host != "" {
-                req.Header.Set("Referer", parsed.Scheme+"://"+parsed.Host+"/")
-            }
-        case 1:
-            // Без Referer
-        default:
-            // Оставляем как есть
-        }
-
-        return req, nil
-    }
-
-    // До 2-х попыток: с реферером источника и без реферера
-    var resp *http.Response
-    var err error
-    for attempt := 0; attempt < 2; attempt++ {
-        var req *http.Request
-        req, err = buildRequest(imageURL, attempt)
-        if err != nil {
-            continue
-        }
-        resp, err = client.Do(req)
-        if err == nil && resp != nil && resp.StatusCode == http.StatusOK {
-            break
-        }
-        if resp != nil {
-            resp.Body.Close()
-        }
-    }
+	resp, err := http.Get(imageURL)
 	if err != nil {
 		h.servePlaceholder(w, r)
 		return
 	}
-    defer resp.Body.Close()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		h.servePlaceholder(w, r)

pkg/handlers/movie.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/gorilla/mux"
 
@@ -49,39 +48,14 @@ func (h *MovieHandler) Search(w http.ResponseWriter, r *http.Request) {
 
 func (h *MovieHandler) GetByID(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	rawID := vars["id"]
-
-	// Support formats: "123" (old), "kp_123", "tmdb_123"
-	source := ""
-	var id int
-	if strings.Contains(rawID, "_") {
-		parts := strings.SplitN(rawID, "_", 2)
-		if len(parts) != 2 {
-			http.Error(w, "Invalid ID format", http.StatusBadRequest)
-			return
-		}
-		source = parts[0]
-		parsed, err := strconv.Atoi(parts[1])
-		if err != nil {
-			http.Error(w, "Invalid numeric ID", http.StatusBadRequest)
-			return
-		}
-		id = parsed
-	} else {
-		// Backward compatibility
-		parsed, err := strconv.Atoi(rawID)
-		if err != nil {
-			http.Error(w, "Invalid movie ID", http.StatusBadRequest)
-			return
-		}
-		id = parsed
+	id, err := strconv.Atoi(vars["id"])
+	if err != nil {
+		http.Error(w, "Invalid movie ID", http.StatusBadRequest)
+		return
 	}
 
 	language := GetLanguage(r)
-	idType := r.URL.Query().Get("id_type")
-	if source == "kp" || source == "tmdb" {
-		idType = source
-	}
+	idType := r.URL.Query().Get("id_type") // kp or tmdb
 
 	movie, err := h.movieService.GetByID(id, language, idType)
 	if err != nil {

pkg/handlers/players.go

@@ -7,7 +7,6 @@ import (
 	"log"
 	"net/http"
 	"net/url"
-    "sort"
 	"strconv"
 	"strings"
 	"time"
@@ -31,7 +30,7 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 	log.Printf("GetAllohaPlayer called: %s %s", r.Method, r.URL.Path)
 
 	vars := mux.Vars(r)
-    idType := vars["id_type"]
+	idType := vars["id_type"]
 	id := vars["id"]
 
 	if idType == "" || id == "" {
@@ -40,10 +39,9 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-    if idType == "kinopoisk_id" { idType = "kp" }
-    if idType != "kp" && idType != "imdb" {
+	if idType != "kp" && idType != "imdb" {
 		log.Printf("Error: invalid id_type: %s", idType)
-        http.Error(w, "id_type must be 'kp' (kinopoisk_id) or 'imdb'", http.StatusBadRequest)
+		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
 		return
 	}
 
@@ -59,8 +57,7 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 	apiURL := fmt.Sprintf("https://api.alloha.tv/?token=%s&%s", h.config.AllohaToken, idParam)
 	log.Printf("Calling Alloha API: %s", apiURL)
 
-    client := &http.Client{Timeout: 8 * time.Second}
-    resp, err := client.Get(apiURL)
+	resp, err := http.Get(apiURL)
 	if err != nil {
 		log.Printf("Error calling Alloha API: %v", err)
 		http.Error(w, "Failed to fetch from Alloha API", http.StatusInternalServerError)
@@ -141,120 +138,6 @@ func (h *PlayersHandler) GetAllohaPlayer(w http.ResponseWriter, r *http.Request)
 	log.Printf("Successfully served Alloha player for %s: %s", idType, id)
 }
 
-// GetAllohaMetaByKP returns seasons/episodes meta for Alloha by kinopoisk_id
-func (h *PlayersHandler) GetAllohaMetaByKP(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    kpID := vars["kp_id"]
-    if strings.TrimSpace(kpID) == "" {
-        http.Error(w, "kp_id is required", http.StatusBadRequest)
-        return
-    }
-    if h.config.AllohaToken == "" {
-        http.Error(w, "Server misconfiguration: ALLOHA_TOKEN missing", http.StatusInternalServerError)
-        return
-    }
-
-    apiURL := fmt.Sprintf("https://api.alloha.tv/?token=%s&kp=%s", url.QueryEscape(h.config.AllohaToken), url.QueryEscape(kpID))
-    client := &http.Client{Timeout: 8 * time.Second}
-    resp, err := client.Get(apiURL)
-    if err != nil {
-        http.Error(w, "Failed to fetch from Alloha API", http.StatusBadGateway)
-        return
-    }
-    defer resp.Body.Close()
-    if resp.StatusCode != http.StatusOK {
-        http.Error(w, fmt.Sprintf("Alloha API error: %d", resp.StatusCode), http.StatusBadGateway)
-        return
-    }
-    body, err := io.ReadAll(resp.Body)
-    if err != nil {
-        http.Error(w, "Failed to read Alloha response", http.StatusBadGateway)
-        return
-    }
-
-    // Define only the parts we need (map-based structure as в примере)
-    var raw struct {
-        Status string `json:"status"`
-        Data   struct {
-            SeasonsCount int `json:"seasons_count"`
-            Seasons      map[string]struct {
-                Season   int `json:"season"`
-                Episodes map[string]struct {
-                    Episode     int                              `json:"episode"`
-                    Translation map[string]struct {
-                        Translation string `json:"translation"`
-                        Name        string `json:"name"`
-                    } `json:"translation"`
-                } `json:"episodes"`
-            } `json:"seasons"`
-        } `json:"data"`
-    }
-
-    if err := json.Unmarshal(body, &raw); err != nil {
-        http.Error(w, "Invalid JSON from Alloha", http.StatusBadGateway)
-        return
-    }
-
-    type episodeMeta struct {
-        Episode      int      `json:"episode"`
-        Translations []string `json:"translations"`
-    }
-    type seasonMeta struct {
-        Season   int           `json:"season"`
-        Episodes []episodeMeta `json:"episodes"`
-    }
-    out := struct {
-        Success bool         `json:"success"`
-        Seasons []seasonMeta `json:"seasons"`
-    }{Success: true, Seasons: make([]seasonMeta, 0)}
-
-    if raw.Status == "success" && len(raw.Data.Seasons) > 0 {
-        // sort seasons by numeric key
-        seasonKeys := make([]int, 0, len(raw.Data.Seasons))
-        for k := range raw.Data.Seasons {
-            if n, err := strconv.Atoi(strings.TrimSpace(k)); err == nil {
-                seasonKeys = append(seasonKeys, n)
-            }
-        }
-        sort.Ints(seasonKeys)
-
-        for _, sn := range seasonKeys {
-            s := raw.Data.Seasons[strconv.Itoa(sn)]
-            sm := seasonMeta{Season: sn}
-
-            // sort episodes by numeric key
-            epKeys := make([]int, 0, len(s.Episodes))
-            for ek := range s.Episodes {
-                if en, err := strconv.Atoi(strings.TrimSpace(ek)); err == nil {
-                    epKeys = append(epKeys, en)
-                }
-            }
-            sort.Ints(epKeys)
-
-            for _, en := range epKeys {
-                e := s.Episodes[strconv.Itoa(en)]
-                em := episodeMeta{Episode: en}
-                // collect translations
-                for _, tr := range e.Translation {
-                    t := strings.TrimSpace(tr.Translation)
-                    if t == "" {
-                        t = strings.TrimSpace(tr.Name)
-                    }
-                    if t != "" {
-                        em.Translations = append(em.Translations, t)
-                    }
-                }
-                sm.Episodes = append(sm.Episodes, em)
-            }
-
-            out.Seasons = append(out.Seasons, sm)
-        }
-    }
-
-    w.Header().Set("Content-Type", "application/json")
-    _ = json.NewEncoder(w).Encode(out)
-}
-
 func (h *PlayersHandler) GetLumexPlayer(w http.ResponseWriter, r *http.Request) {
 	log.Printf("GetLumexPlayer called: %s %s", r.Method, r.URL.Path)
 
@@ -268,9 +151,7 @@ func (h *PlayersHandler) GetLumexPlayer(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-    // Поддержка алиаса
-    if idType == "kinopoisk_id" { idType = "kp" }
-    if idType != "kp" && idType != "imdb" {
+	if idType != "kp" && idType != "imdb" {
 		log.Printf("Error: invalid id_type: %s", idType)
 		http.Error(w, "id_type must be 'kp' or 'imdb'", http.StatusBadRequest)
 		return
@@ -278,26 +159,20 @@ func (h *PlayersHandler) GetLumexPlayer(w http.ResponseWriter, r *http.Request)
 
 	log.Printf("Processing %s ID: %s", idType, id)
 
-    if h.config.LumexURL == "" {
-        log.Printf("Error: LUMEX_URL is missing")
-        http.Error(w, "Server misconfiguration: LUMEX_URL missing", http.StatusInternalServerError)
-        return
-    }
+	if h.config.LumexURL == "" {
+		log.Printf("Error: LUMEX_URL is missing")
+		http.Error(w, "Server misconfiguration: LUMEX_URL missing", http.StatusInternalServerError)
+		return
+	}
 
-    // Встраивание напрямую через p.lumex.cloud: <iframe src="//p.lumex.cloud/<code>?kp_id=...">
-    // Ожидается, что LUMEX_URL задаёт базу вида: https://p.lumex.cloud/<code>
-    var paramName string
-    if idType == "kp" {
-        paramName = "kp_id"
-    } else {
-        paramName = "imdb_id"
-    }
+	var paramName string
+	if idType == "kp" {
+		paramName = "kinopoisk_id"
+	} else {
+		paramName = "imdb_id"
+	}
 
-    separator := "?"
-    if strings.Contains(h.config.LumexURL, "?") {
-        separator = "&"
-    }
-    playerURL := fmt.Sprintf("%s%s%s=%s", h.config.LumexURL, separator, paramName, url.QueryEscape(id))
+	playerURL := fmt.Sprintf("%s?%s=%s", h.config.LumexURL, paramName, id)
 	log.Printf("Lumex URL: %s", playerURL)
 
 	iframe := fmt.Sprintf(`<iframe src="%s" allowfullscreen loading="lazy" style="border:none;width:100%%;height:100%%;"></iframe>`, playerURL)
@@ -717,8 +592,7 @@ func (h *PlayersHandler) GetHDVBPlayer(w http.ResponseWriter, r *http.Request) {
 	}
 	log.Printf("HDVB API URL: %s", apiURL)
 
-    client := &http.Client{Timeout: 8 * time.Second}
-    resp, err := client.Get(apiURL)
+	resp, err := http.Get(apiURL)
 	if err != nil {
 		log.Printf("Error fetching HDVB data: %v", err)
 		http.Error(w, "Failed to fetch player data", http.StatusInternalServerError)

pkg/handlers/search.go

@@ -30,60 +30,51 @@ func (h *SearchHandler) MultiSearch(w http.ResponseWriter, r *http.Request) {
 	page := getIntQuery(r, "page", 1)
 	language := GetLanguage(r)
 
-    if services.ShouldUseKinopoisk(language) {
-        if h.kpService == nil {
-            http.Error(w, "Kinopoisk service is not configured", http.StatusBadGateway)
-            return
-        }
+	if services.ShouldUseKinopoisk(language) && h.kpService != nil {
+		kpSearch, err := h.kpService.SearchFilms(query, page)
+		if err == nil {
+			tmdbResp := services.MapKPSearchToTMDBResponse(kpSearch)
+			multiResults := make([]models.MultiSearchResult, 0)
+			for _, movie := range tmdbResp.Results {
+				multiResults = append(multiResults, models.MultiSearchResult{
+					ID:               movie.ID,
+					MediaType:        "movie",
+					Title:            movie.Title,
+					OriginalTitle:    movie.OriginalTitle,
+					Overview:         movie.Overview,
+					PosterPath:       movie.PosterPath,
+					BackdropPath:     movie.BackdropPath,
+					ReleaseDate:      movie.ReleaseDate,
+					VoteAverage:      movie.VoteAverage,
+					VoteCount:        movie.VoteCount,
+					Popularity:       movie.Popularity,
+					Adult:            movie.Adult,
+					OriginalLanguage: movie.OriginalLanguage,
+				})
+			}
+			w.Header().Set("Content-Type", "application/json")
+			json.NewEncoder(w).Encode(models.APIResponse{
+				Success: true,
+				Data: models.MultiSearchResponse{
+					Page:         page,
+					Results:      multiResults,
+					TotalPages:   tmdbResp.TotalPages,
+					TotalResults: tmdbResp.TotalResults,
+				},
+			})
+			return
+		}
+	}
 
-        kpSearch, err := h.kpService.SearchFilms(query, page)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusBadGateway)
-            return
-        }
+	results, err := h.tmdbService.SearchMulti(query, page, language)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 
-        tmdbResp := services.MapKPSearchToTMDBResponse(kpSearch)
-        multiResults := make([]models.MultiSearchResult, 0)
-        for _, movie := range tmdbResp.Results {
-            multiResults = append(multiResults, models.MultiSearchResult{
-                ID:               movie.ID,
-                MediaType:        "movie",
-                Title:            movie.Title,
-                OriginalTitle:    movie.OriginalTitle,
-                Overview:         movie.Overview,
-                PosterPath:       movie.PosterPath,
-                BackdropPath:     movie.BackdropPath,
-                ReleaseDate:      movie.ReleaseDate,
-                VoteAverage:      movie.VoteAverage,
-                VoteCount:        movie.VoteCount,
-                Popularity:       movie.Popularity,
-                Adult:            movie.Adult,
-                OriginalLanguage: movie.OriginalLanguage,
-            })
-        }
-        w.Header().Set("Content-Type", "application/json")
-        json.NewEncoder(w).Encode(models.APIResponse{
-            Success: true,
-            Data: models.MultiSearchResponse{
-                Page:         page,
-                Results:      multiResults,
-                TotalPages:   tmdbResp.TotalPages,
-                TotalResults: tmdbResp.TotalResults,
-            },
-        })
-        return
-    }
-
-    // EN/прочие языки — TMDB
-    results, err := h.tmdbService.SearchMulti(query, page, language)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    w.Header().Set("Content-Type", "application/json")
-    json.NewEncoder(w).Encode(models.APIResponse{
-        Success: true,
-        Data:    results,
-    })
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(models.APIResponse{
+		Success: true,
+		Data:    results,
+	})
 }

pkg/handlers/tv.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/gorilla/mux"
 
@@ -48,39 +47,14 @@ func (h *TVHandler) Search(w http.ResponseWriter, r *http.Request) {
 
 func (h *TVHandler) GetByID(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	rawID := vars["id"]
-
-	// Support formats: "123" (old), "kp_123", "tmdb_123"
-	source := ""
-	var id int
-	if strings.Contains(rawID, "_") {
-		parts := strings.SplitN(rawID, "_", 2)
-		if len(parts) != 2 {
-			http.Error(w, "Invalid ID format", http.StatusBadRequest)
-			return
-		}
-		source = parts[0]
-		parsed, err := strconv.Atoi(parts[1])
-		if err != nil {
-			http.Error(w, "Invalid numeric ID", http.StatusBadRequest)
-			return
-		}
-		id = parsed
-	} else {
-		// Backward compatibility
-		parsed, err := strconv.Atoi(rawID)
-		if err != nil {
-			http.Error(w, "Invalid TV show ID", http.StatusBadRequest)
-			return
-		}
-		id = parsed
+	id, err := strconv.Atoi(vars["id"])
+	if err != nil {
+		http.Error(w, "Invalid TV show ID", http.StatusBadRequest)
+		return
 	}
 
 	language := GetLanguage(r)
-	idType := r.URL.Query().Get("id_type")
-	if source == "kp" || source == "tmdb" {
-		idType = source
-	}
+	idType := r.URL.Query().Get("id_type") // kp or tmdb
 
 	tvShow, err := h.tvService.GetByID(id, language, idType)
 	if err != nil {

pkg/handlers/unified.go

@@ -1,228 +0,0 @@
-package handlers
-
-import (
-    "encoding/json"
-    "net/http"
-    "strconv"
-    "strings"
-    "time"
-
-    "neomovies-api/pkg/models"
-    "neomovies-api/pkg/services"
-)
-
-type UnifiedHandler struct {
-    tmdb *services.TMDBService
-    kp   *services.KinopoiskService
-}
-
-func NewUnifiedHandler(tmdb *services.TMDBService, kp *services.KinopoiskService) *UnifiedHandler {
-    return &UnifiedHandler{tmdb: tmdb, kp: kp}
-}
-
-// Parse source ID of form "kp_123" or "tmdb_456"
-func parseSourceID(raw string) (source string, id int, err error) {
-    parts := strings.SplitN(raw, "_", 2)
-    if len(parts) != 2 {
-        return "", 0, strconv.ErrSyntax
-    }
-    src := strings.ToLower(parts[0])
-    if src != "kp" && src != "tmdb" {
-        return "", 0, strconv.ErrSyntax
-    }
-    num, err := strconv.Atoi(parts[1])
-    if err != nil {
-        return "", 0, err
-    }
-    return src, num, nil
-}
-
-func (h *UnifiedHandler) GetMovie(w http.ResponseWriter, r *http.Request) {
-    start := time.Now()
-    vars := muxVars(r)
-    rawID := vars["id"]
-
-    source, id, err := parseSourceID(rawID)
-    if err != nil {
-        writeUnifiedError(w, http.StatusBadRequest, "invalid SOURCE_ID format", start, "")
-        return
-    }
-
-    language := GetLanguage(r)
-    var data *models.UnifiedContent
-    if source == "kp" {
-        if h.kp == nil {
-            writeUnifiedError(w, http.StatusBadGateway, "Kinopoisk service not configured", start, source)
-            return
-        }
-        kpFilm, err := h.kp.GetFilmByKinopoiskId(id)
-        if err != nil {
-            writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-            return
-        }
-        data = services.MapKPToUnified(kpFilm)
-        // Обогащаем только externalIds.tmdb через /find (берем только поле id)
-        if kpFilm.ImdbId != "" {
-            if tmdbID, fErr := h.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "movie", GetLanguage(r)); fErr == nil {
-                data.ExternalIDs.TMDB = &tmdbID
-            }
-        }
-    } else {
-        // tmdb
-        movie, err := h.tmdb.GetMovie(id, language)
-        if err != nil {
-            writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-            return
-        }
-        ext, _ := h.tmdb.GetMovieExternalIDs(id)
-        data = services.MapTMDBToUnifiedMovie(movie, ext)
-    }
-
-    writeUnifiedOK(w, data, start, source, "")
-}
-
-func (h *UnifiedHandler) GetTV(w http.ResponseWriter, r *http.Request) {
-    start := time.Now()
-    vars := muxVars(r)
-    rawID := vars["id"]
-
-    source, id, err := parseSourceID(rawID)
-    if err != nil {
-        writeUnifiedError(w, http.StatusBadRequest, "invalid SOURCE_ID format", start, "")
-        return
-    }
-
-    language := GetLanguage(r)
-    var data *models.UnifiedContent
-    if source == "kp" {
-        if h.kp == nil {
-            writeUnifiedError(w, http.StatusBadGateway, "Kinopoisk service not configured", start, source)
-            return
-        }
-        kpFilm, err := h.kp.GetFilmByKinopoiskId(id)
-        if err != nil {
-            writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-            return
-        }
-        data = services.MapKPToUnified(kpFilm)
-        if kpFilm.ImdbId != "" {
-            if tmdbID, fErr := h.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "tv", GetLanguage(r)); fErr == nil {
-                data.ExternalIDs.TMDB = &tmdbID
-            }
-        }
-    } else {
-        tv, err := h.tmdb.GetTVShow(id, language)
-        if err != nil {
-            writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-            return
-        }
-        ext, _ := h.tmdb.GetTVExternalIDs(id)
-        data = services.MapTMDBTVToUnified(tv, ext)
-    }
-
-    writeUnifiedOK(w, data, start, source, "")
-}
-
-func (h *UnifiedHandler) Search(w http.ResponseWriter, r *http.Request) {
-    start := time.Now()
-    query := r.URL.Query().Get("query")
-    if strings.TrimSpace(query) == "" {
-        writeUnifiedError(w, http.StatusBadRequest, "query is required", start, "")
-        return
-    }
-    source := strings.ToLower(r.URL.Query().Get("source")) // kp|tmdb
-    page := getIntQuery(r, "page", 1)
-    language := GetLanguage(r)
-
-    if source != "kp" && source != "tmdb" {
-        writeUnifiedError(w, http.StatusBadRequest, "source must be 'kp' or 'tmdb'", start, "")
-        return
-    }
-
-    if source == "kp" {
-        if h.kp == nil {
-            writeUnifiedError(w, http.StatusBadGateway, "Kinopoisk service not configured", start, source)
-            return
-        }
-        kpSearch, err := h.kp.SearchFilms(query, page)
-        if err != nil {
-            writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-            return
-        }
-        items := services.MapKPSearchToUnifiedItems(kpSearch)
-        // Обогащаем результаты поиска TMDB ID через получение полной информации о фильмах
-        if h.tmdb != nil {
-            for i := range items {
-                if kpID, err := strconv.Atoi(items[i].ID); err == nil {
-                    if kpFilm, err := h.kp.GetFilmByKinopoiskId(kpID); err == nil && kpFilm.ImdbId != "" {
-                        items[i].ExternalIDs.IMDb = kpFilm.ImdbId
-                        mediaType := "movie"
-                        if items[i].Type == "tv" {
-                            mediaType = "tv"
-                        }
-                        if tmdbID, err := h.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, mediaType, "ru-RU"); err == nil {
-                            items[i].ExternalIDs.TMDB = &tmdbID
-                        }
-                    }
-                }
-            }
-        }
-        resp := models.UnifiedSearchResponse{
-            Success: true,
-            Data:    items,
-            Source:  source,
-            Pagination: models.UnifiedPagination{Page: page, TotalPages: kpSearch.PagesCount, TotalResults: kpSearch.SearchFilmsCountResult, PageSize: len(items)},
-            Metadata: models.UnifiedMetadata{FetchedAt: time.Now(), APIVersion: "3.0", ResponseTime: time.Since(start).Milliseconds(), Query: query},
-        }
-        writeJSON(w, http.StatusOK, resp)
-        return
-    }
-
-    // TMDB multi search
-    multi, err := h.tmdb.SearchMulti(query, page, language)
-    if err != nil {
-        writeUnifiedError(w, http.StatusBadGateway, err.Error(), start, source)
-        return
-    }
-    items := services.MapTMDBMultiToUnifiedItems(multi)
-    resp := models.UnifiedSearchResponse{
-        Success: true,
-        Data:    items,
-        Source:  source,
-        Pagination: models.UnifiedPagination{Page: multi.Page, TotalPages: multi.TotalPages, TotalResults: multi.TotalResults, PageSize: len(items)},
-        Metadata: models.UnifiedMetadata{FetchedAt: time.Now(), APIVersion: "3.0", ResponseTime: time.Since(start).Milliseconds(), Query: query},
-    }
-    writeJSON(w, http.StatusOK, resp)
-}
-
-func writeUnifiedOK(w http.ResponseWriter, data *models.UnifiedContent, start time.Time, source string, query string) {
-    resp := models.UnifiedAPIResponse{
-        Success: true,
-        Data:    data,
-        Source:  source,
-        Metadata: models.UnifiedMetadata{
-            FetchedAt:    time.Now(),
-            APIVersion:   "3.0",
-            ResponseTime: time.Since(start).Milliseconds(),
-            Query:        query,
-        },
-    }
-    w.Header().Set("Content-Type", "application/json")
-    json.NewEncoder(w).Encode(resp)
-}
-
-func writeUnifiedError(w http.ResponseWriter, code int, message string, start time.Time, source string) {
-    resp := models.UnifiedAPIResponse{
-        Success: false,
-        Error:   message,
-        Source:  source,
-        Metadata: models.UnifiedMetadata{
-            FetchedAt:    time.Now(),
-            APIVersion:   "3.0",
-            ResponseTime: time.Since(start).Milliseconds(),
-        },
-    }
-    w.Header().Set("Content-Type", "application/json")
-    w.WriteHeader(code)
-    json.NewEncoder(w).Encode(resp)
-}

pkg/handlers/unified_helpers.go

@@ -1,23 +0,0 @@
-package handlers
-
-import (
-    "encoding/json"
-    "net/http"
-    "time"
-
-    "github.com/gorilla/mux"
-)
-
-func muxVars(r *http.Request) map[string]string { return mux.Vars(r) }
-
-func writeJSON(w http.ResponseWriter, status int, v interface{}) {
-    w.Header().Set("Content-Type", "application/json")
-    w.WriteHeader(status)
-    _ = json.NewEncoder(w).Encode(v)
-}
-
-type metaEnvelope struct {
-    FetchedAt    time.Time `json:"fetchedAt"`
-    APIVersion   string    `json:"apiVersion"`
-    ResponseTime int64     `json:"responseTime"`
-}

pkg/models/movie.go

@@ -123,7 +123,6 @@ type ExternalIDs struct {
 	ID          int    `json:"id"`
 	IMDbID      string `json:"imdb_id"`
 	KinopoiskID int    `json:"kinopoisk_id,omitempty"`
-	TMDBID      int    `json:"tmdb_id,omitempty"`
 	TVDBID      int    `json:"tvdb_id,omitempty"`
 	WikidataID  string `json:"wikidata_id"`
 	FacebookID  string `json:"facebook_id"`

pkg/models/unified.go

@@ -1,114 +0,0 @@
-package models
-
-import "time"
-
-// Unified entities and response envelopes for prefixed-source API
-
-type UnifiedGenre struct {
-    ID   string `json:"id"`
-    Name string `json:"name"`
-}
-
-type UnifiedCastMember struct {
-    ID        string `json:"id"`
-    Name      string `json:"name"`
-    Character string `json:"character,omitempty"`
-}
-
-type UnifiedExternalIDs struct {
-    KP   *int   `json:"kp"`
-    TMDB *int   `json:"tmdb"`
-    IMDb string `json:"imdb"`
-}
-
-type UnifiedContent struct {
-    ID            string              `json:"id"`
-    SourceID      string              `json:"sourceId"`
-    Title         string              `json:"title"`
-    OriginalTitle string              `json:"originalTitle"`
-    Description   string              `json:"description"`
-    ReleaseDate   string              `json:"releaseDate"`
-    EndDate       *string             `json:"endDate"`
-    Type          string              `json:"type"` // movie | tv
-    Genres        []UnifiedGenre      `json:"genres"`
-    Rating        float64             `json:"rating"`
-    PosterURL     string              `json:"posterUrl"`
-    BackdropURL   string              `json:"backdropUrl"`
-    Director      string              `json:"director"`
-    Cast          []UnifiedCastMember `json:"cast"`
-    Duration      int                 `json:"duration"`
-    Country       string              `json:"country"`
-    Language      string              `json:"language"`
-    Budget        *int64              `json:"budget"`
-    Revenue       *int64              `json:"revenue"`
-    IMDbID        string              `json:"imdbId"`
-    ExternalIDs   UnifiedExternalIDs  `json:"externalIds"`
-    // For TV shows
-    Seasons       []UnifiedSeason     `json:"seasons,omitempty"`
-}
-
-type UnifiedSeason struct {
-    ID           string           `json:"id"`
-    SourceID     string           `json:"sourceId"`
-    Name         string           `json:"name"`
-    SeasonNumber int              `json:"seasonNumber"`
-    EpisodeCount int              `json:"episodeCount"`
-    ReleaseDate  string           `json:"releaseDate"`
-    PosterURL    string           `json:"posterUrl"`
-    Episodes     []UnifiedEpisode `json:"episodes,omitempty"`
-}
-
-type UnifiedEpisode struct {
-    ID           string `json:"id"`
-    SourceID     string `json:"sourceId"`
-    Name         string `json:"name"`
-    EpisodeNumber int   `json:"episodeNumber"`
-    SeasonNumber  int   `json:"seasonNumber"`
-    AirDate      string `json:"airDate"`
-    Duration     int    `json:"duration"`
-    Description  string `json:"description"`
-    StillURL     string `json:"stillUrl"`
-}
-
-type UnifiedSearchItem struct {
-    ID          string             `json:"id"`
-    SourceID    string             `json:"sourceId"`
-    Title       string             `json:"title"`
-    Type        string             `json:"type"`
-    OriginalType string            `json:"originalType,omitempty"`
-    ReleaseDate string             `json:"releaseDate"`
-    PosterURL   string             `json:"posterUrl"`
-    Rating      float64            `json:"rating"`
-    Description string             `json:"description"`
-    ExternalIDs UnifiedExternalIDs `json:"externalIds"`
-}
-
-type UnifiedPagination struct {
-    Page         int `json:"page"`
-    TotalPages   int `json:"totalPages"`
-    TotalResults int `json:"totalResults"`
-    PageSize     int `json:"pageSize"`
-}
-
-type UnifiedMetadata struct {
-    FetchedAt    time.Time `json:"fetchedAt"`
-    APIVersion   string    `json:"apiVersion"`
-    ResponseTime int64     `json:"responseTime"`
-    Query        string    `json:"query,omitempty"`
-}
-
-type UnifiedAPIResponse struct {
-    Success  bool            `json:"success"`
-    Data     interface{}     `json:"data,omitempty"`
-    Error    string          `json:"error,omitempty"`
-    Source   string          `json:"source,omitempty"`
-    Metadata UnifiedMetadata `json:"metadata"`
-}
-
-type UnifiedSearchResponse struct {
-    Success    bool                `json:"success"`
-    Data       []UnifiedSearchItem `json:"data"`
-    Source     string              `json:"source"`
-    Pagination UnifiedPagination   `json:"pagination"`
-    Metadata   UnifiedMetadata     `json:"metadata"`
-}

pkg/services/kinopoisk.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 )
@@ -140,7 +139,7 @@ func (s *KinopoiskService) GetFilmByKinopoiskId(id int) (*KPFilm, error) {
 }
 
 func (s *KinopoiskService) GetFilmByImdbId(imdbId string) (*KPFilm, error) {
-    endpoint := fmt.Sprintf("%s/v2.2/films?imdbId=%s", s.baseURL, url.QueryEscape(imdbId))
+	endpoint := fmt.Sprintf("%s/v2.2/films?imdbId=%s", s.baseURL, imdbId)
 	
 	var response struct {
 		Films []KPFilm `json:"items"`
@@ -159,7 +158,7 @@ func (s *KinopoiskService) GetFilmByImdbId(imdbId string) (*KPFilm, error) {
 }
 
 func (s *KinopoiskService) SearchFilms(keyword string, page int) (*KPSearchResponse, error) {
-    endpoint := fmt.Sprintf("%s/v2.1/films/search-by-keyword?keyword=%s&page=%d", s.baseURL, url.QueryEscape(keyword), page)
+	endpoint := fmt.Sprintf("%s/v2.1/films/search-by-keyword?keyword=%s&page=%d", s.baseURL, keyword, page)
 	var response KPSearchResponse
 	err := s.makeRequest(endpoint, &response)
 	return &response, err

pkg/services/kp_mapper.go

@@ -1,12 +1,12 @@
 package services
 
 import (
-    "fmt"
-    "strconv"
-    "strings"
-    "time"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
 
-    "neomovies-api/pkg/models"
+	"neomovies-api/pkg/models"
 )
 
 func MapKPFilmToTMDBMovie(kpFilm *KPFilm) *models.Movie {
@@ -167,89 +167,6 @@ func MapKPFilmToTVShow(kpFilm *KPFilm) *models.TVShow {
 	}
 }
 
-// Unified mappers with prefixed IDs
-func MapKPToUnified(kpFilm *KPFilm) *models.UnifiedContent {
-    if kpFilm == nil {
-        return nil
-    }
-
-    releaseDate := FormatKPDate(kpFilm.Year)
-    endDate := (*string)(nil)
-    if kpFilm.EndYear > 0 {
-        v := FormatKPDate(kpFilm.EndYear)
-        endDate = &v
-    }
-
-    genres := make([]models.UnifiedGenre, 0)
-    for _, g := range kpFilm.Genres {
-        genres = append(genres, models.UnifiedGenre{ID: strings.ToLower(g.Genre), Name: g.Genre})
-    }
-
-    poster := kpFilm.PosterUrlPreview
-    if poster == "" {
-        poster = kpFilm.PosterUrl
-    }
-
-    country := ""
-    if len(kpFilm.Countries) > 0 {
-        country = kpFilm.Countries[0].Country
-    }
-
-    title := kpFilm.NameRu
-    if title == "" {
-        title = kpFilm.NameEn
-    }
-    originalTitle := kpFilm.NameOriginal
-    if originalTitle == "" {
-        originalTitle = kpFilm.NameEn
-    }
-
-    var budgetPtr *int64
-    var revenuePtr *int64
-
-    external := models.UnifiedExternalIDs{KP: &kpFilm.KinopoiskId, TMDB: nil, IMDb: kpFilm.ImdbId}
-
-    return &models.UnifiedContent{
-        ID:            strconv.Itoa(kpFilm.KinopoiskId),
-        SourceID:      "kp_" + strconv.Itoa(kpFilm.KinopoiskId),
-        Title:         title,
-        OriginalTitle: originalTitle,
-        Description:   firstNonEmpty(kpFilm.Description, kpFilm.ShortDescription),
-        ReleaseDate:   releaseDate,
-        EndDate:       endDate,
-        Type:          mapKPTypeToUnified(kpFilm),
-        Genres:        genres,
-        Rating:        kpFilm.RatingKinopoisk,
-        PosterURL:     BuildAPIImageProxyURL(poster, "w500"),
-        BackdropURL:   BuildAPIImageProxyURL(kpFilm.CoverUrl, "w1280"),
-        Director:      "",
-        Cast:          []models.UnifiedCastMember{},
-        Duration:      kpFilm.FilmLength,
-        Country:       country,
-        Language:      detectLanguage(kpFilm),
-        Budget:        budgetPtr,
-        Revenue:       revenuePtr,
-        IMDbID:        kpFilm.ImdbId,
-        ExternalIDs:   external,
-    }
-}
-
-func mapKPTypeToUnified(kp *KPFilm) string {
-    if kp.Serial || kp.Type == "TV_SERIES" || kp.Type == "MINI_SERIES" {
-        return "tv"
-    }
-    return "movie"
-}
-
-func firstNonEmpty(values ...string) string {
-    for _, v := range values {
-        if strings.TrimSpace(v) != "" {
-            return v
-        }
-    }
-    return ""
-}
-
 func MapKPSearchToTMDBResponse(kpSearch *KPSearchResponse) *models.TMDBResponse {
 	if kpSearch == nil {
 		return &models.TMDBResponse{
@@ -388,37 +305,3 @@ func FormatKPDate(year int) string {
 	}
 	return fmt.Sprintf("%d-01-01", year)
 }
-
-// EnrichKPWithTMDBID обогащает KP контент TMDB ID через IMDB ID
-func EnrichKPWithTMDBID(content *models.UnifiedContent, tmdbService *TMDBService) {
-	if content == nil || content.IMDbID == "" || content.ExternalIDs.TMDB != nil {
-		return
-	}
-	
-	mediaType := "movie"
-	if content.Type == "tv" {
-		mediaType = "tv"
-	}
-	
-	if tmdbID, err := tmdbService.FindTMDBIdByIMDB(content.IMDbID, mediaType, "ru-RU"); err == nil {
-		content.ExternalIDs.TMDB = &tmdbID
-	}
-}
-
-// EnrichKPSearchItemsWithTMDBID обогащает массив поисковых элементов TMDB ID
-func EnrichKPSearchItemsWithTMDBID(items []models.UnifiedSearchItem, tmdbService *TMDBService) {
-	for i := range items {
-		if items[i].ExternalIDs.IMDb == "" || items[i].ExternalIDs.TMDB != nil {
-			continue
-		}
-		
-		mediaType := "movie"
-		if items[i].Type == "tv" {
-			mediaType = "tv"
-		}
-		
-		if tmdbID, err := tmdbService.FindTMDBIdByIMDB(items[i].ExternalIDs.IMDb, mediaType, "ru-RU"); err == nil {
-			items[i].ExternalIDs.TMDB = &tmdbID
-		}
-	}
-}

pkg/services/movie.go

@@ -30,40 +30,41 @@ func (s *MovieService) Search(query string, page int, language, region string, y
 }
 
 func (s *MovieService) GetByID(id int, language string, idType string) (*models.Movie, error) {
-    // Строго уважаем явный id_type, без скрытого fallback на TMDB
-    switch idType {
-    case "kp":
-        if s.kpService == nil {
-            return nil, fmt.Errorf("kinopoisk service not configured")
-        }
-
-        // Сначала пробуем как Kinopoisk ID
-        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil {
-            // Возвращаем KP-модель в TMDB-формате без подмены на TMDB объект
-            return MapKPFilmToTMDBMovie(kpFilm), nil
-        }
-
-        // Возможно пришел TMDB ID — пробуем конвертировать TMDB -> KP
-        if kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id); convErr == nil {
-            if kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId); err == nil {
-                return MapKPFilmToTMDBMovie(kpFilm), nil
-            }
-        }
-        // Явно указан KP, но ничего не нашли — возвращаем ошибку
-        return nil, fmt.Errorf("film not found in Kinopoisk with id %d", id)
-
-    case "tmdb":
-        return s.tmdb.GetMovie(id, language)
-    }
-
-    // Если id_type не указан — старая логика по языку
-    if ShouldUseKinopoisk(language) && s.kpService != nil {
-        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil {
-            return MapKPFilmToTMDBMovie(kpFilm), nil
-        }
-    }
-
-    return s.tmdb.GetMovie(id, language)
+	// Если указан id_type, используем его; иначе определяем по языку
+	useKP := false
+	if idType == "kp" {
+		useKP = true
+	} else if idType == "tmdb" {
+		useKP = false
+	} else {
+		// Если id_type не указан, используем старую логику по языку
+		useKP = ShouldUseKinopoisk(language)
+	}
+	
+	if useKP && s.kpService != nil {
+		// Сначала пробуем напрямую по KP ID
+		kpFilm, err := s.kpService.GetFilmByKinopoiskId(id)
+		if err == nil {
+			return MapKPFilmToTMDBMovie(kpFilm), nil
+		}
+		
+		// Если не найдено и явно указан id_type=kp, возможно это TMDB ID
+		// Пробуем конвертировать TMDB -> KP
+		if idType == "kp" {
+			kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id)
+			if convErr == nil {
+				kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId)
+				if err == nil {
+					return MapKPFilmToTMDBMovie(kpFilm), nil
+				}
+			}
+			// Если конвертация не удалась, возвращаем ошибку вместо fallback
+			return nil, fmt.Errorf("film not found in Kinopoisk with id %d", id)
+		}
+	}
+	
+	// Для TMDB или если KP не указан
+	return s.tmdb.GetMovie(id, language)
 }
 
 func (s *MovieService) GetPopular(page int, language, region string) (*models.TMDBResponse, error) {
@@ -108,14 +109,6 @@ func (s *MovieService) GetExternalIDs(id int) (*models.ExternalIDs, error) {
 		if err == nil && kpFilm != nil {
 			externalIDs := MapKPExternalIDsToTMDB(kpFilm)
 			externalIDs.ID = id
-			
-			// Пытаемся получить TMDB ID через IMDB ID
-			if kpFilm.ImdbId != "" && s.tmdb != nil {
-				if tmdbID, tmdbErr := s.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "movie", "ru-RU"); tmdbErr == nil {
-					externalIDs.TMDBID = tmdbID
-				}
-			}
-			
 			return externalIDs, nil
 		}
 	}

pkg/services/tmdb.go

@@ -1,14 +1,13 @@
 package services
 
 import (
-    "encoding/json"
-    "fmt"
-    "net/http"
-    "net/url"
-    "strconv"
-    "time"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
 
-    "neomovies-api/pkg/models"
+	"neomovies-api/pkg/models"
 )
 
 type TMDBService struct {
@@ -18,16 +17,11 @@ type TMDBService struct {
 }
 
 func NewTMDBService(accessToken string) *TMDBService {
-    transport := &http.Transport{
-        MaxIdleConns:        100,
-        MaxIdleConnsPerHost: 10,
-        IdleConnTimeout:     60 * time.Second,
-    }
-    return &TMDBService{
-        accessToken: accessToken,
-        baseURL:     "https://api.themoviedb.org/3",
-        client:      &http.Client{Timeout: 10 * time.Second, Transport: transport},
-    }
+	return &TMDBService{
+		accessToken: accessToken,
+		baseURL:     "https://api.themoviedb.org/3",
+		client:      &http.Client{},
+	}
 }
 
 func (s *TMDBService) makeRequest(endpoint string, target interface{}) error {
@@ -185,56 +179,6 @@ func (s *TMDBService) GetTVShow(id int, language string) (*models.TVShow, error)
 	return &tvShow, err
 }
 
-// FindTMDBIdByIMDB finds TMDB IDs by external IMDb ID using /find/{external_id}
-// media: "movie" | "tv" | "" (auto)
-func (s *TMDBService) FindTMDBIdByIMDB(imdbID string, media string, language string) (int, error) {
-    if imdbID == "" {
-        return 0, fmt.Errorf("imdb id is empty")
-    }
-    if language == "" {
-        language = "ru-RU"
-    }
-    params := url.Values{}
-    params.Set("external_source", "imdb_id")
-    params.Set("language", language)
-    endpoint := fmt.Sprintf("%s/find/%s?%s", s.baseURL, url.PathEscape(imdbID), params.Encode())
-
-    var resp struct {
-        MovieResults     []struct{ ID int `json:"id"` } `json:"movie_results"`
-        TVResults        []struct{ ID int `json:"id"` } `json:"tv_results"`
-        TVEpisodeResults []struct{ ShowID int `json:"show_id"` } `json:"tv_episode_results"`
-        TVSeasonResults  []struct{ ShowID int `json:"show_id"` } `json:"tv_season_results"`
-    }
-    if err := s.makeRequest(endpoint, &resp); err != nil {
-        return 0, err
-    }
-
-    switch media {
-    case "movie":
-        if len(resp.MovieResults) > 0 {
-            return resp.MovieResults[0].ID, nil
-        }
-    case "tv":
-        if len(resp.TVResults) > 0 {
-            return resp.TVResults[0].ID, nil
-        }
-    default:
-        if len(resp.MovieResults) > 0 {
-            return resp.MovieResults[0].ID, nil
-        }
-        if len(resp.TVResults) > 0 {
-            return resp.TVResults[0].ID, nil
-        }
-        if len(resp.TVSeasonResults) > 0 {
-            return resp.TVSeasonResults[0].ShowID, nil
-        }
-        if len(resp.TVEpisodeResults) > 0 {
-            return resp.TVEpisodeResults[0].ShowID, nil
-        }
-    }
-    return 0, fmt.Errorf("tmdb id not found for imdb %s", imdbID)
-}
-
 func (s *TMDBService) GetGenres(mediaType string, language string) (*models.GenresResponse, error) {
 	params := url.Values{}
 

pkg/services/tv.go

@@ -26,54 +26,41 @@ func (s *TVService) Search(query string, page int, language string, year int) (*
 }
 
 func (s *TVService) GetByID(id int, language string, idType string) (*models.TVShow, error) {
-    // Строго уважаем явный id_type, без скрытого fallback на TMDB
-    switch idType {
-    case "kp":
-        if s.kpService == nil {
-            return nil, fmt.Errorf("kinopoisk service not configured")
-        }
-
-        // Сначала пробуем как Kinopoisk ID
-        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil && kpFilm != nil {
-            // Попробуем обогатить TMDB сериал через IMDb -> TMDB find
-            if kpFilm.ImdbId != "" {
-                if tmdbID, fErr := s.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "tv", NormalizeLanguage(language)); fErr == nil {
-                    if tmdbTV, mErr := s.tmdb.GetTVShow(tmdbID, NormalizeLanguage(language)); mErr == nil {
-                        return tmdbTV, nil
-                    }
-                }
-            }
-            return MapKPFilmToTVShow(kpFilm), nil
-        }
-
-        // Возможно пришел TMDB ID — пробуем конвертировать TMDB -> KP
-        if kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id); convErr == nil {
-            if kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId); err == nil && kpFilm != nil {
-                if kpFilm.ImdbId != "" {
-                    if tmdbID, fErr := s.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "tv", NormalizeLanguage(language)); fErr == nil {
-                        if tmdbTV, mErr := s.tmdb.GetTVShow(tmdbID, NormalizeLanguage(language)); mErr == nil {
-                            return tmdbTV, nil
-                        }
-                    }
-                }
-                return MapKPFilmToTVShow(kpFilm), nil
-            }
-        }
-        // Явно указан KP, но ничего не нашли — возвращаем ошибку
-        return nil, fmt.Errorf("TV show not found in Kinopoisk with id %d", id)
-
-    case "tmdb":
-        return s.tmdb.GetTVShow(id, language)
-    }
-
-    // Если id_type не указан — старая логика по языку
-    if ShouldUseKinopoisk(language) && s.kpService != nil {
-        if kpFilm, err := s.kpService.GetFilmByKinopoiskId(id); err == nil && kpFilm != nil {
-            return MapKPFilmToTVShow(kpFilm), nil
-        }
-    }
-
-    return s.tmdb.GetTVShow(id, language)
+	// Если указан id_type, используем его; иначе определяем по языку
+	useKP := false
+	if idType == "kp" {
+		useKP = true
+	} else if idType == "tmdb" {
+		useKP = false
+	} else {
+		// Если id_type не указан, используем старую логику по языку
+		useKP = ShouldUseKinopoisk(language)
+	}
+	
+	if useKP && s.kpService != nil {
+		// Сначала пробуем напрямую по KP ID
+		kpFilm, err := s.kpService.GetFilmByKinopoiskId(id)
+		if err == nil && kpFilm != nil {
+			return MapKPFilmToTVShow(kpFilm), nil
+		}
+		
+		// Если не найдено и явно указан id_type=kp, возможно это TMDB ID
+		// Пробуем конвертировать TMDB -> KP
+		if idType == "kp" {
+			kpId, convErr := TmdbIdToKPId(s.tmdb, s.kpService, id)
+			if convErr == nil {
+				kpFilm, err := s.kpService.GetFilmByKinopoiskId(kpId)
+				if err == nil && kpFilm != nil {
+					return MapKPFilmToTVShow(kpFilm), nil
+				}
+			}
+			// Если конвертация не удалась, возвращаем ошибку вместо fallback
+			return nil, fmt.Errorf("TV show not found in Kinopoisk with id %d", id)
+		}
+	}
+	
+	// Для TMDB или если KP не указан
+	return s.tmdb.GetTVShow(id, language)
 }
 
 func (s *TVService) GetPopular(page int, language string) (*models.TMDBTVResponse, error) {
@@ -101,34 +88,5 @@ func (s *TVService) GetSimilar(id, page int, language string) (*models.TMDBTVRes
 }
 
 func (s *TVService) GetExternalIDs(id int) (*models.ExternalIDs, error) {
-	if s.kpService != nil {
-		kpFilm, err := s.kpService.GetFilmByKinopoiskId(id)
-		if err == nil && kpFilm != nil {
-			externalIDs := MapKPExternalIDsToTMDB(kpFilm)
-			externalIDs.ID = id
-			
-			// Пытаемся получить TMDB ID через IMDB ID
-			if kpFilm.ImdbId != "" && s.tmdb != nil {
-				if tmdbID, tmdbErr := s.tmdb.FindTMDBIdByIMDB(kpFilm.ImdbId, "tv", "ru-RU"); tmdbErr == nil {
-					externalIDs.TMDBID = tmdbID
-				}
-			}
-			
-			return externalIDs, nil
-		}
-	}
-	
-	tmdbIDs, err := s.tmdb.GetTVExternalIDs(id)
-	if err != nil {
-		return nil, err
-	}
-	
-	if s.kpService != nil && tmdbIDs.IMDbID != "" {
-		kpFilm, err := s.kpService.GetFilmByImdbId(tmdbIDs.IMDbID)
-		if err == nil && kpFilm != nil {
-			tmdbIDs.KinopoiskID = kpFilm.KinopoiskId
-		}
-	}
-	
-	return tmdbIDs, nil
+	return s.tmdb.GetTVExternalIDs(id)
 }

pkg/services/unified_mapper.go

@@ -1,275 +0,0 @@
-package services
-
-import (
-    "fmt"
-    "net/url"
-    "strconv"
-    "strings"
-
-    "neomovies-api/pkg/models"
-)
-
-const tmdbImageBase = "https://image.tmdb.org/t/p"
-
-// BuildAPIImageProxyURL строит относительный URL до нашего прокси-эндпоинта изображений.
-// Если передан абсолютный URL (KP и пр.) — он кодируется и передаётся как path параметр.
-// Если передан относительный TMDB-путь, он используется как есть (без ведущего '/').
-func BuildAPIImageProxyURL(pathOrURL string, size string) string {
-    if strings.TrimSpace(pathOrURL) == "" {
-        return ""
-    }
-    if size == "" {
-        size = "w500"
-    }
-    // Абсолютные ссылки (Kinopoisk и пр.) — кодируем целиком
-    if strings.HasPrefix(pathOrURL, "http://") || strings.HasPrefix(pathOrURL, "https://") {
-        return fmt.Sprintf("/api/v1/images/%s/%s", size, url.QueryEscape(pathOrURL))
-    }
-    // TMDB относительный путь
-    clean := pathOrURL
-    if strings.HasPrefix(clean, "/") {
-        clean = clean[1:]
-    }
-    return fmt.Sprintf("/api/v1/images/%s/%s", size, clean)
-}
-
-func MapTMDBToUnifiedMovie(movie *models.Movie, external *models.ExternalIDs) *models.UnifiedContent {
-    if movie == nil {
-        return nil
-    }
-
-    genres := make([]models.UnifiedGenre, 0, len(movie.Genres))
-    for _, g := range movie.Genres {
-        name := strings.TrimSpace(g.Name)
-        id := strings.ToLower(strings.ReplaceAll(name, " ", "-"))
-        if id == "" {
-            id = strconv.Itoa(g.ID)
-        }
-        genres = append(genres, models.UnifiedGenre{ID: id, Name: name})
-    }
-
-    var imdb string
-    if external != nil {
-        imdb = external.IMDbID
-    }
-
-    var budgetPtr *int64
-    if movie.Budget > 0 {
-        v := movie.Budget
-        budgetPtr = &v
-    }
-    var revenuePtr *int64
-    if movie.Revenue > 0 {
-        v := movie.Revenue
-        revenuePtr = &v
-    }
-
-    ext := models.UnifiedExternalIDs{
-        KP:   nil,
-        TMDB: &movie.ID,
-        IMDb: imdb,
-    }
-
-    return &models.UnifiedContent{
-        ID:            strconv.Itoa(movie.ID),
-        SourceID:      "tmdb_" + strconv.Itoa(movie.ID),
-        Title:         movie.Title,
-        OriginalTitle: movie.OriginalTitle,
-        Description:   movie.Overview,
-        ReleaseDate:   movie.ReleaseDate,
-        EndDate:       nil,
-        Type:          "movie",
-        Genres:        genres,
-        Rating:        movie.VoteAverage,
-        PosterURL:     BuildAPIImageProxyURL(movie.PosterPath, "w500"),
-        BackdropURL:   BuildAPIImageProxyURL(movie.BackdropPath, "w1280"),
-        Director:      "",
-        Cast:          []models.UnifiedCastMember{},
-        Duration:      movie.Runtime,
-        Country:       firstCountry(movie.ProductionCountries),
-        Language:      movie.OriginalLanguage,
-        Budget:        budgetPtr,
-        Revenue:       revenuePtr,
-        IMDbID:        imdb,
-        ExternalIDs:   ext,
-    }
-}
-
-func MapTMDBTVToUnified(tv *models.TVShow, external *models.ExternalIDs) *models.UnifiedContent {
-    if tv == nil {
-        return nil
-    }
-
-    genres := make([]models.UnifiedGenre, 0, len(tv.Genres))
-    for _, g := range tv.Genres {
-        name := strings.TrimSpace(g.Name)
-        id := strings.ToLower(strings.ReplaceAll(name, " ", "-"))
-        if id == "" {
-            id = strconv.Itoa(g.ID)
-        }
-        genres = append(genres, models.UnifiedGenre{ID: id, Name: name})
-    }
-
-    var imdb string
-    if external != nil {
-        imdb = external.IMDbID
-    }
-
-    endDate := (*string)(nil)
-    if strings.TrimSpace(tv.LastAirDate) != "" {
-        v := tv.LastAirDate
-        endDate = &v
-    }
-
-    ext := models.UnifiedExternalIDs{
-        KP:   nil,
-        TMDB: &tv.ID,
-        IMDb: imdb,
-    }
-
-    duration := 0
-    if len(tv.EpisodeRunTime) > 0 {
-        duration = tv.EpisodeRunTime[0]
-    }
-
-    unified := &models.UnifiedContent{
-        ID:            strconv.Itoa(tv.ID),
-        SourceID:      "tmdb_" + strconv.Itoa(tv.ID),
-        Title:         tv.Name,
-        OriginalTitle: tv.OriginalName,
-        Description:   tv.Overview,
-        ReleaseDate:   tv.FirstAirDate,
-        EndDate:       endDate,
-        Type:          "tv",
-        Genres:        genres,
-        Rating:        tv.VoteAverage,
-        PosterURL:     BuildAPIImageProxyURL(tv.PosterPath, "w500"),
-        BackdropURL:   BuildAPIImageProxyURL(tv.BackdropPath, "w1280"),
-        Director:      "",
-        Cast:          []models.UnifiedCastMember{},
-        Duration:      duration,
-        Country:       firstCountry(tv.ProductionCountries),
-        Language:      tv.OriginalLanguage,
-        Budget:        nil,
-        Revenue:       nil,
-        IMDbID:        imdb,
-        ExternalIDs:   ext,
-    }
-
-    // Map seasons basic info
-    if len(tv.Seasons) > 0 {
-        unified.Seasons = make([]models.UnifiedSeason, 0, len(tv.Seasons))
-        for _, s := range tv.Seasons {
-            unified.Seasons = append(unified.Seasons, models.UnifiedSeason{
-                ID:           strconv.Itoa(s.ID),
-                SourceID:     "tmdb_" + strconv.Itoa(s.ID),
-                Name:         s.Name,
-                SeasonNumber: s.SeasonNumber,
-                EpisodeCount: s.EpisodeCount,
-                ReleaseDate:  s.AirDate,
-                PosterURL:    BuildAPIImageProxyURL(s.PosterPath, "w500"),
-            })
-        }
-    }
-
-    return unified
-}
-
-func MapTMDBMultiToUnifiedItems(m *models.MultiSearchResponse) []models.UnifiedSearchItem {
-    if m == nil {
-        return []models.UnifiedSearchItem{}
-    }
-    items := make([]models.UnifiedSearchItem, 0, len(m.Results))
-    for _, r := range m.Results {
-        if r.MediaType != "movie" && r.MediaType != "tv" {
-            continue
-        }
-        title := r.Title
-        if r.MediaType == "tv" {
-            title = r.Name
-        }
-        release := r.ReleaseDate
-        if r.MediaType == "tv" {
-            release = r.FirstAirDate
-        }
-        poster := BuildAPIImageProxyURL(r.PosterPath, "w500")
-        tmdbId := r.ID
-        items = append(items, models.UnifiedSearchItem{
-            ID:          strconv.Itoa(tmdbId),
-            SourceID:    "tmdb_" + strconv.Itoa(tmdbId),
-            Title:       title,
-            Type:        map[string]string{"movie":"movie","tv":"tv"}[r.MediaType],
-            ReleaseDate: release,
-            PosterURL:   poster,
-            Rating:      r.VoteAverage,
-            Description: r.Overview,
-            ExternalIDs: models.UnifiedExternalIDs{KP: nil, TMDB: &tmdbId, IMDb: ""},
-        })
-    }
-    return items
-}
-
-func MapKPSearchToUnifiedItems(kps *KPSearchResponse) []models.UnifiedSearchItem {
-    if kps == nil {
-        return []models.UnifiedSearchItem{}
-    }
-    items := make([]models.UnifiedSearchItem, 0, len(kps.Films))
-    for _, f := range kps.Films {
-        title := f.NameRu
-        if strings.TrimSpace(title) == "" {
-            title = f.NameEn
-        }
-        poster := f.PosterUrlPreview
-        if poster == "" {
-            poster = f.PosterUrl
-        }
-        poster = BuildAPIImageProxyURL(poster, "w500")
-        rating := 0.0
-        if strings.TrimSpace(f.Rating) != "" {
-            if v, err := strconv.ParseFloat(f.Rating, 64); err == nil {
-                rating = v
-            }
-        }
-        kpId := f.FilmId
-        items = append(items, models.UnifiedSearchItem{
-            ID:          strconv.Itoa(kpId),
-            SourceID:    "kp_" + strconv.Itoa(kpId),
-            Title:       title,
-            Type:        mapKPTypeToUnifiedShort(f.Type),
-            OriginalType: strings.ToUpper(strings.TrimSpace(f.Type)),
-            ReleaseDate: yearToDate(f.Year),
-            PosterURL:   poster,
-            Rating:      rating,
-            Description: f.Description,
-            ExternalIDs: models.UnifiedExternalIDs{KP: &kpId, TMDB: nil, IMDb: ""},
-        })
-    }
-    return items
-}
-
-func mapKPTypeToUnifiedShort(t string) string {
-    switch strings.ToUpper(strings.TrimSpace(t)) {
-    case "TV_SERIES", "MINI_SERIES":
-        return "tv"
-    default:
-        return "movie"
-    }
-}
-
-func yearToDate(y string) string {
-    y = strings.TrimSpace(y)
-    if y == "" {
-        return ""
-    }
-    return y + "-01-01"
-}
-
-func firstCountry(countries []models.ProductionCountry) string {
-    if len(countries) == 0 {
-        return ""
-    }
-    if strings.TrimSpace(countries[0].Name) != "" {
-        return countries[0].Name
-    }
-    return countries[0].ISO31661
-}