diff --git a/tests/test_convert_salary_excel.py b/tests/test_convert_salary_excel.py index 6b50dde..790221b 100644 --- a/tests/test_convert_salary_excel.py +++ b/tests/test_convert_salary_excel.py @@ -87,6 +87,23 @@ class DetectColumnTypeTests(unittest.TestCase): self.assertEqual(companies[0]["categories"]["software_engineering"], {"count": 8, "index": 110.0}) + def test_parse_sheet_detects_company_column_with_token_header(self): + # Real-world salary sheets rarely use the bare token "Company"; + # headers like "Company Name" / "Employer Name" must still be + # detected as the company column (previously silently skipped -> []). + for header in ("Company", "Company Name", "Employer Name"): + with self.subTest(header=header): + ws = FakeWorksheet([ + (header, "Salary"), + ("Example Corp", 105.5), + ]) + companies = parse_sheet(ws) + self.assertEqual(len(companies), 1) + self.assertEqual(companies[0]["company"], "Example Corp") + self.assertEqual( + companies[0]["categories"]["salary"], {"index": 105.5} + ) + if __name__ == "__main__": unittest.main() diff --git a/tools/convert_salary_excel.py b/tools/convert_salary_excel.py index ec4af97..b921e92 100644 --- a/tools/convert_salary_excel.py +++ b/tools/convert_salary_excel.py @@ -91,7 +91,7 @@ def parse_sheet(ws, sheet_label=None): header_row = None for row_idx, row in enumerate(ws.iter_rows(min_row=1, max_row=10, values_only=False), start=1): for cell in row: - if cell.value and str(cell.value).strip().lower() in COMPANY_PATTERNS: + if cell.value and header_matches(str(cell.value), COMPANY_PATTERNS): header_row = row_idx break if header_row: @@ -111,7 +111,7 @@ def parse_sheet(ws, sheet_label=None): city_col = None for i, h in enumerate(headers): h_lower = h.lower() - if h_lower in COMPANY_PATTERNS: + if header_matches(h, COMPANY_PATTERNS): company_col = i elif h_lower in CITY_PATTERNS: city_col = i