Merge pull request #15 from codereverser/fix/missing-pankyc

support for parsing folios without PAN KYC status

Author: codereverser

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.8 - 2020-12-29
+
+- Support for parsing folios without PAN/KYC details
+
 ## 0.3.7 - 2020-12-24
 
 - Support for parsing dividend transactions

casparser/VERSION.txt

@@ -1 +1 @@
-0.3.7
+0.3.8

casparser/process.py

@@ -42,7 +42,7 @@ def process_cas_text(text):
             description_tail = ""
         if amc_match := re.search(r"^(.+?)\s+(MF|Mutual\s+Fund)$", line, re.I | re.DOTALL):
             current_amc = amc_match.group(0)
-        elif m := re.search(FOLIO_RE, line, re.I):
+        elif m := re.search(FOLIO_RE, line, re.I | re.DOTALL):
             folio = m.group(1).strip()
             if current_folio is None or current_folio != folio:
                 if curr_scheme_data and current_folio is not None:
@@ -54,7 +54,7 @@ def process_cas_text(text):
                     "amc": current_amc,
                     "PAN": (m.group(2) or "").strip(),
                     "KYC": m.group(3).strip(),
-                    "PANKYC": m.group(4).strip(),
+                    "PANKYC": None if m.group(4) is None else m.group(4).strip(),
                     "schemes": [],
                 }
         elif m := re.search(SCHEME_RE, line, re.DOTALL | re.MULTILINE | re.I):

casparser/regex.py

@@ -1,8 +1,8 @@
 HEADER_RE = r"(?P<from>\d{2}-[a-zA-Z]{3}-\d{4})\s+to\s+(?P<to>\d{2}-[a-zA-Z]{3}-\d{4})"
 
 FOLIO_RE = (
-    r"Folio\s+No\s*:\s+(.+?)\s+(?:PAN\s*:\s+([A-Z]{5}\d{4}[A-Z])\s+)?"
-    r"KYC\s*:\s*(.+?)\s+PAN\s*:\s*(.+?)$"
+    r"Folio\s+No\s*:\s+([\d/\s]+)\s+.*?(?:PAN\s*:\s+([A-Z]{5}\d{4}[A-Z])\s+)?.*?"
+    r"KYC\s*:\s*(OK|NOT\s+OK)\s*.*?(?:PAN\s*:\s*(OK|NOT\s+OK))?$"
 )
 
 SCHEME_RE = r"([\s\w]+)-\s*\d*\s*(.+?)\s*(?:\(Advisor\s*:\s*(.+?)\))*\s+Registrar\s*:\s*(.*)\s*$"
@@ -12,7 +12,8 @@
 NAV_RE = r"NAV\s+on\s+(\d{2}-[A-Za-z]{3}-\d{4})\s*:\s*INR\s*([\d,.]+)"
 
 TRANSACTION_RE = (
-    r"(\d{2}-[A-Za-z]{3}-\d{4})\t\t([^\t]+?)\t\t([(\d,.]+)\)*(?:\t\t([(\d,.]+)\)*\t\t([(\d,.]+)\)*\t\t([(\d,.]+)\)*)*"
+    r"(\d{2}-[A-Za-z]{3}-\d{4})\t\t([^\t]+?)\t\t([(\d,.]+)\)*(?:\t\t([(\d,.]+)\)*\t\t"
+    r"([(\d,.]+)\)*\t\t([(\d,.]+)\)*)*"
 )
 DIVIDEND_RE = r"dividend.+?(reinvest)*.+?@\s+Rs\.\s*([\d\.]+)\s+per\s+unit"
 

tests/test_mupdf.py

@@ -18,6 +18,7 @@ def test_cli(self, tmpdir):
         result = runner.invoke(cli, [self.cams_file_name, "-p", self.cams_password])
         assert result.exit_code == 0
         assert "Statement Period:" in result.output
+        assert re.search(r"Error\s+:\s+0\s+schemes", result.output) is not None
 
         fpath = tmpdir.join("output.json")
         result = runner.invoke(