From 91476a29b27299dcc234e60c55204b72aa707f0e Mon Sep 17 00:00:00 2001
From: Sergey Chubaryan <serghio2@yandex.ru>
Date: Fri, 23 Aug 2024 20:24:46 +0300
Subject: [PATCH] small RandomUtil prettification

---
 src/core/utils/random.go          | 37 +++++++++++++++----------------
 src/server/middleware/recovery.go |  2 ++
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/core/utils/random.go b/src/core/utils/random.go
index df07126..1d2b70b 100644
--- a/src/core/utils/random.go
+++ b/src/core/utils/random.go
@@ -16,54 +16,53 @@ const (
 	CharsetNumeric
 )
 
-type charsetPart struct {
+type charsetBlock struct {
 	Offset int
 	Size   int
 }
 
-var charsets = map[Charset][]charsetPart{}
-
 func NewRand() *RandomUtil {
-	charsetLettersLower := charsetPart{ //CharsetLettersLower
+	charsetLettersLower := charsetBlock{
 		Offset: 0x41,
 		Size:   26,
 	}
 
-	charsetLettersUpper := charsetPart{ //CharsetLettersUpper
+	charsetLettersUpper := charsetBlock{
 		Offset: 0x61,
 		Size:   26,
 	}
 
-	charsetNumeric := charsetPart{ //CharsetLettersNumeric
+	charsetNumeric := charsetBlock{
 		Offset: 0x30,
 		Size:   10,
 	}
 
-	charsets = map[Charset][]charsetPart{
-		CharsetNumeric:      {charsetNumeric},
-		CharsetLettersLower: {charsetLettersLower},
-		CharsetLettersUpper: {charsetLettersUpper},
-		CharsetLetters:      {charsetLettersLower, charsetLettersUpper},
-		CharsetAll:          {charsetLettersLower, charsetLettersUpper, charsetNumeric},
+	return &RandomUtil{
+		charsets: map[Charset][]charsetBlock{
+			CharsetNumeric:      {charsetNumeric},
+			CharsetLettersLower: {charsetLettersLower},
+			CharsetLettersUpper: {charsetLettersUpper},
+			CharsetLetters:      {charsetLettersLower, charsetLettersUpper},
+			CharsetAll:          {charsetLettersLower, charsetLettersUpper, charsetNumeric},
+		},
 	}
-
-	return &RandomUtil{}
 }
 
-type RandomUtil struct{}
+type RandomUtil struct {
+	charsets map[Charset][]charsetBlock
+}
 
 func (r *RandomUtil) RandomID(outputLenght int, charset Charset) string {
 	src := rand.NewSource(time.Now().UnixMicro())
 	randGen := rand.New(src)
 
-	charsetData := charsets[charset]
+	charsetBlocks := r.charsets[charset]
 
 	builder := strings.Builder{}
 	for i := 0; i < outputLenght; i++ {
-		charsetIdx := randGen.Int() % len(charsetData)
-		charsetPart := charsetData[charsetIdx]
+		charsetBlock := charsetBlocks[randGen.Int()%len(charsetBlocks)]
 
-		byte := charsetPart.Offset + (randGen.Int() % charsetPart.Size)
+		byte := charsetBlock.Offset + (randGen.Int() % charsetBlock.Size)
 		builder.WriteRune(rune(byte))
 	}
 	return builder.String()
diff --git a/src/server/middleware/recovery.go b/src/server/middleware/recovery.go
index 5957e94..016bc62 100644
--- a/src/server/middleware/recovery.go
+++ b/src/server/middleware/recovery.go
@@ -1,5 +1,7 @@
 package middleware
 
+// Modified recovery from gin, use own logger
+
 import (
 	"backend/src/logger"
 	"bytes"