Add parser tests and rework parser for Colt

Author: pke11y

circuit_maintenance_parser/parsers/colt.py

@@ -44,20 +44,21 @@ def parse_subject(self, subject):
         """
         data = {}
         search = re.search(
-            r"\[.+\](.+).+?(CRQ\w+-\w+)\s(\d+/\d+/\d+\s\d+:\d+:\d+\s+[A-Z]+).+?(\d+/\d+/\d+\s\d+:\d+:\d+\s+[A-Z]+).+?([A-Z]+)",
+            r"\[.+\]\s([A-Za-z\s]+).+?(CRQ\w+-\w+)\s(\d+/\d+/\d+\s\d+:\d+:\d+\s+[A-Z]+).+?(\d+/\d+/\d+\s\d+:\d+:\d+\s+[A-Z]+).+?([A-Z]+)",
             subject,
         )
         if search:
             data["maintenance_id"] = search.group(2)
             data["start"] = self.dt2ts(parser.parse(search.group(3)))
             data["end"] = self.dt2ts(parser.parse(search.group(4)))
-            if search.group(5) == "START":
+            status = search.group(5).strip()
+            if status == "START":
                 data["status"] = Status("IN-PROCESS")
-            elif search.group(5) == "COMPLETED":
+            elif status == "COMPLETED":
                 data["status"] = Status("COMPLETED")
             else:
                 data["status"] = Status("CONFIRMED")
-            data["summary"] = subject
+            data["summary"] = search.group(1).strip()
         return [data]
 
 
@@ -84,5 +85,5 @@ def parse_subject(self, subject):
             data["maintenance_id"] = search.group(3)
             data["start"] = self.dt2ts(parser.parse(search.group(4)))
             data["end"] = self.dt2ts(parser.parse(search.group(5)))
-            data["summary"] = subject
+            data["summary"] = search.group(2).strip()
         return [data]

tests/unit/data/colt/colt1_result.json

@@ -7,6 +7,6 @@
     "stamp": 1627653788,
     "start": 1628283600,
     "status": "CONFIRMED",
-    "summary": "[ EXTERNAL ] Colt Service Affecting Maintenance Notification - CRQ1-12345678 [06/8/2021 22:00:00 GMT - 07/8/2021 06:00:00 GMT] for ACME,  12345000"
+    "summary": "Service Affecting Maintenance Notification"
   }
 ]

tests/unit/data/colt/colt3_result.json

@@ -13,6 +13,6 @@
     "stamp": 1630760572,
     "start": 1623189600,
     "status": "CONFIRMED",
-    "summary": "[ EXTERNAL ] Colt Service Affecting Maintenance Notification - CRQ1-12345678 [06/8/2021 22:00:00 GMT - 07/8/2021 06:00:00 GMT] for ACME,  12345000"
+    "summary": "Service Affecting Maintenance Notification"
   }
 ]

tests/unit/data/colt/colt4.eml

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
 Date: Mon, 1 Nov 2021 11:51:41 +0000
-Subject: [ EXTERNAL ] MAINTENANCE ALERT: CRQ1-12345678 31/10/2021 00:00:00 GMT - 31/10/2021 07:30:00 GMT - COMPLETED
 From: Maintenance Request <[email protected]>
 To: Maintenance Request <[email protected]>
 Content-Type: multipart/mixed; boundary="000000000000e8c2b105cfb8cc38"
+Subject: [ EXTERNAL ] MAINTENANCE ALERT: CRQ1-12345678 31/10/2021 00:00:00 GMT - 31/10/2021 07:30:00 GMT - COMPLETED
 
 --000000000000e8c2b105cfb8cc38
 Content-Type: multipart/alternative; boundary="000000000000e8c2ae05cfb8cc36"

tests/unit/data/colt/colt4_result.json

@@ -13,6 +13,6 @@
     "stamp": 1635767501,
     "start": 1635638400,
     "status": "COMPLETED",
-    "summary": "[ EXTERNAL ] MAINTENANCE ALERT: CRQ1-12345678 31/10/2021 00:00:00 GMT - 31/10/2021 07:30:00 GMT - COMPLETED"
+    "summary": "MAINTENANCE ALERT"
   }
 ]

tests/unit/data/colt/colt4_subject_parser_1_result.json

@@ -0,0 +1,9 @@
+[
+  {
+    "end": 1635665400,
+    "maintenance_id": "CRQ1-12345678",
+    "start": 1635638400,
+    "status": "COMPLETED",
+    "summary": "MAINTENANCE ALERT"
+  }
+]

tests/unit/data/colt/colt5_result.json

@@ -13,6 +13,6 @@
     "stamp": 1637790229,
     "start": 1626130800,
     "status": "CANCELLED",
-    "summary": "[ EXTERNAL ] Cancellation Colt Third Party Maintenance Notification - CRQ1-12345678 [07/12/2021 23:00:00 GMT - 08/12/2021 05:00:00 GMT] for ACME, 123456"
+    "summary": "Colt Third Party Maintenance Notification"
   }
 ]

tests/unit/data/colt/colt5_subject_parser_2_result.json

@@ -0,0 +1,9 @@
+[
+  {
+    "end": 1628744400,
+    "maintenance_id": "CRQ1-12345678",
+    "start": 1626130800,
+    "status": "CANCELLED",
+    "summary": "Colt Third Party Maintenance Notification"
+  }
+]

tests/unit/test_parsers.py

@@ -11,7 +11,7 @@
 from circuit_maintenance_parser.parsers.aws import SubjectParserAWS1, TextParserAWS1
 
 from circuit_maintenance_parser.parsers.cogent import HtmlParserCogent1
-from circuit_maintenance_parser.parsers.colt import CsvParserColt1
+from circuit_maintenance_parser.parsers.colt import CsvParserColt1, SubjectParserColt1, SubjectParserColt2
 from circuit_maintenance_parser.parsers.equinix import HtmlParserEquinix, SubjectParserEquinix
 from circuit_maintenance_parser.parsers.gtt import HtmlParserGTT1
 from circuit_maintenance_parser.parsers.hgc import HtmlParserHGC1, HtmlParserHGC2
@@ -92,6 +92,16 @@
             Path(dir_path, "data", "colt", "colt2.csv"),
             Path(dir_path, "data", "colt", "colt2_result.json"),
         ),
+        (
+            SubjectParserColt1,
+            Path(dir_path, "data", "colt", "colt4.eml"),
+            Path(dir_path, "data", "colt", "colt4_subject_parser_1_result.json"),
+        ),
+        (
+            SubjectParserColt2,
+            Path(dir_path, "data", "colt", "colt5.eml"),
+            Path(dir_path, "data", "colt", "colt5_subject_parser_2_result.json"),
+        ),
         # Equinix
         (
             HtmlParserEquinix,