add

Author: sshaplygin

bik/bik.go

@@ -42,6 +42,6 @@ func Exists(bik string) (bool, error) {
 
 // Generate method generate a valid BIK code, but possible usaged or not usaged in reality.
 // Method guaranteed that code will be valid, but not guaranteed that code will be exists.
-func Generate(opts ...GenerateOpt) string {
-	return NewBIK(opts...).String()
+func Generate() string {
+	return NewBIK().String()
 }

fts/fts.go

@@ -46,6 +46,18 @@ type TaxRegionCode struct {
 	serviceNumber RegionTaxServiceNumber
 }
 
+func (trc *TaxRegionCode) Ints() []int {
+	if trc == nil {
+		return nil
+	}
+
+	res := make([]int, 0, subjectCodeLength+regionTaxServiceNumberLength)
+	res = append(res, utils.CodeToInts(int(trc.subjectCode))...)
+	res = append(res, utils.CodeToInts(int(trc.serviceNumber))...)
+
+	return res
+}
+
 func (trc *TaxRegionCode) IsValid() bool {
 	if trc == nil {
 		return false

generate.go

@@ -0,0 +1,29 @@
+package docs_code
+
+import (
+	"github.com/sshaplygin/docs-code/bik"
+	"github.com/sshaplygin/docs-code/inn"
+	"github.com/sshaplygin/docs-code/kpp"
+)
+
+type GenerateFunc func() string
+
+func Generate(docType DocType) string {
+	var callFunc GenerateFunc
+	switch docType {
+	case BIK:
+		callFunc = bik.Generate
+	case INN:
+		callFunc = inn.Generate
+	case KPP:
+		callFunc = kpp.Generate
+	default:
+		panic("not implemented method")
+	}
+
+	if callFunc == nil {
+		panic("not implemented method")
+	}
+
+	return callFunc()
+}

generate_test.go

@@ -0,0 +1,7 @@
+package docs_code
+
+import "testing"
+
+func Test_Generate(t *testing.T) {
+
+}

inn/errors.go

@@ -0,0 +1,11 @@
+package inn
+
+import "errors"
+
+var (
+	// ErrNilINN try call methods for nil inn struct
+	ErrNilINN = errors.New("nil inn struct")
+
+	// ErrInvalidCheckSumsValue invalid check sums rune value
+	ErrInvalidCheckSumsValue = errors.New("invalid check sums rune value")
+)

inn/inn.go

@@ -1,103 +1,44 @@
 package inn
 
 import (
-	"strconv"
-	"strings"
+	"fmt"
 
-	"github.com/sshaplygin/docs-code/models"
 	"github.com/sshaplygin/docs-code/utils"
 )
 
 // Validate check to valid inn from input string.
 // example: input format is 7707083893
 func Validate(inn string) (bool, error) {
-	if !IsCompany(inn) && !IsEntrepreneur(inn) {
-		return false, &models.CommonError{
-			Method: packageName,
-			Err:    models.ErrInvalidLength,
-		}
-	}
-
-	innArr, err := transformInn(inn)
+	innData, err := ParseINN(inn)
 	if err != nil {
-		return false, err
-	}
-	if len(inn) == 10 {
-		return hash10(innArr) == innArr[len(innArr)-1], nil
+		return false, fmt.Errorf("parse %s model: %w", packageName, err)
 	}
 
-	return hash11(innArr) == innArr[len(innArr)-2] && hash12(innArr) == innArr[len(innArr)-1], nil
+	return innData.IsValid()
 }
 
-// Generate generate random type inn string value.
+// Generate generate random type inn string value
 func Generate() string {
-	if utils.RandomDigits(1)%2 == 1 {
-		return GeneratePhysical()
-	}
-
-	return GenerateLegal()
+	return NewINN(INNType(utils.RandomDigits(1) % 3)).String()
 }
 
-// IsEntrepreneur check inn for Entrepreneur type
-func IsEntrepreneur(inn string) bool {
-	return len(inn) == lengthPhysical
-}
-
-// IsCompany check inn for Company type
-func IsCompany(inn string) bool {
-	return len(inn) == lengthLegal
-}
-
-// GenerateLegal generate legal type inn string value.
+// GenerateLegal generate legal type inn string value
 func GenerateLegal() string {
-	inn := strconv.FormatInt(utils.RandomDigits(9), 10)
-	innArr, _ := transformInn(inn)
+	// inn := strconv.FormatInt(utils.RandomDigits(9), 10)
+	// innArr, _ := transformInn(inn)
 
-	return inn + strconv.Itoa(hash10(innArr))
+	// return strings.Join([]string{inn, strconv.Itoa(hash10(innArr))}, "")
+	return NewINN(INNType(utils.RandomDigits(1)%2 + 1)).String()
 }
 
-// GeneratePhysical generate physical type inn string value.
+// GeneratePhysical generate physical type inn string value
 func GeneratePhysical() string {
-	inn := strconv.FormatInt(utils.RandomDigits(10), 10)
-	innArr, _ := transformInn(inn)
-
-	hash1Num := hash11(innArr)
-	innArr = append(innArr, hash1Num)
+	// inn := strconv.FormatInt(utils.RandomDigits(10), 10)
+	// innArr, _ := transformInn(inn)
 
-	return strings.Join([]string{
-		inn,
-		strconv.Itoa(hash1Num),
-		strconv.Itoa(hash12(innArr)),
-	}, "")
-}
-
-func transformInn(inn string) ([]int, error) {
-	innNumbers := strings.Split(inn, "")
-	innArr := make([]int, 0, len(inn))
-
-	for _, str := range innNumbers {
-		number, err := strconv.Atoi(str)
-		if err != nil {
-			return nil, models.ErrInvalidValue
-		}
-		innArr = append(innArr, number)
-	}
-
-	return innArr, nil
-}
-
-func hash10(innArr []int) int {
-	return ((2*innArr[0] + 4*innArr[1] + 10*innArr[2] + 3*innArr[3] +
-		5*innArr[4] + 9*innArr[5] + 4*innArr[6] + 6*innArr[7] + 8*innArr[8]) % 11) % 10
-}
-
-func hash11(innArr []int) int {
-	return ((7*innArr[0] + 2*innArr[1] + 4*innArr[2] + 10*innArr[3] + 3*innArr[4] +
-		5*innArr[5] + 9*innArr[6] + 4*innArr[7] + 6*innArr[8] + 8*innArr[9]) % 11) % 10
-}
+	// hash1Num := hash11(innArr)
+	// innArr = append(innArr, hash1Num)
 
-func hash12(innArr []int) int {
-	return ((3*innArr[0] + 7*innArr[1] + 2*innArr[2] + 4*innArr[3] +
-		10*innArr[4] + 3*innArr[5] + 5*innArr[6] + 9*innArr[7] + 4*innArr[8] +
-		6*innArr[9] + 8*innArr[10]) % 11) % 10
+	// return strings.Join([]string{inn, strconv.Itoa(hash1Num), strconv.Itoa(hash12(innArr))}, "")
+	return NewINN(INNType(Physical)).String()
 }

inn/inn_test.go

@@ -34,12 +34,10 @@ func TestValidate(t *testing.T) {
 			},
 			{
 				Code:    "7707083893",
-				Error:   nil,
 				IsValid: true,
 			},
 			{
 				Code:    "526317984689",
-				Error:   nil,
 				IsValid: true,
 			},
 		}
@@ -70,23 +68,19 @@ func TestValidate(t *testing.T) {
 				IsValid: false,
 			},
 			{
-				Code:    "98754321N123",
-				Error:   models.ErrInvalidValue,
-				IsValid: false,
+				Code:  "98754321N123",
+				Error: models.ErrInvalidValue,
 			},
 			{
-				Code:    "9854132d1123",
-				Error:   models.ErrInvalidValue,
-				IsValid: false,
+				Code:  "9854132d1123",
+				Error: models.ErrInvalidValue,
 			},
 			{
 				Code:    "7707083893",
-				Error:   nil,
 				IsValid: true,
 			},
 			{
 				Code:    "526317984689",
-				Error:   nil,
 				IsValid: true,
 			},
 		}
@@ -113,9 +107,9 @@ func TestGenerate(t *testing.T) {
 		for i := 0; i < 10; i++ {
 			inn = GenerateLegal()
 			isValid, err := Validate(inn)
+			require.NoError(t, err)
 
 			require.True(t, isValid)
-			require.NoError(t, err)
 		}
 	})
 
@@ -125,9 +119,9 @@ func TestGenerate(t *testing.T) {
 		for i := 0; i < 10; i++ {
 			inn = GeneratePhysical()
 			isValid, err := Validate(inn)
+			require.NoError(t, err)
 
 			require.True(t, isValid)
-			require.NoError(t, err)
 		}
 	})
 
@@ -137,13 +131,13 @@ func TestGenerate(t *testing.T) {
 		for i := 0; i < 10; i++ {
 			inn = Generate()
 			isValid, err := Validate(inn)
+			require.NoError(t, err)
 
 			require.True(t, isValid)
-			require.NoError(t, err)
 		}
 	})
 
-	t.Run("generate random digits ", func(t *testing.T) {
+	t.Run("generate random digits", func(t *testing.T) {
 		tests := []struct {
 			len int
 			min int64