bas 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6301713e4aa3a33bd8b221ebc9ad27769f4fec96f51c281f707093a64405f639
-  data.tar.gz: a6c0caed10c86f2ee8d5ec2bd2d0ad87e3ea8be9b6c8a1f542a4965b174412bf
+  metadata.gz: bfa9acb9efb51fe26d268d6bc38799332b88993be0ee741ce23a227ba58ab7c5
+  data.tar.gz: d26a75cf2d382118c5a1e22c65800a25332fc87d887dbf6f017bd92985d80a14
 SHA512:
-  metadata.gz: 56f493893506461d836362936b30e511be6d6508aa9a2b992479c78359c71b026bfe6098e094c4d8e66239a2ac946c45dd577b05d49d574b2e42227c6e344ae9
-  data.tar.gz: 326a87c50f0ce824f7a046600a9cdad8f06e31514a4799ecde76d503a6190e0b73f6b2d035c6d6ee769693c84ee5a474dfb6e37f729a379ef9787b0f44fe871d
+  metadata.gz: 7bc1bbbcd20e52f09c45957f51ff3a28f760788c6ebca1fd2f90583a784b57ad0cad30057682cdeb16d0d297b1ed7064f7ccd6ec2c277c0eef996ef00f30748e
+  data.tar.gz: 2a7b07eab34fe4252174174f059108bd6d167f301cd49c15f56e99e6c7c1ec597b398ac1053db8102874a0120a2ff7e8075d8297d3c3ee323394c2c461f96d2c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 1.9.3 (23.07.2025)
+- [Return write_response after on bot execution](https://github.com/kommitters/bas/pull/155)
+
+# 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)
 

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,10 @@ module Bas
         @shared_storage_reader.set_processed
 
         @write_response = write
+
+        close_connections if @process_options[:close_connections_after_process].eql?(true)
+
+        @write_response
       end
 
       protected
@@ -60,6 +65,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/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.1"
+  VERSION = "1.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bas
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.3
 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