bas 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe416744cd3c3fb9f0902dfc6a3b1432b63425a00da2cea4828a69b0f7e4595a
-  data.tar.gz: 02701d0e8b83c71e0721ebae2a197c6f9204414d3a6f313052152bc2e6957863
+  metadata.gz: 680fbfea9ee1348a6315220f7b92b58e1cca92003dbe637100c4ba97f6dfb1fe
+  data.tar.gz: 68d8da3ea3b1ca80ba09ad95b4715a5ced92f05e59c4e9a43e9980a869a216ad
 SHA512:
-  metadata.gz: b63e685728abb1a3c80ab896aca20f9621a08b3f3defa9ca682912e9722359a3510b2bfd65154bedc3a0171f372ea9f1df63ae6305bbfc48b28f36477c8c2761
-  data.tar.gz: 7f73e57bc600b044a82deb51c97b30eab54bc5de48122f554d18614e08a273950fa705f5403accd6ff5899e54dbba5ccb3634cf0504769073a55d8d6a7b695bc
+  metadata.gz: 57de8f36915f5a42a69d664cd5d712ffcfecafba3957b2bc1d3a24c26bebe679c2f87fc2544f513393938825b45c2ef64b477178414d4684aac4704f27f11148
+  data.tar.gz: 411d5662f4790e35c3430aeb38eafb2d48958b5d7783cbfb880a993ec477363762eea868578334039614a82d6e72dbb418e4cff9170e88434c8f3d52744ef80c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 1.9.2 (21.07.2025)
+- [Refactor PostgreSQL connections](https://github.com/kommitters/bas/pull/153)
+
+# 1.9.1 (15.07.2025)
+- [refactor: Refactor client to meet the needs of the implementation to be performed](https://github.com/kommitters/bas/pull/149)
+
 # 1.9.0 (15.07.2025)
 - [feat: Implement client to perform process deployments and instance creation in Operaton via the REST API](https://github.com/kommitters/bas/pull/146)
 

data/lib/bas/bot/base.rb

@@ -15,7 +15,8 @@ module Bas
       attr_accessor :read_response, :process_response, :write_response
 
       def initialize(options, shared_storage_reader, shared_storage_writer = nil)
-        @process_options = options || {}
+        default_options = { close_connections_after_process: true }
+        @process_options = default_options.merge(options || {})
         @shared_storage_reader = shared_storage_reader
         @shared_storage_writer = shared_storage_writer || shared_storage_reader
       end
@@ -31,6 +32,8 @@ module Bas
         @shared_storage_reader.set_processed
 
         @write_response = write
+
+        close_connections if @process_options[:close_connections_after_process].eql?(true)
       end
 
       protected
@@ -60,6 +63,11 @@ module Bas
 
         read_data.nil? || read_data == {} || read_data.any? { |_key, value| [[], "", nil].include?(value) }
       end
+
+      def close_connections
+        @shared_storage_reader.close_connections if @shared_storage_reader.respond_to?(:close_connections)
+        @shared_storage_writer.close_connections if @shared_storage_writer.respond_to?(:close_connections)
+      end
     end
   end
 end

data/lib/bas/shared_storage/base.rb

@@ -21,6 +21,8 @@ module Bas
 
       def set_processed; end
 
+      def close_connections; end
+
       protected
 
       def read

data/lib/bas/shared_storage/postgres.rb

@@ -2,7 +2,7 @@
 
 require_relative "base"
 require_relative "types/read"
-require_relative "../utils/postgres/request"
+require_relative "../utils/postgres/connection"
 require_relative "../version"
 
 require "json"
@@ -17,17 +17,25 @@ module Bas
       TABLE_PARAMS = "data, tag, archived, stage, status, error_message, version"
 
       def read
-        params = { connection: read_options[:connection], query: read_query }
+        establish_connection(:read)
 
-        first_result = Utils::Postgres::Request.execute(params).first || {}
+        first_result = @read_connection.query(read_query).first || {}
 
         @read_response = Bas::SharedStorage::Types::Read.new(first_result[:id], first_result[:data],
                                                              first_result[:inserted_at])
       end
 
       def write(data)
-        params = { connection: write_options[:connection], query: write_query(data) }
-        @write_response = Utils::Postgres::Request.execute(params)
+        establish_connection(:write)
+
+        @write_response = @write_connection.query(write_query(data))
+      end
+
+      def close_connections
+        @read_connection&.finish
+        @write_connection&.finish
+        @read_connection = nil
+        @write_connection = nil
       end
 
       def set_in_process
@@ -44,6 +52,15 @@ module Bas
 
       private
 
+      def establish_connection(action)
+        case action
+        when :read
+          @read_connection ||= Utils::Postgres::Connection.new(read_options[:connection])
+        when :write
+          @write_connection ||= Utils::Postgres::Connection.new(write_options[:connection])
+        end
+      end
+
       def read_query
         query = "SELECT id, data, inserted_at FROM #{read_options[:db_table]} WHERE status='success' AND #{where}"
 
@@ -78,9 +95,9 @@ module Bas
       end
 
       def update_stage(id, stage)
-        params = { connection: read_options[:connection], query: update_query(id, stage) }
+        establish_connection(:read)
 
-        Utils::Postgres::Request.execute(params)
+        @read_connection.query(update_query(id, stage))
       end
 
       def update_query(id, stage)

data/lib/bas/utils/operaton/process_client.rb

@@ -40,16 +40,15 @@ module Utils
       def instance_with_business_key_exists?(process_key, business_key)
         query_params = {
           processDefinitionKey: process_key,
-          maxResults: 50
+          maxResults: 50,
+          active: true
         }
 
         response = get("/history/process-instance", query_params)
         response.any? { |instance| instance["businessKey"] == business_key }
       end
 
-      def start_process_instance_by_key(process_key, business_key:, variables: {}, validate_business_key: true)
-        validate_uniqueness!(process_key, business_key) if validate_business_key
-
+      def start_process_instance_by_key(process_key, business_key:, variables: {})
         json_payload = {
           businessKey: business_key,
           variables: format_variables(variables)
@@ -72,12 +71,6 @@ module Utils
           f.adapter Faraday.default_adapter
         end
       end
-
-      def validate_uniqueness!(process_key, business_key)
-        return unless instance_with_business_key_exists?(process_key, business_key)
-
-        raise "There is already an instance for processing '#{process_key}' with business key '#{business_key}'"
-      end
     end
   end
 end

data/lib/bas/utils/postgres/connection.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "pg"
+
+module Utils
+  module Postgres
+    # This module is a PostgresDB utility to establish connections to a Postgres database
+    # and execute raw or parameterized queries.
+    #
+    class Connection
+      def initialize(params)
+        @connection = PG::Connection.new(params)
+      end
+
+      def query(query)
+        results = if query.is_a? String
+                    @connection.exec(query)
+                  else
+                    validate_query(query)
+
+                    sentence, params = query
+                    @connection.exec_params(sentence, params)
+                  end
+
+        results.map { |result| result.transform_keys(&:to_sym) }
+      end
+
+      def finish
+        @connection&.finish
+        @connection = nil
+      end
+
+      private
+
+      def validate_query(query)
+        return if query.is_a?(Array) && query.size == 2 && query[0].is_a?(String) && query[1].is_a?(Array)
+
+        raise ArgumentError, "Parameterized query must be an array of [sentence (String), params (Array)]"
+      end
+    end
+  end
+end

data/lib/bas/version.rb

@@ -2,5 +2,5 @@
 
 module Bas
   # Gem version
-  VERSION = "1.9.0"
+  VERSION = "1.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bas
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - kommitters Open Source
@@ -115,6 +115,7 @@ files:
 - lib/bas/utils/operaton/base_operaton_client.rb
 - lib/bas/utils/operaton/external_task_client.rb
 - lib/bas/utils/operaton/process_client.rb
+- lib/bas/utils/postgres/connection.rb
 - lib/bas/utils/postgres/request.rb
 - lib/bas/version.rb
 - renovate.json
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: BAS - Business automation suite
 test_files: []