feat: changed directory structure for ansible yaml files

jasperan · jasperan · commit 42c574d5a90c · 2022-08-31T22:37:02.000+02:00
diff --git a/telemetry_f1_2021/oracledb.py b/telemetry_f1_2021/oracledb.py
@@ -1,33 +1,28 @@
-import cx_Oracle
-import yaml
 import os
 from pathlib import Path
-home = str(Path.home())
+from dotenv import load_dotenv
+import oracledb
 
-def process_yaml():
-	with open("../config.yaml") as file:
-		return yaml.safe_load(file)
+load_dotenv()
 
+home = str(Path.home())
 
-class OracleJSONDatabaseConnection:
-    def __init__(self, data=process_yaml()):
-        # wallet location (default is HOME/wallets/wallet_X)
-        os.environ['TNS_ADMIN'] = '{}/{}'.format(home, process_yaml()['WALLET_DIR'])
-        print(os.environ['TNS_ADMIN'])
-        self.pool = cx_Oracle.SessionPool(data['db']['username'], data['db']['password'], data['db']['dsn'],
-            min=1, max=4, increment=1, threaded=True,
-            getmode=cx_Oracle.SPOOL_ATTRVAL_WAIT
-        )
-        print('Connection successful.')
+oracledb_user = os.getenv("DB_USER")
+oracledb_password = os.getenv("DB_PASSWORD")
+oracledb_connection_string = os.getenv("CONNECTION_STRING")
+instant_client_lib_dir = os.getenv("INSTANT_CLIENT_LIB_DIR")
 
 
+class OracleJSONDatabaseThinConnection:
+    def __init__(self):
+        self.pool = oracledb.create_pool(user=oracledb_user, password=oracledb_password, dsn=oracledb_connection_string,
+                                         min=1, max=4, increment=1, getmode=oracledb.POOL_GETMODE_WAIT)
+        print('Connection successful.')
 
     def close_pool(self):
         self.pool.close()
         print('Connection pool closed.')
 
-
-
     def insert(self, collection_name, json_object_to_insert):
         connection = self.pool.acquire()
         connection.autocommit = True
@@ -36,52 +31,110 @@ def insert(self, collection_name, json_object_to_insert):
 
         try:
             x_collection.insertOne(json_object_to_insert)
-            #print('[DBG] INSERT {} OK'.format(json_object_to_insert))
-        except cx_Oracle.IntegrityError:
-            #print('[DBG] INSERT {} ERR'.format(json_object_to_insert))
-            return 0
-        except cx_Oracle.DatabaseError:
-            print('PACKET STRUCTURAL ERROR. SKIPPING...')
+            print('[DBG] INSERT {} OK'.format(json_object_to_insert))
+        except cx_Oracle.IntegrityError as e:
+            print('[DBG] INSERT {} ERR: {} '.format(json_object_to_insert, e))
             return -1
         self.pool.release(connection)
         return 1
 
-
-
     def delete(self, collection_name, on_column, on_value):
         connection = self.pool.acquire()
         connection.autocommit = True
         soda = connection.getSodaDatabase()
         x_collection = soda.createCollection(collection_name)
         qbe = {on_column: on_value}
-        print('Found {} elements'.format(x_collection.find().filter(qbe).count()))
-        res = x_collection.find().filter(qbe).remove()
-        print('Removed {} documents'.format(res))
+        x_collection.find().filter(qbe).remove()
         self.pool.release(connection)
 
+    def get_connection(self):
+        connection = self.pool.acquire()
+        connection.autocommit = True
+        return connection
+
+    def close_connection(self, conn_object):
+        self.pool.release(conn_object)
+
+    def get_collection_names(self):
+        connection = self.pool.acquire()
+        connection.autocommit = True
+        returning_object = connection.getSodaDatabase(
+        ).getCollectionNames(startName=None, limit=0)
+        self.pool.release(connection)
+        return returning_object
+
+    def open_collection(self, collection_name):
+        connection = self.pool.acquire()
+        returning_object = self.pool.acquire(
+        ).getSodaDatabase().openCollection(collection_name)
+        self.pool.release(connection)
+        return returning_object
+
+
+class OracleJSONDatabaseThickConnection:
+    def __init__(self):
+        oracledb.init_oracle_client(lib_dir=instant_client_lib_dir)
+        self.pool = oracledb.create_pool(user=oracledb_user, password=oracledb_password, dsn=oracledb_connection_string,
+                                         min=1, max=4, increment=1, getmode=oracledb.POOL_GETMODE_WAIT)
+        print('Connection successful.')
+
+    def close_pool(self):
+        self.pool.close()
+        print('Connection pool closed.')
+
+    def insert(self, collection_name, json_object_to_insert):
+        connection = self.pool.acquire()
+        connection.autocommit = True
+        soda = connection.getSodaDatabase()
+        x_collection = soda.createCollection(collection_name)
 
-    def get_count(self, collection_name):
+        try:
+            x_collection.insertOne(json_object_to_insert)
+            print('[DBG] INSERT {} OK'.format(json_object_to_insert))
+        except cx_Oracle.IntegrityError as e:
+            print('[DBG] INSERT {} ERR: {} '.format(json_object_to_insert, e))
+            return -1
+        self.pool.release(connection)
+        return 1
+
+    def delete(self, collection_name, on_column, on_value):
         connection = self.pool.acquire()
+        connection.autocommit = True
         soda = connection.getSodaDatabase()
         x_collection = soda.createCollection(collection_name)
-        count = x_collection.find().count()
-        print('{}'.format(count))
+        qbe = {on_column: on_value}
+        x_collection.find().filter(qbe).remove()
         self.pool.release(connection)
-        return count
 
     def get_connection(self):
         connection = self.pool.acquire()
         connection.autocommit = True
         return connection
 
+    def close_connection(self, conn_object):
+        self.pool.release(conn_object)
+
+    def get_collection_names(self):
+        connection = self.pool.acquire()
+        connection.autocommit = True
+        returning_object = connection.getSodaDatabase(
+        ).getCollectionNames(startName=None, limit=0)
+        self.pool.release(connection)
+        return returning_object
+
+    def open_collection(self, collection_name):
+        connection = self.pool.acquire()
+        returning_object = self.pool.acquire(
+        ).getSodaDatabase().openCollection(collection_name)
+        self.pool.release(connection)
+        return returning_object
 
 
 def test_class():
-    object = OracleJSONDatabaseConnection()
+    object = OracleJSONDatabaseThickConnection()
     print(object.pool)
     object.close_pool()
 
 
-
 if __name__ == '__main__':
     test_class()
