Skip to content

Revamped the check digit calculation #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gtmsingh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Revamped the check digit calculation #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecf57d1
Revamped the check digit calculation
gtmsingh Mar 17, 2018
85cae1d
Updated test cases according to the new symbols
gtmsingh Mar 17, 2018
2288731
False positive case of `Y` containing failure part
gtmsingh Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions coupon-code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ var badWordsList = ('SHPX PHAG JNAX JNAT CVFF PBPX FUVG GJNG GVGF SNEG URYY ZHSS
'NEFR FUNT GBFF FYHG GHEQ FYNT PENC CBBC OHGG SRPX OBBO WVFZ WVMM CUNG')
.replace(/[a-zA-Z]/g,function(c){return String.fromCharCode((c<="Z"?90:122)>=(c=c.charCodeAt(0)+13)?c:c-26);})
.split(' ');
var symbolsStr = '0123456789ABCDEFGHJKLMNPQRTUVWXY';

// Do make sure the number of symbols used is not a multiple of 2 to have better radomness of check digit
// Refer: https://github.com/chilts/node-coupon-code/issues/8 for more information
var symbolsStr = '0123456789ABCDEFGHJKLMNPQRTUVWX';
var symbolsArr = symbolsStr.split('');
var symbolsObj = {};
symbolsArr.forEach(function(c, i) {
Expand Down Expand Up @@ -83,7 +86,8 @@ module.exports.validate = function(code, opts) {
.replace(/O/g, '0')
.replace(/I/g, '1')
.replace(/Z/g, '2')
.replace(/S/g, '5');
.replace(/S/g, '5')
.replace(/Y/g, 'V');

// split in the different parts
var parts = [];
Expand Down Expand Up @@ -137,7 +141,7 @@ function checkDigitAlg1(data, check) {
check = check * 19 + k;
});

return symbolsArr[ check % 31 ];
return symbolsArr[ check % symbolsArr.length ];
}

function hasBadWord(code) {
Expand Down
14 changes: 7 additions & 7 deletions test/validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test("Validating Various Inputs", function (t) {
t.ok( cc.validate('1K7Q-CTFM', { parts : 2 }), "but accepted with correct 'parts'");
t.ok(!cc.validate('CTFM-1K7Q', { parts : 2 }), "parts must be in correct order");

t.ok( cc.validate('QBXA5CV4Q85E-HNYV4U3UD69M-B7XU1BHF3FYE-HXT9LD4Q0DAH-U6WMKC1WNF4N-5PCG5C4JF0GL-5DTUNJ40LRB5', { parts : 7, partLen : 12 }), "but accepted with correct 'parts'");
t.ok( cc.validate('QBXA5CV4Q85E-HNYV4U3UD69R-B7XU1BHF3FYB-HXT9LD4Q0DAH-U6WMKC1WNF4N-5PCG5C4JF0GL-5DTUNJ40LRB5', { parts : 7, partLen : 12 }), "but accepted with correct 'parts'");

t.equal( cc.validate('1k7q-ctfm-lmtc'), '1K7Q-CTFM-LMTC', "lowercase code is fixed and valid");

Expand Down Expand Up @@ -65,14 +65,14 @@ test("Validating Various Inputs", function (t) {
t.ok( cc.validate('1K7Q-CTFM-LMTC', { parts : 3 }), 'valid code-pretest');
t.ok(!cc.validate('1K7Q-CTFM-LMT1', { parts : 3 }), 'invalid checkdigit rejected in part 3');

t.ok( cc.validate('7YQH-1FU7-E1HX-0BG9', { parts : 4 }), 'valid code-pretest');
t.ok(!cc.validate('7YQH-1FU7-E1HX-0BGP', { parts : 4 }), 'invalid checkdigit rejected in part 4');
t.ok( cc.validate('7YQN-1FU7-E1HX-0BG9', { parts : 4 }), 'valid code-pretest');
t.ok(!cc.validate('7YQN-1FU7-E1HX-0BGP', { parts : 4 }), 'invalid checkdigit rejected in part 4');

t.ok( cc.validate('YENH-UPJK-PTE0-20U6-QYME', { parts : 5 }), 'valid code-pretest');
t.ok(!cc.validate('YENH-UPJK-PTE0-20U6-QYMT', { parts : 5 }), 'invalid checkdigit rejected in part 5');
t.ok( cc.validate('YENK-UPJK-PTE0-20U6-QYMK', { parts : 5 }), 'valid code-pretest');
t.ok(!cc.validate('YENK-UPJK-PTE0-20U6-QYMT', { parts : 5 }), 'invalid checkdigit rejected in part 5');

t.ok( cc.validate('YENH-UPJK-PTE0-20U6-QYME-RBK1', { parts : 6 }), 'valid code-pretest');
t.ok(!cc.validate('YENH-UPJK-PTE0-20U6-QYME-RBK2', { parts : 6 }), 'invalid checkdigit rejected in part 6');
t.ok( cc.validate('YENK-UPJK-PTE0-20U6-QYMK-RBK1', { parts : 6 }), 'valid code-pretest');
t.ok(!cc.validate('YENK-UPJK-PTE0-20U6-QYMK-RBK2', { parts : 6 }), 'invalid checkdigit rejected in part 6');

t.end();
});
Expand Down