From 5dc12d6c235fcf332837ebe76b3002b6de4b430a Mon Sep 17 00:00:00 2001
From: Jonathan Branan <jonbranan@gmail.com>
Date: Thu, 15 Aug 2024 15:34:42 -0500
Subject: [PATCH] updating data model

---
 inexDataModel.py      | 6 +++---
 inexDataProcessing.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inexDataModel.py b/inexDataModel.py
index 24849f7..06b82bb 100644
--- a/inexDataModel.py
+++ b/inexDataModel.py
@@ -15,7 +15,7 @@ def dataTemplate(transactionType,**kwargs):
         },
         "guid": kwargs.get('guid'),
         "node_name": kwargs.get('node_name'),
-        "prd_ext_tenant_id": kwargs.get('tenant'),
+        "prd_ext_tenant_id": kwargs.get('prd_ext_tenant_id'),
         "product_name": "GlobalScape EFT",
         "prd_ext_tenant_name": "GlobalScape EFT",
         "classifications": [{
@@ -58,7 +58,7 @@ def dataTemplate(transactionType,**kwargs):
             "time": kwargs.get('time'),
         }],
         "prd_ext_tenant_name": "Globalscape EFT",
-        "prd_ext_tenant_id": kwargs.get('tenant'),
+        "prd_ext_tenant_id": kwargs.get('prd_ext_tenant_id'),
         "product_name": "Globalscape EFT",
         "session": {
             "created_time": kwargs.get('time'),
@@ -96,7 +96,7 @@ def dataTemplate(transactionType,**kwargs):
         "type": kwargs.get('dst_endpoint_type')
     },
     "guid": kwargs.get('guid'),
-    "prd_ext_tenant_id": kwargs.get('tenant'),
+    "prd_ext_tenant_id": kwargs.get('prd_ext_tenant_id'),
     "product_name": "GlobalScape EFT",
     "prd_ext_tenant_name": "GlobalScape EFT",
     "src_endpoint": {
diff --git a/inexDataProcessing.py b/inexDataProcessing.py
index cd54fca..e55b810 100644
--- a/inexDataProcessing.py
+++ b/inexDataProcessing.py
@@ -9,7 +9,6 @@ def processData(data, template, **kwargs):
         # print(f'Row: {row}')
         if identifyUtype(row.get('Command')) == "other":
             continue
-        
         if row.get('Command') == None:
             continue
         try:
@@ -51,6 +50,7 @@ def processData(data, template, **kwargs):
         if row.get('TransactionGUID') not in transactionLoginid:
             try:
                 processedData.append(template(identifyUtype(row.get('TransactionObject')),\
+                    prd_ext_tenant_id=kwargs.get('prd_ext_tenant_id'),\
                     guid=row.get('TransactionGUID'),\
                     prd_instance_id=kwargs.get('prd_instance_id'),\
                     product_guid=kwargs.get('product_guid'),\