From 24eb1a275fce6a5682d970c24a614ad7d0bb82dc Mon Sep 17 00:00:00 2001
From: Nikitin Aleksandr <nikitinav@atomsbt.ru>
Date: Thu, 26 Sep 2024 15:27:33 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20Int32Fro?=
 =?UTF-8?q?mString()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 micro/microfunctions.go      | 11 ++++++++---
 micro/microfunctions_test.go |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/micro/microfunctions.go b/micro/microfunctions.go
index 06614763..6fc23c5e 100644
--- a/micro/microfunctions.go
+++ b/micro/microfunctions.go
@@ -980,11 +980,16 @@ func IsInt(s string) bool {
 }
 
 // Int32FromString - возвращает int32 из строки
-func Int32FromString(s string) (int64, error) {
-	var Otvet int64
+func Int32FromString(s string) (int32, error) {
+	var Otvet int32
 	var err error
 
-	Otvet, err = strconv.ParseInt(s, 10, 32)
+	Otvet64, err := strconv.ParseInt(s, 10, 32)
+	if err != nil {
+		return Otvet, err
+	}
+
+	Otvet = int32(Otvet64)
 
 	return Otvet, err
 }
diff --git a/micro/microfunctions_test.go b/micro/microfunctions_test.go
index f9b2ff7d..7f21811a 100644
--- a/micro/microfunctions_test.go
+++ b/micro/microfunctions_test.go
@@ -877,7 +877,7 @@ func TestIsInt(t *testing.T) {
 func TestInt32FromString(t *testing.T) {
 	// Test converting a valid string to int32
 	input1 := "12345"
-	expected1 := int64(12345)
+	expected1 := int32(12345)
 	result1, err1 := Int32FromString(input1)
 	if err1 != nil {
 		t.Errorf("Expected no error, but got: %v", err1)
@@ -888,7 +888,7 @@ func TestInt32FromString(t *testing.T) {
 
 	// Test converting an empty string to int32
 	input2 := ""
-	expected2 := int64(0)
+	expected2 := int32(0)
 	result2, err2 := Int32FromString(input2)
 	if err2 == nil {
 		t.Errorf("Expected error, but got: %v", err2)
@@ -899,7 +899,7 @@ func TestInt32FromString(t *testing.T) {
 
 	// Test converting an invalid string to int32
 	input3 := "abc"
-	expected3 := int64(0)
+	expected3 := int32(0)
 	result3, err3 := Int32FromString(input3)
 	if err3 == nil {
 		t.Error("Expected an error, but got none")