iter8 fix Generate func

ByteDSM · Oct 30, 2023 · 7e73691 · 7e73691
1 parent dda4cfa
commit 7e73691
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/internal/middlewares/middlewares.go b/internal/middlewares/middlewares.go
@@ -83,7 +83,7 @@ func (c *compressWriter) Write(p []byte) (int, error) {
 }
 
 func (c *compressWriter) WriteHeader(statusCode int) {
-	if statusCode < 300 {
+	if statusCode < 400 {
 		c.w.Header().Set("Content-Encoding", "gzip")
 	}
 	c.w.WriteHeader(statusCode)

diff --git a/internal/shotenermaker/makeurl.go b/internal/shotenermaker/makeurl.go
@@ -1,10 +1,17 @@
 package shotenermaker
 
-import "encoding/base64"
+import (
+	"crypto/sha1"
+	"encoding/hex"
+)
 
 // GenerateID Функция для генерации уникального идентификатора
 func GenerateID(fullURL []byte) string {
-	encodedStr := base64.URLEncoding.EncodeToString(fullURL)
+	h := sha1.New()
+	h.Write(fullURL)
+	hashBytes := h.Sum(nil)
+	encodedStr := hex.EncodeToString(hashBytes)
+
 	// Возвращаем первые 6 символов закодированной строки
 	if len(encodedStr) > 6 {
 		return encodedStr[:6]

diff --git a/internal/storage/urlstorage.go b/internal/storage/urlstorage.go
@@ -8,8 +8,8 @@ func NewURLStorage() *URLStorage {
 	storage := &URLStorage{
 		urlMap: make(map[string]string),
 	}
-	// Adding Test Compliance
-	storage.AddURL("aHR0cH", "https://practicum.yandex.ru/")
+	// Adding Test Compliance TEST
+	//storage.AddURL("aHR0cH", "https://practicum.yandex.ru/")
 	return storage
 }