embedded queries

inex.py

@@ -1,23 +1,20 @@
 import pyodbc
 import os
 import logging
-import datetime
 import tomllib
 from inexLogging import inexLog
 import inexConnect
 from inexDataModel import dataTemplate
 from inexDataProcessing import processData
 import json
-import decimal
 import requests
 import inexEncoder
-
+import inexSqlquery
 class Inex:
     def __init__(self):
         """Initilize config, calls functions from inex-connect.py and inex-logging.py"""
         # assign libraries
         self.db = pyodbc
-        self.tm = datetime
         self.il = logging
         self.ic = inexConnect
         self.r = requests
@@ -25,6 +22,7 @@ class Inex:
         self.os = os
         self.j = json
         self.e = inexEncoder.Encoder
+        self.sq = inexSqlquery
 
         if self.os.path.exists('./config.toml'):
             config_file_path = './config.toml'
@@ -63,9 +61,11 @@ class Inex:
         inexLog(self)
 
         # create the connection to the database
-        self.cursor = self.ic.connectDatabase(self, self.db, self.dbDriver, self.dbServer, self.dbDatabase, self.dbUser, self.dbPassword)
+        self.cursor = self.ic.inexSql.connectDatabase(self, self.db, self.dbDriver, self.dbServer, self.dbDatabase, self.dbUser, self.dbPassword)
 
-        self.data = self.ic.databaseQuery(self, self.cursor, self.dbQuery)
+        # self.data = self.ic.inexSql.databaseQuery(self, self.cursor, self.dbQuery)
+
+        self.data = self.ic.inexSql.databaseQuery(self, self.cursor, self.sq.sqlQuerymodel.queryData())
 
         self.modifiedData = processData(self.data, dataTemplate, prd_instance_id=self.prdInstanceID,\
                                          product_guid=self.productGUID,product_name=self.productName,product_version=self.productVersion)

inexConnect.py

@@ -1,3 +1,4 @@
+class inexSql:
     def connectDatabase(self, lib, driver, server, database, user, password):
         """Connects to the database. Requires a windows driver to do so.
         Typically there is one installed by default"""
@@ -40,6 +41,39 @@ def databaseQuery(self, cursor, query, args=()):
         if self.useLog:
             self.il.debug(f"Database connection closed")
         return r
+    def queryData():
+        """Embedded query data"""
+        q ="""DECLARE	@stopTime DATETIME2
+        SET @stopTime = DATEADD(DAY, -30, GETDATE())
+        SELECT p.[ProtocolCommandID]
+              ,t.[Time_stamp]
+              ,p.[RemoteIP]
+              ,p.[RemotePort]
+              ,p.[LocalIP]
+              ,p.[LocalPort]
+              ,p.[Protocol]
+              ,p.[SiteName]
+              ,p.[Command]
+              ,p.[CommandParameters]
+              ,p.[FileName]
+              ,p.[VirtualFolderName]
+              ,p.[PhysicalFolderName]
+              ,p.[IsInternal]
+              ,p.[FileSize]
+              ,p.[TransferTime]
+              ,p.[BytesTransferred]
+              ,p.[ResultID]
+              ,t.[TransactionID]
+              ,p.[Description]
+              ,p.[Actor]
+        	  ,t.ParentTransactionID
+        	  ,t.TransactionObject
+        	  ,t.NodeName
+        	  ,t.TransactionGUID
+        	  ,a.Protocol user_type
+          FROM [EFTDB].[dbo].[tbl_Transactions] t Full JOIN tbl_ProtocolCommands p ON (t.TransactionID = p.TransactionID) Full join tbl_Authentications a ON (t.TransactionID = a.TransactionID)
+          WHERE p.Time_stamp > @stopTime"""
+        return q
 
 class fortraEFC:
     def getToken(self):

inexSqlquery.py

@@ -0,0 +1,11 @@
+class sqlQuerymodel:
+    def queryData():
+        """Embedded query data"""
+        q ="""DECLARE @stopTime DATETIME2
+        SET @stopTime=DATEADD(DAY, -30, GETDATE())
+        SELECT p.ProtocolCommandID, t.Time_stamp, p.RemoteIP, p.RemotePort, p.LocalIP, p.LocalPort, p.Protocol, p.SiteName, p.Command, p.CommandParameters, p.FileName, p.VirtualFolderName, p.PhysicalFolderName, p.IsInternal, p.FileSize, p.TransferTime, p.BytesTransferred, p.ResultID, t.TransactionID, p.Description, p.Actor, t.ParentTransactionID, t.TransactionObject, t.NodeName, t.TransactionGUID, a.Protocol user_type
+        FROM tbl_Transactions t
+             Full JOIN tbl_ProtocolCommands p ON(t.TransactionID=p.TransactionID)
+             Full join tbl_Authentications a ON(t.TransactionID=a.TransactionID)
+        WHERE p.Time_stamp>@stopTime"""
+        return q