Merge pull request CCI-MOC#107 from QuanMPhm/103/proc_lenovo

Implemented processor for Lenovo processing

process_report/invoices/invoice.py

@@ -23,6 +23,8 @@
 INSTITUTION_ID_FIELD = "Institution - Specific Code"
 SU_HOURS_FIELD = "SU Hours (GBhr or SUhr)"
 SU_TYPE_FIELD = "SU Type"
+SU_CHARGE_FIELD = "SU Charge"
+LENOVO_CHARGE_FIELD = "Charge"
 RATE_FIELD = "Rate"
 COST_FIELD = "Cost"
 CREDIT_FIELD = "Credit"

process_report/invoices/lenovo_invoice.py

@@ -6,25 +6,18 @@
 @dataclass
 class LenovoInvoice(invoice.Invoice):
     LENOVO_SU_TYPES = ["OpenShift GPUA100SXM4", "OpenStack GPUA100SXM4"]
-    SU_CHARGE_MULTIPLIER = 1
 
     export_columns_list = [
         invoice.INVOICE_DATE_FIELD,
         invoice.PROJECT_FIELD,
         invoice.INSTITUTION_FIELD,
         invoice.SU_HOURS_FIELD,
         invoice.SU_TYPE_FIELD,
-        "SU Charge",
-        "Charge",
+        invoice.SU_CHARGE_FIELD,
+        invoice.LENOVO_CHARGE_FIELD,
     ]
     exported_columns_map = {invoice.SU_HOURS_FIELD: "SU Hours"}
 
-    def _prepare(self):
-        self.data["SU Charge"] = self.SU_CHARGE_MULTIPLIER
-
-    def _process(self):
-        self.data["Charge"] = self.data[invoice.SU_HOURS_FIELD] * self.data["SU Charge"]
-
     def _prepare_export(self):
         self.data = self.data[
             self.data[invoice.SU_TYPE_FIELD].isin(self.LENOVO_SU_TYPES)

process_report/process_report.py

@@ -18,6 +18,7 @@
 from process_report.processors import (
     validate_pi_alias_processor,
     add_institution_processor,
+    lenovo_processor,
 )
 
 ### PI file field names
@@ -215,7 +216,12 @@ def main():
     )
     add_institute_proc.process()
 
-    preliminary_processed_data = add_institute_proc.data
+    lenovo_proc = lenovo_processor.LenovoProcessor(
+        "", invoice_month, add_institute_proc.data
+    )
+    lenovo_proc.process()
+
+    preliminary_processed_data = lenovo_proc.data
 
     ### Finish preliminary processing
 

process_report/processors/lenovo_processor.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+
+
+from process_report.invoices import invoice
+from process_report.processors import processor
+
+
+@dataclass
+class LenovoProcessor(processor.Processor):
+    SU_CHARGE_MULTIPLIER = 1
+
+    def _process(self):
+        self.data[invoice.SU_CHARGE_FIELD] = self.SU_CHARGE_MULTIPLIER
+        self.data[invoice.LENOVO_CHARGE_FIELD] = (
+            self.data[invoice.SU_HOURS_FIELD] * self.data[invoice.SU_CHARGE_FIELD]
+        )

process_report/tests/unit_tests.py

@@ -8,7 +8,7 @@
 from textwrap import dedent
 
 from process_report import process_report, util
-from process_report.invoices import lenovo_invoice, nonbillable_invoice
+from process_report.invoices import nonbillable_invoice
 from process_report.tests import util as test_utils
 
 
@@ -735,65 +735,22 @@ def test_validate_billables(self):
         )
 
 
-class TestExportLenovo(TestCase):
-    def setUp(self):
-        data = {
-            "Invoice Month": [
-                "2023-01",
-                "2023-01",
-                "2023-01",
-                "2023-01",
-                "2023-01",
-                "2023-01",
-            ],
-            "Project - Allocation": [
-                "ProjectA",
-                "ProjectB",
-                "ProjectC",
-                "ProjectD",
-                "ProjectE",
-                "ProjectF",
-            ],
-            "Institution": ["A", "B", "C", "D", "E", "F"],
-            "SU Hours (GBhr or SUhr)": [1, 10, 100, 4, 432, 10],
-            "SU Type": [
-                "OpenShift GPUA100SXM4",
-                "OpenShift GPUA100",
-                "OpenShift GPUA100SXM4",
-                "OpenStack GPUA100SXM4",
-                "OpenStack CPU",
-                "OpenStack GPUK80",
-            ],
-        }
-        self.lenovo_invoice = lenovo_invoice.LenovoInvoice(
-            "Lenovo", "2023-01", pandas.DataFrame(data)
-        )
-        self.lenovo_invoice.process()
-
+class TestLenovoProcessor(TestCase):
     def test_process_lenovo(self):
-        output_df = self.lenovo_invoice.data
-        self.assertTrue(
-            set(
-                [
-                    process_report.INVOICE_DATE_FIELD,
-                    process_report.PROJECT_FIELD,
-                    process_report.INSTITUTION_FIELD,
-                    process_report.SU_TYPE_FIELD,
-                    process_report.SU_HOURS_FIELD,
-                    "SU Charge",
-                    "Charge",
-                ]
-            ).issubset(output_df)
+        test_invoice = pandas.DataFrame(
+            {
+                "SU Hours (GBhr or SUhr)": [1, 10, 100, 4, 432, 10],
+            }
+        )
+        answer_invoice = test_invoice.copy()
+        answer_invoice["SU Charge"] = 1
+        answer_invoice["Charge"] = (
+            answer_invoice["SU Hours (GBhr or SUhr)"] * answer_invoice["SU Charge"]
         )
 
-        for i, row in output_df.iterrows():
-            self.assertIn(
-                row[process_report.SU_TYPE_FIELD],
-                ["OpenShift GPUA100SXM4", "OpenStack GPUA100SXM4"],
-            )
-            self.assertEqual(
-                row["Charge"], row["SU Charge"] * row["SU Hours (GBhr or SUhr)"]
-            )
+        lenovo_proc = test_utils.new_lenovo_processor(data=test_invoice)
+        lenovo_proc.process()
+        self.assertTrue(lenovo_proc.data.equals(answer_invoice))
 
 
 class TestUploadToS3(TestCase):

process_report/tests/util.py

@@ -10,6 +10,7 @@
 from process_report.processors import (
     add_institution_processor,
     validate_pi_alias_processor,
+    lenovo_processor,
 )
 
 
@@ -75,3 +76,7 @@ def new_validate_pi_alias_processor(
     return validate_pi_alias_processor.ValidatePIAliasProcessor(
         name, invoice_month, data, alias_map
     )
+
+
+def new_lenovo_processor(name="", invoice_month="0000-00", data=pandas.DataFrame()):
+    return lenovo_processor.LenovoProcessor(name, invoice_month, data)