Skip to content
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

Chore: CST migration - Remove SBMTD, MST data #484

Merged
merged 5 commits into from
Jul 15, 2024
Merged

Chore: CST migration - Remove SBMTD, MST data #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7ff497
chore(data): remove sbmtd
machikoyasuda Jul 11, 2024
1f591a4
chore(data): rename courtesy_card to agency_card
machikoyasuda Jul 11, 2024
baed79f
chore(data): remove hashed mobility pass, rename courtesy to agency
machikoyasuda Jul 11, 2024
0a09646
test: update tests - remove mst, use cst
machikoyasuda Jul 11, 2024
00e2a5b
test: update db test with new counts
machikoyasuda Jul 11, 2024
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
76 changes: 32 additions & 44 deletions data/server.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@
sub,name,type
71162,Box,courtesy_card
32587,Gonzales,courtesy_card
03552,McCulley,courtesy_card
42687,Álvarez,courtesy_card
65149,Álvarez,courtesy_card
65149,Álvarez,courtesy_card
89768,Muñoz,courtesy_card
41782,Núñez,courtesy_card
48727,de Merida,courtesy_card
38246,la Peña,courtesy_card
78077,De Bell,courtesy_card
71650,De la Cruz,courtesy_card
71650,De la Cruz,courtesy_card
71650,De la Cruz,courtesy_card
03218,D'Andrea,courtesy_card
51828,Grafton-Herbert,courtesy_card
1234,Barbara,mobility_pass
2345,Brown,mobility_pass
3456,Calderón,mobility_pass
4567,Van Buren,mobility_pass
4178,Núñez,mobility_pass
0328,D'Andrea,mobility_pass
00596884ca82d6df736892667163ea13ca95404d3f746e516d2443a0c12cc9e199a8bf113142ebe0bbdbbdcecde179fd1ba45c226033d88cec5606b1e29517d6,b654c445c17985721f9899fb310a320fb9f55a1fde191327aaf241aeabd177172e5cef8bf3b8d628213c62d84d4aff8f50e42d5bc849784a079fe84d8fad0de0,courtesy_card
21320c3329d6fe8febd435e93343cd8bb491c14ea21f567e32253be23f625c1b59980e5c904209cbc112d87d26939d7aabbcbcf18eff15c75d9d6dd6f1b232ae,d33f779614d2b3123b5251aebea26cc3c9179d6bd50be9de287b50f6a8c4a34e56e5964ca8e5d09ed6131a5aa3cc09fa64f51af37fefc4e42cde25b797043863,courtesy_card
76abba90ebdb506633af20f40ed50ca2c2446f1916e121fe7d9e59b3e043f0e8b1343abfa4dfc737298ede495197b62a7b8defb53e42d0bdbd8f041874ff10f3,a5a69f778724a4a34c56cf89c7d4d39ba28fd56fffa869a201c435c7cc9d1eb02dcb4c6f33eb22e244914f282fc2aedd43504e0593c50ff88ba4ee21d50bfcfa,courtesy_card
5fdd21510231d67ab623ebf6756aa66701546647fd8662be5b4a17066c357ae6a1934114b99575caf409519edad378e7255bad8a28f3b5b4ea89a1a0e01b6636,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,courtesy_card
ce4ebf34292628a8b1ba5475ec6dc3aa1f86297747a776f78ad081cc7bb3573d552ac4f31f6c7187e713b2e9ac62ad6a0c88abaf03bacd00713d82f9d2037a6f,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,courtesy_card
ce4ebf34292628a8b1ba5475ec6dc3aa1f86297747a776f78ad081cc7bb3573d552ac4f31f6c7187e713b2e9ac62ad6a0c88abaf03bacd00713d82f9d2037a6f,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,courtesy_card
86ef5506a1959f23b95df072786d9a9a967da80579f975d2130ac18cdac3d6f30c5eb83ad293fa12fbe6c3972be88c28ae354ccb3274ea0b4dae03ecd388e49d,53ae6b57dd4ca31f3c3aa22d6ad7a5da6d8dae3811b8d5405dcaed3fcab182d12a05d334dfe33f87dce2846d9e20ff668745baf50b75fc77b8ba956504082668,courtesy_card
4b7714a4207e4bbb86e66706833ecb642919f637d7081d73208d63d6a7590fa8ff43a4513b8590050022c19b30f92276215f37f98d284f2ee92b645efeb37ff7,af0b6bd198eb198f51a3f95ff2f27200ec6cd0d1727e941b3761ed2805d9f6062e1d48fe9c85764e791b7e323eab96f48dcc61056778ef204b1cd4fb0633bad8,courtesy_card
4c66c978ae090fa4c02226e84ee7e608fa43c82cba5fce0a4c80b5402df10b80b8f200fd132cc560328e3032d69621879c47369cdbd8dea36454726625b9649c,4fce6a893b07bfa5e2fcb1c575624cfb370eaa909e741981b59ed435f220f0c2ff8d7059cdbd592c5f90854d833e33829529180f08e28fcfb7b78e1eacaa6c82,courtesy_card
6e46a779a5cf7994c6b8d5237520edeaab0cd8b1239c22f26d4630936d2eac43c9a9538b9e862b084fc3d9d4392b765d2a900ec51e0ad16dbec2ad8f64e98508,59ef03cf4015f853953ed727ba2c5a6425434e0dd775dabf1fc728bad7633256647a4ce7f48ccec68c7a820c48c2fd7a0a513df07175085ebbd6fadeb6c6c39a,courtesy_card
3146143c6893a59bb2bf57b2304947a78ad31a45a3c265dd11579008b635e3f98e1c2717b37ab7efe09ed47aacc337397b267270b1754455ea1f05a874c921ca,9bbf4667171f9442aa446185ac90f6fb4241bf48fe832f0cc92d5155caa55b295d30788ab4dec355c56aa21c7e2110765d29fc496c2c868272b1d293f3e91f3d,courtesy_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,courtesy_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,courtesy_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,courtesy_card
897b4db712e36e23955e3b1950923857379edd8b79fcabe3980f85a5f8b08153d63c9689feadf28bbfa335c243eb57594f9632d62e529b99e87b45e1ae2faf45,fbd4e2bb3a3d5ccc8a21d70a3867f1398bc40bab93e825644c7f0907c57eaec03e26f486c0e05308401cfb28cc90b4fd03a3f8b150c4ec3349f173897ab91c4d,courtesy_card
fc12e93e5ac9fa968e80ac17b85e3386fbfe68598d03a5b240629c47ea04d79231a1a9314afece3f7ac33ca3a341300f1337a4a2659a7d31788da200f24e92f2,0cbcf13358e0caa1441fc7a8c04903be157695f04df26720eec570c09545ef4faaedc3ecf8aa735c008dd66d1c1bf31c967b81d98486dcb7b19a53d56ea75cec,courtesy_card
d404559f602eab6fd602ac7680dacbfaadd13630335e951f097af3900e9de176b6db28512f2e000b9d04fba5133e8b1c6e8df59db3a8ab9d60be4b97cc9e81db,a808c9665bc9ed551c992750f374c32c026919ed429c5e523f67c9ac4fa924e040051393f28072291c43bd7a2706ffa23bf52493cb49e1681c9a6fb9aae58f0d,mobility_pass
9a938f51c7298d328a2801b01b21ed9e9840a0a1c43da289504cb23beeedf65a31a255653b8fc44e20eacefcb316e13fb4b5a2ef55ce312f629fd07c373c79f3,78cff8868d3cd30ddf01ffc32be7e0d828c0bbf7a29030372ff6407bf4233b9b0000034be9f18535836e7191674b4f8c199d6be3e76e73a64cbe5f4ac97f82bb,mobility_pass
99c552a2f9d880b40e3ec981c995f1a679b3b734827003363643ad025f4c8ed395227d0d361e798a6c558711ec1533f3f9bb87594efe6453b23c35b801014f91,d3d2cbccfe85cf0b8e6df4b23e0d1281b14fc849601aeb6d3d743f89c98be0908769e43c61c4a1e8ef0d47835891741e4b0e096a3fb3d7f55335ebc6c570d5af,mobility_pass
ebbedf2f05cf9e160da1f24314a0a71afb2b319fee6676605e2890bf15c220c390ca053fcbe8214701c440afe1487485027785c9e507c51fb046b3e02118174c,f00ba951eb4e6c8b998dd17c65c6d9969f7bee40f4a28669d7e92b3e2e8d1496822806e15283bfa1ea193756175a9cd73368ca9df9ed593bbda0ee1b563e4901,mobility_pass
a3c88f59a77b3796603d29612037cdf0976152ffe0dda59204bc8633a8b7bd26e9e162e55cb779105c2f83a6d36499614b81f3850a9e9acb03be302d68fbaabc,af0b6bd198eb198f51a3f95ff2f27200ec6cd0d1727e941b3761ed2805d9f6062e1d48fe9c85764e791b7e323eab96f48dcc61056778ef204b1cd4fb0633bad8,mobility_pass
6d5ce57cb77411d83021e28f6dc3e798b0cedb9565cf298eabd678c51b6b96693d48381a09809357677c729e784e72a322f5f8f062f57b04d3809f023f22d705,fbd4e2bb3a3d5ccc8a21d70a3867f1398bc40bab93e825644c7f0907c57eaec03e26f486c0e05308401cfb28cc90b4fd03a3f8b150c4ec3349f173897ab91c4d,mobility_pass
71162,Box,agency_card
32587,Gonzales,agency_card
03552,McCulley,agency_card
42687,Álvarez,agency_card
65149,Álvarez,agency_card
65149,Álvarez,agency_card
89768,Muñoz,agency_card
41782,Núñez,agency_card
48727,de Merida,agency_card
38246,la Peña,agency_card
78077,De Bell,agency_card
71650,De la Cruz,agency_card
71650,De la Cruz,agency_card
71650,De la Cruz,agency_card
03218,D'Andrea,agency_card
51828,Grafton-Herbert,agency_card
00596884ca82d6df736892667163ea13ca95404d3f746e516d2443a0c12cc9e199a8bf113142ebe0bbdbbdcecde179fd1ba45c226033d88cec5606b1e29517d6,b654c445c17985721f9899fb310a320fb9f55a1fde191327aaf241aeabd177172e5cef8bf3b8d628213c62d84d4aff8f50e42d5bc849784a079fe84d8fad0de0,agency_card
21320c3329d6fe8febd435e93343cd8bb491c14ea21f567e32253be23f625c1b59980e5c904209cbc112d87d26939d7aabbcbcf18eff15c75d9d6dd6f1b232ae,d33f779614d2b3123b5251aebea26cc3c9179d6bd50be9de287b50f6a8c4a34e56e5964ca8e5d09ed6131a5aa3cc09fa64f51af37fefc4e42cde25b797043863,agency_card
76abba90ebdb506633af20f40ed50ca2c2446f1916e121fe7d9e59b3e043f0e8b1343abfa4dfc737298ede495197b62a7b8defb53e42d0bdbd8f041874ff10f3,a5a69f778724a4a34c56cf89c7d4d39ba28fd56fffa869a201c435c7cc9d1eb02dcb4c6f33eb22e244914f282fc2aedd43504e0593c50ff88ba4ee21d50bfcfa,agency_card
5fdd21510231d67ab623ebf6756aa66701546647fd8662be5b4a17066c357ae6a1934114b99575caf409519edad378e7255bad8a28f3b5b4ea89a1a0e01b6636,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,agency_card
ce4ebf34292628a8b1ba5475ec6dc3aa1f86297747a776f78ad081cc7bb3573d552ac4f31f6c7187e713b2e9ac62ad6a0c88abaf03bacd00713d82f9d2037a6f,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,agency_card
ce4ebf34292628a8b1ba5475ec6dc3aa1f86297747a776f78ad081cc7bb3573d552ac4f31f6c7187e713b2e9ac62ad6a0c88abaf03bacd00713d82f9d2037a6f,d7c3a44353b048fe79bba0eac466f2a9de1e734d29e461bb923ea19c43956fe195641302091e5bfcf8769cf98f9e91552266ad5f72dbff9af3d3f4e126822718,agency_card
86ef5506a1959f23b95df072786d9a9a967da80579f975d2130ac18cdac3d6f30c5eb83ad293fa12fbe6c3972be88c28ae354ccb3274ea0b4dae03ecd388e49d,53ae6b57dd4ca31f3c3aa22d6ad7a5da6d8dae3811b8d5405dcaed3fcab182d12a05d334dfe33f87dce2846d9e20ff668745baf50b75fc77b8ba956504082668,agency_card
4b7714a4207e4bbb86e66706833ecb642919f637d7081d73208d63d6a7590fa8ff43a4513b8590050022c19b30f92276215f37f98d284f2ee92b645efeb37ff7,af0b6bd198eb198f51a3f95ff2f27200ec6cd0d1727e941b3761ed2805d9f6062e1d48fe9c85764e791b7e323eab96f48dcc61056778ef204b1cd4fb0633bad8,agency_card
4c66c978ae090fa4c02226e84ee7e608fa43c82cba5fce0a4c80b5402df10b80b8f200fd132cc560328e3032d69621879c47369cdbd8dea36454726625b9649c,4fce6a893b07bfa5e2fcb1c575624cfb370eaa909e741981b59ed435f220f0c2ff8d7059cdbd592c5f90854d833e33829529180f08e28fcfb7b78e1eacaa6c82,agency_card
6e46a779a5cf7994c6b8d5237520edeaab0cd8b1239c22f26d4630936d2eac43c9a9538b9e862b084fc3d9d4392b765d2a900ec51e0ad16dbec2ad8f64e98508,59ef03cf4015f853953ed727ba2c5a6425434e0dd775dabf1fc728bad7633256647a4ce7f48ccec68c7a820c48c2fd7a0a513df07175085ebbd6fadeb6c6c39a,agency_card
3146143c6893a59bb2bf57b2304947a78ad31a45a3c265dd11579008b635e3f98e1c2717b37ab7efe09ed47aacc337397b267270b1754455ea1f05a874c921ca,9bbf4667171f9442aa446185ac90f6fb4241bf48fe832f0cc92d5155caa55b295d30788ab4dec355c56aa21c7e2110765d29fc496c2c868272b1d293f3e91f3d,agency_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,agency_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,agency_card
c8648b143c08b4a4f2bd50f8df9bda963d061c8a3742c4e47fcbe00d02f11e9a909439450a3627752122919339480c8fa2e9038328453c9e08496a215bff0f60,edf2e1ccc1c4dbdb1bbed076fc73a68ef3c904b737f7ce260f2ccb6d7efc8634f2b9622fe76038bd985d0faaca6f433726dd8c89c48d812b035e854a3302b114,agency_card
897b4db712e36e23955e3b1950923857379edd8b79fcabe3980f85a5f8b08153d63c9689feadf28bbfa335c243eb57594f9632d62e529b99e87b45e1ae2faf45,fbd4e2bb3a3d5ccc8a21d70a3867f1398bc40bab93e825644c7f0907c57eaec03e26f486c0e05308401cfb28cc90b4fd03a3f8b150c4ec3349f173897ab91c4d,agency_card
fc12e93e5ac9fa968e80ac17b85e3386fbfe68598d03a5b240629c47ea04d79231a1a9314afece3f7ac33ca3a341300f1337a4a2659a7d31788da200f24e92f2,0cbcf13358e0caa1441fc7a8c04903be157695f04df26720eec570c09545ef4faaedc3ecf8aa735c008dd66d1c1bf31c967b81d98486dcb7b19a53d56ea75cec,agency_card
8 changes: 4 additions & 4 deletions tests/db/test_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ def test_init_db_command(runner):

