OKPO +leading zeroes

Author: Dmitry Ovsyanko

__tests__/isINN10.js

@@ -7,6 +7,6 @@ test ('basic', () => {
 	expect (isINN10 ('1111111117')).toBeUndefined ()
 	expect (isINN10 ('6449013711')).toBeUndefined ()
 
-	expect (isINN10 (randomINN10 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isINN10 (randomINN10 ())).toBeUndefined ()
 
 })

__tests__/isINN12.js

@@ -6,6 +6,6 @@ test ('basic', () => {
 	expect (() => isINN12 ('635277570473')).toThrow ()
 
 	expect (isINN12 ('635277570478')).toBeUndefined ()
-	expect (isINN12 (randomINN12 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isINN12 (randomINN12 ())).toBeUndefined ()
 
 })

__tests__/isKPP.js

@@ -9,6 +9,6 @@ test ('basic', () => {
 
 	expect (isKPP ('771401001')).toBeUndefined ()
 
-	expect (isKPP (randomKPP ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isKPP (randomKPP ())).toBeUndefined ()
 
 })

__tests__/isOGRN13.js

@@ -7,6 +7,6 @@ test ('basic', () => {
 	expect (() => isOGRN13 ('1027700280938')).toThrow ()
 
 	expect (isOGRN13 ('1027700280937')).toBeUndefined ()
-	expect (isOGRN13 (randomOGRN13 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isOGRN13 (randomOGRN13 ())).toBeUndefined ()
 
 })

__tests__/isOGRN15.js

@@ -5,6 +5,6 @@ test ('basic', () => {
 	expect (() => isOGRN15 ('304500116000154')).toThrow ()
 
 	expect (isOGRN15 ('304500116000157')).toBeUndefined ()
-	expect (isOGRN15 (randomOGRN15 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isOGRN15 (randomOGRN15 ())).toBeUndefined ()
 
 })

__tests__/isOKPO10.js

@@ -3,10 +3,10 @@ const {isOKPO10, randomOKPO10} = require ('..')
 test ('basic', () => {
 
 	expect (() => isOKPO8 ('1194265277')).toThrow ()
-	expect (() => isOKPO8 ('194265277')).toThrow ()
 
+	expect (isOKPO10 ('194265277')).toBeUndefined ()
 	expect (isOKPO10 ('0194265277')).toBeUndefined ()
 
-	expect (isOKPO10 (randomOKPO10 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) expect (isOKPO10 (randomOKPO10 ())).toBeUndefined ()
 
 })

__tests__/isOKPO8.js

@@ -1,5 +1,7 @@
 const {isOKPO8, randomOKPO8} = require ('..')
 
+// 7675829...?!
+
 test ('basic', () => {
 
 	expect (() => isOKPO8 ('1111111111')).toThrow ()
@@ -8,6 +10,12 @@ test ('basic', () => {
 
 	expect (isOKPO8 ('60419873')).toBeUndefined ()
 
-	expect (isOKPO8 (randomOKPO8 ())).toBeUndefined ()
+	for (let i = 0; i < 1000; i ++) {
+
+		const v = randomOKPO8 ()
+
+		expect (isOKPO8 (v)).toBeUndefined ()
+	
+	}
 
 })

__tests__/isSNILS.js

@@ -10,13 +10,13 @@ test ('basic', () => {
 	expect (isSNILS ('58659591780')).toBeUndefined ()
 	expect (isSNILS ('586-595-917 80')).toBeUndefined ()
 
-	for (let i = 0; i < 100; i ++) {
+	for (let i = 0; i < 1000; i ++) {
 		const snils = randomSNILS () 
 		expect (snils).toHaveLength (11)
 		expect (isSNILS (snils)).toBeUndefined ()
 	}
 
-	for (let i = 0; i < 100; i ++) {
+	for (let i = 0; i < 1000; i ++) {
 		const snils = randomSNILS ({format: true}) 
 		expect (snils).toHaveLength (14)
 		expect (isSNILS (snils)).toBeUndefined ()

lib/Check.js

@@ -7,8 +7,7 @@ module.exports = class {
 		this.totalLength    = totalLength
 
 		this.modulus2 = 10; for (let i = 1; i < checkSumLength; i ++) this.modulus2 *= 10
-		this.modulus1 = this.modulus2 + 1
-		this.sum = 0
+		this.modulus1 = this.modulus2 + 1		
 
 	}
 
@@ -30,7 +29,7 @@ module.exports = class {
 
 	process (str) {
 
-		const {valueLength} = this; for (let i = 0; i < valueLength; i ++) {
+		this.sum = 0; const {valueLength} = this; for (let i = 0; i < valueLength; i ++) {
 
 			let dec = str.charCodeAt (i); if ((dec & 16) !== 16) this.raise ('Not a digit', {code: 'char', pos: i, value: str.charAt (i)})
 

lib/OKPO.js

@@ -1,4 +1,5 @@
 const ScalarProduct = require ('./ScalarProduct')
+const CH_ZERO = '0'.charCodeAt (0)
 
 const COEF = new Uint8Array ([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9])
 
@@ -12,6 +13,12 @@ class OKPO extends ScalarProduct {
 
 	}
 
+	verify (str) {
+
+		super.verify (str.padStart (this.totalLength, '0'))
+
+	}
+
 	adjustSum (sum) {
 
 		const {scalarProduct2} = this
@@ -22,6 +29,24 @@ class OKPO extends ScalarProduct {
 
 	}
 
+	random () {
+
+		while (true) {
+
+			const v = super.random ()
+
+			if (v.length !== this.totalLength) continue
+
+			if (v.charCodeAt (0) !== CH_ZERO) return v
+
+			if (v.charCodeAt (1) !== CH_ZERO) return v.slice (1)
+
+			this.sum = 0
+
+		}
+
+	}
+
 }
 
 const okpo = valueLength => class extends OKPO {constructor () {super (valueLength)}}