fix: bugs

Author: sshaplygin

ogrn/models.go

@@ -80,15 +80,21 @@ type serialNumbers struct {
 }
 
 func (sn serialNumbers) IsValid() bool {
-	return false
+	maxL := 0
+	for i := 0; i < sn.len; i++ {
+		maxL = maxL*10 + 9
+	}
+	return sn.val >= 0 && sn.val <= maxL
 }
 
 func (sn serialNumbers) String() string {
 	return utils.StrCode(sn.val, sn.len)
 }
 
 func (sn serialNumbers) Ints() []int {
-	return nil
+	res := make([]int, sn.len)
+	utils.FillSlice(utils.CodeToInts(int(sn.val)), res, sn.len-1)
+	return res
 }
 
 type checkSum int
@@ -126,9 +132,9 @@ func GenerateYearsNumbers() YearsNumbers {
 }
 
 func GenerateSerialNumbers(ogrnType OGRNType) serialNumbers {
-	n := legalLength
+	n := legalCodeLength
 	if ogrnType == Physical {
-		n = physicalLength
+		n = physicalCodeLength
 	}
 
 	return serialNumbers{
@@ -271,7 +277,8 @@ func (o *OGRNStruct) makeSliceInts() []int {
 
 	utils.FillSlice(o.yearsNumbers.Ints(), res, 2)
 	utils.FillSlice(o.region.Ints(), res, 4)
-	utils.FillSlice(o.serialNumbers.Ints(), res, n-1)
+	fmt.Println("fillSlice", o.serialNumbers.Ints(), res)
+	utils.FillSlice(o.serialNumbers.Ints(), res, n-2)
 
 	return res
 }

ogrn/ogrn_test.go

@@ -1,7 +1,6 @@
 package ogrn
 
 import (
-	"errors"
 	"fmt"
 	"testing"
 
@@ -81,12 +80,16 @@ func TestValidate(t *testing.T) {
 			},
 		}
 
-		for _, tc := range testCases {
+		for i, tc := range testCases {
 			tc := tc
 
 			isValid, err := Validate(tc.Code)
-			assert.Equal(t, tc.IsValid, isValid, tc.Code, tc.IsValid)
-			assert.Equal(t, true, errors.Is(tc.Error, err), tc.Code)
+			assert.Equal(t, tc.IsValid, isValid, tc.Code)
+			if err != nil {
+				assert.ErrorAs(t, err, &tc.Error, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
+			} else {
+				assert.Empty(t, err, fmt.Sprintf("invalid test case %d: input: %s", i, tc.Code))
+			}
 		}
 	})
 }