Добавил Радиус не обязательным параметром при запросе

cmd/server/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"elastic-service/internal"
 	"elastic-service/internal/handlers"
-	pb "elastic-service/pkg/api" // Import generated proto package
+	pb "elastic-service/pkg/api"
 	"github.com/joho/godotenv"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
@@ -20,7 +20,6 @@ func main() {
 		return
 	}
 
-	// Get port from command-line argument or use default
 	defaultPort := strconv.Itoa(internal.DefaultPort)
 
 	configuredPort := os.Getenv("PORT")

internal/elastic_client.go

@@ -73,13 +73,17 @@ func (ec *ElasticsearchClient) SearchByName(name string) ([]*pb.City, error) {
 }
 
 // SearchByCoords searches for a city by coordinates
-func (ec *ElasticsearchClient) SearchByCoords(coords *pb.Coords) ([]*pb.City, error) {
+func (ec *ElasticsearchClient) SearchByCoords(coords *pb.Coords, radius string) ([]*pb.City, error) {
 	distance := os.Getenv(geoDistance)
 
 	if distance == "" {
 		distance = defaultDistance
 	}
 
+	if radius != "" {
+		distance = radius
+	}
+
 	query := fmt.Sprintf(`{
 		"query": {
 			"bool": {

internal/elastic_client_test.go

@@ -78,7 +78,7 @@ func TestSearchMoscowByCoords(t *testing.T) {
 		Lon: 37.617777777778,
 	}
 
-	cities, err := ecClient.SearchByCoords(moscowCoords)
+	cities, err := ecClient.SearchByCoords(moscowCoords, defaultDistance)
 	assert.NoError(t, err, "Search by coords failed")
 	assert.NotEmpty(t, cities, "Expected at least one city, got none")
 
@@ -105,7 +105,7 @@ func TestSearchByNonExistentCoords(t *testing.T) {
 		Lon: 1000.0,
 	}
 
-	cities, err := ecClient.SearchByCoords(nonExistentCoords)
+	cities, err := ecClient.SearchByCoords(nonExistentCoords, defaultDistance)
 	assert.NoError(t, err, "Search by non-existent coordinates failed")
 	assert.Empty(t, cities, "Expected empty result for non-existent coordinates")
 }

internal/handlers/coords_handler.go

@@ -10,14 +10,15 @@ func (s *Server) SearchByCoords(ctx context.Context, req *pb.CoordsRequest) (*pb
 
 	lat := req.GetLat()
 	lon := req.GetLon()
+	radius := req.GetRadius()
 
 	coords, err := pb.NewCoords(lat, lon)
 	if err != nil {
 		response.Code = pb.CitySearchCoordsResponse_INVALID_COORDS
 		return response, nil
 	}
 
-	cities, err := s.client.SearchByCoords(coords)
+	cities, err := s.client.SearchByCoords(coords, radius)
 	if err != nil {
 		response.Code = pb.CitySearchCoordsResponse_INTERNAL_ERROR_COORDS
 		return response, nil

proto/elastic_service.proto

@@ -39,15 +39,14 @@ message CitySearchCoordsResponse{
   repeated City options = 2;
 }
 
-
-
 message CityNameRequest {
   string name = 1;
 }
 
 message CoordsRequest {
   float lat = 1;
   float lon = 2;
+  optional string radius = 3;
 }