assert result.exit_code == 0

assert User.query.count() == 38
assert Eligibility.query.count() == 2
assert User.query.count() == 26
assert Eligibility.query.count() == 1

user_with_one_eligibility = User.query.filter_by(sub="32587", name="Gonzales").first()
courtesy_card_type = Eligibility.query.filter_by(name="courtesy_card").first()
assert user_with_one_eligibility.types == [courtesy_card_type]
agency_card_type = Eligibility.query.filter_by(name="agency_card").first()
assert user_with_one_eligibility.types == [agency_card_type]


@pytest.mark.usefixtures("flask")
Expand Down
10 changes: 5 additions & 5 deletions tests/test_verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ def test_Verify_init_keypair():

test_data = [
# This sub/name pair is in the database
("", "32587", "Gonzales", ["courtesy_card"], ["courtesy_card"]),
("", "32587", "Gonzales", ["agency_card"], ["agency_card"]),
# This sub/name pair does not have the type
("", "32587", "Gonzales", ["something"], []),
# This sub/name pair does not exist
("", "12345", "Aaron", ["courtesy_card"], []),
("", "12345", "Aaron", ["agency_card"], []),
# Correct sub/name pair and correct hash algo type
("sha512", "89768", "Muñoz", ["courtesy_card"], ["courtesy_card"]),
("sha512", "89768", "Muñoz", ["agency_card"], ["agency_card"]),
# This sub/name pair does not have the type
("sha512", "89768", "Muñoz", ["something"], []),
# This sub/name pair does not exist
("sha512", "12345", "Smith", ["courtesy_card"], []),
("sha512", "12345", "Smith", ["agency_card"], []),
# Wrong hash algo type
("sha256", "89768", "Muñoz", ["courtesy_card"], []),
("sha256", "89768", "Muñoz", ["agency_card"], []),
]


Expand Down
Loading