grpc

nglmq · Sep 2, 2024 · cd21794 · cd21794
1 parent b1615fa
commit cd21794
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/internal/app/grpc/handlers/handlers.go b/internal/app/grpc/handlers/handlers.go
@@ -45,7 +45,7 @@ func (s *URLShortenerServer) SaveJSON(ctx context.Context, req *pb.SaveJSONReque
 		return nil, fmt.Errorf("failed to save URL to database: %v", err)
 	}
 
-	shortURL := fmt.Sprintf(config.FlagBaseURL + "/" + existAlias)
+	shortURL := config.FlagBaseURL + "/" + existAlias
 	return &pb.SaveJSONResponse{ShortUrl: shortURL}, nil
 }
 
@@ -61,7 +61,7 @@ func (s *URLShortenerServer) SaveJSONBatch(ctx context.Context, req *pb.SaveJSON
 			return nil, fmt.Errorf("failed to save URL to database: %v", err)
 		}
 
-		shortURL := fmt.Sprintf(config.FlagBaseURL + "/" + existAlias)
+		shortURL := config.FlagBaseURL + "/" + existAlias
 		results = append(results, &pb.BatchURLResponse{
 			CorrelationId: batchReq.GetCorrelationId(),
 			ShortUrl:      shortURL,
@@ -91,7 +91,7 @@ func (s *URLShortenerServer) GetAllURLs(ctx context.Context, req *pb.GetAllURLsR
 	var urlMappings []*pb.URLMapping
 	for alias, originalURL := range urls {
 		urlMappings = append(urlMappings, &pb.URLMapping{
-			ShortUrl:    fmt.Sprintf(config.FlagBaseURL + "/" + alias),
+			ShortUrl:    config.FlagBaseURL + "/" + alias,
 			OriginalUrl: originalURL,
 		})
 	}

diff --git a/internal/app/grpc/server/server.go b/internal/app/grpc/server/server.go
@@ -31,19 +31,6 @@ func StartGRPCServer() error {
 		shortener.DBStorage = dbStorage
 	}
 
-	if config.FlagInMemoryStorage != "" && config.DBConnection == "" {
-		fileStore, err := storage.NewFileStorage(config.FlagInMemoryStorage)
-		if err != nil {
-			return err
-		}
-		shortener.FileStorage = fileStore
-
-		if err = fileStore.ReadURLsFromFile(store.URLs); err != nil {
-			log.Printf("Error reading URLs from file: %v", err)
-			return err
-		}
-	}
-
 	lis, err := net.Listen("tcp", ":3200")
 	if err != nil {
 		return fmt.Errorf("failed to listen: %w", err)

diff --git a/internal/app/handlers/json_request.go b/internal/app/handlers/json_request.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"encoding/json"
-	"fmt"
 	"log/slog"
 	"net/http"
 	"strconv"
@@ -89,7 +88,7 @@ func (us *URLShortener) JSONHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		if existAlias != alias {
-			shortenedURL := fmt.Sprintf(config.FlagBaseURL + "/" + existAlias)
+			shortenedURL := config.FlagBaseURL + "/" + existAlias
 			contentLength := len(shortenedURL)
 
 			responseJSON = JSONResponse{
@@ -129,7 +128,7 @@ func (us *URLShortener) JSONHandler(w http.ResponseWriter, r *http.Request) {
 	//	}
 	//}
 
-	shortenedURL := fmt.Sprintf(config.FlagBaseURL + "/" + alias)
+	shortenedURL := config.FlagBaseURL + "/" + alias
 	contentLength := len(shortenedURL)
 
 	responseJSON = JSONResponse{
@@ -228,7 +227,7 @@ func (us *URLShortener) JSONBatchHandler(w http.ResponseWriter, r *http.Request)
 
 		responseJSON[i] = JSONBatchResponse{
 			CorrelationID: req.CorrelationID,
-			ShortURL:      fmt.Sprintf(config.FlagBaseURL + "/" + alias),
+			ShortURL:      config.FlagBaseURL + "/" + alias,
 		}
 	}
 

diff --git a/internal/app/handlers/save.go b/internal/app/handlers/save.go
@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 	"strconv"
@@ -68,7 +67,7 @@ func (us *URLShortener) ShortURLHandler(w http.ResponseWriter, r *http.Request)
 			return
 		}
 		if existAlias != alias {
-			shortenedURL := fmt.Sprintf(config.FlagBaseURL + "/" + existAlias)
+			shortenedURL := config.FlagBaseURL + "/" + existAlias
 
 			contentLength := len(shortenedURL)
 
@@ -93,7 +92,7 @@ func (us *URLShortener) ShortURLHandler(w http.ResponseWriter, r *http.Request)
 		}
 	}
 
-	shortenedURL := fmt.Sprintf(config.FlagBaseURL + "/" + alias)
+	shortenedURL := config.FlagBaseURL + "/" + alias
 	contentLength := len(shortenedURL)
 
 	w.Header().Set("Content-Type", "text/plain")