Skip to content

Support case insensitive match #2

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

Merged
merged 3 commits into from
Mar 28, 2023
Merged

Support case insensitive match #2

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
8363d07
Perform a case insensitive match.
lcartey Mar 28, 2023
910a263
Fix some minor typos
lcartey Mar 28, 2023
e90a9b4
Add case-insensitive tests.
lcartey Mar 28, 2023
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
6 changes: 3 additions & 3 deletions __tests__/data/ghas_active_committers_github_2023-01-27T0917.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
User login,Organization / repository,Last pushed date
user1,org/repo,2023-01-27
user1,org1/repo2,2022-11-28
user1,org1/repo2,2022-11-28
uSer1,org1/repo2,2022-11-28
user2,org1/repo2,2022-11-28
user2,org1/repo2,2022-11-28
user2,org1/repo2,2022-11-28
Expand All @@ -15,14 +15,14 @@ user4,org5/repo8,2023-01-25
user4,org1/repo2,2022-11-28
user4,org4/repo6,2022-12-02
user4,org8/repo1,2022-12-02
user5,org6/repo2,2023-01-04
usEr5,org6/repo2,2023-01-04
user5,org1/repo2,2022-12-01
user5,org2/repo3,2023-01-06
user5,org4/repo9,2023-01-06
user5,org10/repo4,2023-01-06
user6,org1/repo2,2022-11-28
user6,org1/repo2,2022-11-28
user6,org1/repo2,2022-11-28
user6,org9/repo3,2023-01-18
usEr6,org9/repo3,2023-01-18
user7,org9/repo3,2023-01-08
user7,org10/repo1,2023-01-10
6 changes: 3 additions & 3 deletions __tests__/data/ghas_active_committers_github_2023-01-27T0918.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ user1,org1/repo2,2022-11-28
user4,org3/repo1,2022-12-16
user1,org5/repo8,2023-01-25
user4,org1/repo2,2022-11-28
user4,org4/repo6,2022-12-02
User4,org4/repo6,2022-12-02
user4,org8/repo1,2022-12-02
user5,org6/repo2,2023-01-04
user5,org1/repo2,2022-12-01
user9,org2/repo3,2023-01-06
user5,org4/repo9,2023-01-06
user5,org10/repo4,2023-01-06
user6,org1/repo2,2022-11-28
uSer6,org1/repo2,2022-11-28
user2,org1/repo2,2022-11-28
user6,org1/repo2,2022-11-28
user6,org9/repo3,2023-01-18
user12,org9/repo3,2023-01-08
user10,org9/repo3,2023-01-08
user7,org10/repo1,2023-01-10
user8,org10/repo1,2023-01-10
15 changes: 9 additions & 6 deletions __tests__/main.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('getFilesInDirectory', () => {
`${directory}ghas_active_committers_github_2023-01-27T0917.csv`,
{ encoding: 'utf8' },
);
const file2Conent = readFileSync(
const file2Content = readFileSync(
`${directory}ghas_active_committers_github_2023-01-27T0918.csv`,
{ encoding: 'utf8' },
);
Expand All @@ -42,7 +42,7 @@ describe('getFilesInDirectory', () => {
'__tests__/data/': {
'some-file.txt': 'file content here',
'ghas_active_committers_github_2023-01-27T0917.csv': file1Content,
'ghas_active_committers_github_2023-01-27T0918.csv': file2Conent,
'ghas_active_committers_github_2023-01-27T0918.csv': file2Content,
'empty-dir': {
'some-file.txt': '{ "some": "json" }',
'some-file-1.txt': '{ "new": "json" }',
Expand All @@ -61,8 +61,8 @@ describe('getFilesInDirectory', () => {
});

it('Read file within top level directory', async () => {
const filesFoundInDirecotry = await getFilesInDirectory(directory);
expect(filesFoundInDirecotry).toEqual(allFileNames);
const filesFoundInDirectory = await getFilesInDirectory(directory);
expect(filesFoundInDirectory).toEqual(allFileNames);
});

it('Successfully filters out files that are not csv', async () => {
Expand All @@ -75,10 +75,10 @@ describe('getFilesInDirectory', () => {
const files = await getFilesInDirectory(directory);
const csvFilesFound = await filerByFileExtention(files, '.csv');
const csvFiles = await readMultipleFiles(csvFilesFound);
expect(csvFiles).toEqual([file1Content, file2Conent]);
expect(csvFiles).toEqual([file1Content, file2Content]);
});

it('Successfully converts al CSVs to JSON', async () => {
it('Successfully converts all CSVs to JSON', async () => {
const files = await getFilesInDirectory(directory);
const csvFilesFound = await filerByFileExtention(files, '.csv');
const csvFiles = await readMultipleFiles(csvFilesFound);
Expand Down Expand Up @@ -116,5 +116,8 @@ describe('getFilesInDirectory', () => {
const content = await mergeFileContent(jsonFiles);
const unique = await uniqueUsers(content);
expect(isArrayUnique(unique)).toBeTruthy();
const expectedUsers = Array.from({ length: 10 }, (_,i) => `user${i + 1}`);
expect(unique.length).toBe(expectedUsers.length);
expect(unique).toEqual(expect.arrayContaining(expectedUsers));
});
});
2 changes: 1 addition & 1 deletion src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const mergeFileContent = async (data: ParseResult<CSVDataAsJson>[]) => {
export const uniqueUsers = async (data: CSVDataAsJson[]) =>
<string[]>(
data
.map((user) => user['User login'])
.map((user) => user['User login'].toLowerCase())
.filter((user, index, arr) => arr.indexOf(user) === index)
);

Expand Down