bas 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab201fef0200fb13b92ff49a3925c0fc2a10efd26a473d987cc9eef4ddbeae6
-  data.tar.gz: 93724237d9d6865c369e46f528a2a92dc63b7dd4239d5b0d37725cdb57d96ff9
+  metadata.gz: 4b66afc50b75886393d36686a909055c677de6c84cea65580c40142487440097
+  data.tar.gz: 454565030fbbea5d60a54ec5f6bf7ec43f996f64ed5bc372908470a7173a09cf
 SHA512:
-  metadata.gz: a958b5d144da8fa1e162d5d44a18dd30472d2cd7bbd9c6d3fe6991d860a2b5199b9c68aff3b190fbdc48cc275b686c6707b304b39552a6776945e391b4bcb5b1
-  data.tar.gz: 30d014adce784050342b51663a583ee7474e2f00b28ef60210254c5f3fdf43d614607bff763325d93016d5b6bd320a5cdb9363a86b03082d37e28d896248979a
+  metadata.gz: 0d6a66d745da40e8498b63eb12a2e8e006d727313c08a8924cbbf5fe960362fe6621b9059ecc430103a1bcf3740618dcfa55d3ed11f21e8b8847cb7b6767a723
+  data.tar.gz: ebb4c84192b579df371022608bf0195f177b8fcd9d7cbacfb03c77d724ceef8e0d25cff3281c78e92db28e3ba8deb07281fb4611608afc4bff667b65fe7e101e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 1.4.1 (12.08.2024)
+- [Add github issues assignees to work items](https://github.com/kommitters/bas/issues/92)
+
 # 1.4.0 (26.07.2024)
 - [Add bots to synchronize issues with notion work items](https://github.com/kommitters/bas/issues/87)
 - [Update fetch pto from notion bot](https://github.com/kommitters/bas/issues/75)

data/lib/bas/bot/create_work_item.rb

@@ -56,6 +56,7 @@ module Bot
     include Utils::Notion::Types
 
     UPDATE_REQUEST = "UpdateWorkItemRequest"
+    STATUS = "Backlog"
 
     # read function to execute the PostgresDB Read component
     #
@@ -117,17 +118,17 @@ module Bot
 
     def properties # rubocop:disable Metrics/AbcSize
       {
-        "Responsible domain": select(process_options[:domain]),
-        "Github Issue id": rich_text(read_response.data["issue"]["id"].to_s),
-        "Status": status(process_options[:status]),
+        "Responsible domain": select(read_response.data["domain"]),
+        "Github Issue Id": rich_text(read_response.data["issue"]["id"].to_s),
+        "Status": status(STATUS),
         "Detail": title(read_response.data["issue"]["title"])
       }.merge(work_item_type)
     end
 
     def work_item_type
-      case process_options[:work_item_type]
-      when "activity" then { "Activity": relation(process_options[:activity]) }
-      when "project" then { "Project": relation(process_options[:project]) }
+      case read_response.data["work_item_type"]
+      when "activity" then { "Activity": relation(read_response.data["type_id"]) }
+      when "project" then { "Project": relation(read_response.data["type_id"]) }
       else {}
       end
     end

data/lib/bas/bot/fetch_github_issues.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "./base"
-require_relative "../read/default"
+require_relative "../read/postgres"
 require_relative "../utils/github/octokit_client"
 require_relative "../write/postgres"
 
@@ -32,6 +32,15 @@ module Bot
   #       repo: "repository name",
   #       filters: "hash with filters",
   #       organization: "GitHub organization name"
+  #       connection: {
+  #         host: "localhost",
+  #         port: 5432,
+  #         dbname: "bas",
+  #         user: "postgres",
+  #         password: "postgres"
+  #       },
+  #       db_table: "github_issues",
+  #       tag: "GithubIssueRequest"
   #     },
   #     write_options: {
   #       connection: {
@@ -50,7 +59,7 @@ module Bot
   #   bot.execute
   #
   class FetchGithubIssues < Bot::Base
-    ISSUE_PARAMS = %i[id html_url title body labels state created_at updated_at].freeze
+    ISSUE_PARAMS = %i[id html_url title body labels state created_at updated_at state].freeze
     PER_PAGE = 100
 
     # read function to execute the PostgresDB Read component
@@ -69,9 +78,9 @@ module Bot
       if octokit[:client]
         repo_issues = octokit[:client].issues(@process_options[:repo], filters)
 
-        issues = normalize_response(repo_issues)
+        normalize_response(repo_issues).each { |issue| create_request(issue) }
 
-        { success: { issues: } }
+        { success: { created: true } }
       else
         { error: octokit[:error] }
       end
@@ -107,7 +116,7 @@ module Bot
     def filters
       default_filter = { per_page: PER_PAGE }
 
-      filters = @process_options[:filters]
+      filters = process_options[:filters]
       filters = filters.merge({ since: read_response.inserted_at }) unless read_response.nil?
 
       filters.is_a?(Hash) ? default_filter.merge(filters) : default_filter
@@ -121,5 +130,18 @@ module Bot
         end
       end
     end
+
+    def create_request(issue)
+      write_data = {
+        success: {
+          issue:,
+          work_item_type: process_options[:work_item_type],
+          type_id: process_options[:type_id],
+          domain: process_options[:domain]
+        }
+      }
+
+      Write::Postgres.new(process_options, write_data).execute
+    end
   end
 end

data/lib/bas/bot/format_do_bill_alert.rb

@@ -93,11 +93,9 @@ module Bot
       balance = read_response.data["billing"]["month_to_date_balance"]
       threshold = process_options[:threshold]
 
-      """:warning: The **DigitalOcean** daily usage was exceeded.
-      Current balance: #{balance}
-      Threshold: #{threshold}
-      Current daily usage: #{daily_usage.round(3)}
-      """
+      ":warning: The **DigitalOcean** daily usage was exceeded. \
+      Current balance: #{balance}, Threshold: #{threshold}, \
+      Current daily usage: #{daily_usage.round(3)}"
     end
   end
 end

data/lib/bas/bot/update_work_item.rb

@@ -8,6 +8,8 @@ require_relative "../read/postgres"
 require_relative "../utils/notion/request"
 require_relative "../utils/notion/types"
 require_relative "../utils/notion/delete_page_blocks"
+require_relative "../utils/notion/fetch_database_record"
+require_relative "../utils/notion/update_db_page"
 require_relative "../write/postgres"
 
 module Bot
@@ -53,6 +55,7 @@ module Bot
     include Utils::Notion::Types
 
     DESCRIPTION = "Issue Description"
+    GITHUB_COLUMN = "Username"
 
     # read function to execute the PostgresDB Read component
     #
@@ -67,11 +70,11 @@ module Bot
     def process
       return { success: { updated: nil } } if unprocessable_response
 
-      delete_wi
-
-      response = Utils::Notion::Request.execute(params)
+      response = process_wi
 
       if response.code == 200
+        update_assigness
+
         { success: { issue: read_response.data["issue"] } }
       else
         { error: { message: response.parsed_response, status_code: response.code } }
@@ -95,6 +98,12 @@ module Bot
       }
     end
 
+    def process_wi
+      delete_wi
+
+      Utils::Notion::Request.execute(params)
+    end
+
     def params
       {
         endpoint: "blocks/#{read_response.data["notion_wi"]}/children",
@@ -121,12 +130,52 @@ module Bot
     end
 
     def delete_wi
-      params = {
+      options = {
         page_id: read_response.data["notion_wi"],
         secret: process_options[:secret]
       }
 
-      Utils::Notion::DeletePageBlocks.new(params).execute
+      Utils::Notion::DeletePageBlocks.new(options).execute
+    end
+
+    def update_assigness
+      relation = users.map { |user| user_id(user) }
+
+      options = {
+        page_id: read_response.data["notion_wi"],
+        secret: process_options[:secret],
+        body: { properties: { People: { relation: } }.merge(status) }
+      }
+
+      Utils::Notion::UpdateDatabasePage.new(options).execute
+    end
+
+    def users
+      options = {
+        database_id: process_options[:users_database_id],
+        secret: process_options[:secret],
+        body: { filter: { or: github_usernames } }
+      }
+
+      Utils::Notion::FetchDatabaseRecord.new(options).execute
+    end
+
+    def github_usernames
+      read_response.data["issue"]["assignees"].map do |username|
+        { property: GITHUB_COLUMN, rich_text: { equals: username } }
+      end
+    end
+
+    def user_id(user)
+      relation = user.dig("properties", "People", "relation")
+
+      relation.nil? ? {} : relation.first
+    end
+
+    def status
+      return {} unless read_response.data["issue"]["state"] == "closed"
+
+      { Status: { status: { name: "Done" } } }
     end
   end
 end

data/lib/bas/bot/verify_issue_existance_in_notion.rb

@@ -50,6 +50,7 @@ module Bot
   #
   class VerifyIssueExistanceInNotion < Bot::Base
     NOT_FOUND = "not found"
+    NOTION_PROPERTY = "Github Issue Id"
 
     # read function to execute the PostgresDB Read component
     #
@@ -70,7 +71,7 @@ module Bot
       if response.code == 200
         result = response.parsed_response["results"].first
 
-        { success: { issue: read_response.data["request"], notion_wi: notion_wi_id(result) } }
+        { success: read_response.data.merge({ notion_wi: notion_wi_id(result) }) }
       else
         { error: { message: response.parsed_response, status_code: response.code } }
       end
@@ -107,8 +108,8 @@ module Bot
     def body
       {
         filter: {
-          property: "Github Issue id",
-          rich_text: { equals: read_response.data["request"]["id"].to_s }
+          property: NOTION_PROPERTY,
+          rich_text: { equals: read_response.data["issue"]["id"].to_s }
         }
       }
     end

data/lib/bas/utils/notion/fetch_database_record.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "httparty"
+require_relative "request"
+
+module Utils
+  module Notion
+    ##
+    # This module is a Notion utility for fetching record from a database.
+    #
+    class FetchDatabaseRecord
+      # Implements the fetch page process logic to Notion.
+      #
+      # <br>
+      # <b>Params:</b>
+      # * <tt>database_id</tt> Id of the notion database.
+      # * <tt>secret</tt> Notion secret.
+      # * <tt>body</tt> Body with the filters.
+      #
+      # <br>
+      # <b>returns</b> <tt>HTTParty::Response</tt>
+      #
+      #
+      def initialize(options)
+        @options = options
+      end
+
+      def execute
+        records = Utils::Notion::Request.execute(params)
+
+        records.parsed_response["results"] || []
+      end
+
+      private
+
+      def params
+        {
+          endpoint: "databases/#{@options[:database_id]}/query",
+          secret: @options[:secret],
+          method: "post",
+          body: @options[:body]
+        }
+      end
+    end
+  end
+end

data/lib/bas/utils/notion/types.rb

@@ -7,10 +7,6 @@ module Utils
     # filter or create.
     #
     module Types
-      def multi_select(name)
-        { "multi_select" => [{ "name" => name }] }
-      end
-
       def relation(id)
         { relation: [{ id: }] }
       end

data/lib/bas/utils/notion/update_db_page.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "httparty"
+require_relative "request"
+
+module Utils
+  module Notion
+    ##
+    # This module is a Notion utility for updating database properties.
+    #
+    class UpdateDatabasePage
+      # Implements the update database properties process logic to Notion.
+      #
+      # <br>
+      # <b>Params:</b>
+      # * <tt>page_id</tt> Id of the notion page.
+      # * <tt>secret</tt> Notion secret.
+      # * <tt>body</tt> Request body with the properties to be updated.
+      #
+      # <br>
+      # <b>returns</b> <tt>HTTParty::Response</tt>
+      #
+      #
+      def initialize(options)
+        @options = options
+      end
+
+      def execute
+        Utils::Notion::Request.execute(params)
+      end
+
+      private
+
+      def params
+        {
+          endpoint: "pages/#{@options[:page_id]}",
+          secret: @options[:secret],
+          method: "patch",
+          body: @options[:body]
+        }
+      end
+    end
+  end
+end

data/lib/bas/version.rb

@@ -2,5 +2,5 @@
 
 module Bas
   # Gem version
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bas
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - kommitters Open Source
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gmail_xoauth
@@ -213,7 +213,6 @@ files:
 - lib/bas/bot/update_work_item.rb
 - lib/bas/bot/verify_issue_existance_in_notion.rb
 - lib/bas/bot/write_domain_review_requests.rb
-- lib/bas/bot/write_github_issue_requests.rb
 - lib/bas/bot/write_media_review_in_notion.rb
 - lib/bas/bot/write_media_review_requests.rb
 - lib/bas/read/base.rb
@@ -228,8 +227,10 @@ files:
 - lib/bas/utils/google/send_email.rb
 - lib/bas/utils/imap/request.rb
 - lib/bas/utils/notion/delete_page_blocks.rb
+- lib/bas/utils/notion/fetch_database_record.rb
 - lib/bas/utils/notion/request.rb
 - lib/bas/utils/notion/types.rb
+- lib/bas/utils/notion/update_db_page.rb
 - lib/bas/utils/notion/update_db_state.rb
 - lib/bas/utils/openai/run_assistant.rb
 - lib/bas/utils/postgres/request.rb

data/lib/bas/bot/write_github_issue_requests.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./base"
-require_relative "../read/postgres"
-require_relative "../write/postgres"
-
-module Bot
-  ##
-  # The Bot::WriteGithubIssueRequests class serves as a bot implementation to write GitHub issues
-  # request to be sent individually.
-  #
-  # <br>
-  # <b>Example</b>
-  #
-  #   options = {
-  #     read_options: {
-  #       connection: {
-  #         host: "localhost",
-  #         port: 5432,
-  #         dbname: "bas",
-  #         user: "postgres",
-  #         password: "postgres"
-  #       },
-  #       db_table: "github_issues",
-  #       tag: "FetchGithubIssues"
-  #     },
-  #     process_options: {
-  #       connection: {
-  #         host: "localhost",
-  #         port: 5432,
-  #         dbname: "bas",
-  #         user: "postgres",
-  #         password: "postgres"
-  #       },
-  #       db_table: "github_issues",
-  #       tag: "GithubIssueRequest"
-  #     },
-  #     write_options: {
-  #       connection: {
-  #         host: "localhost",
-  #         port: 5432,
-  #         dbname: "bas",
-  #         user: "postgres",
-  #         password: "postgres"
-  #       },
-  #       db_table: "github_issues",
-  #       tag: "WriteGithubIssueRequests"
-  #     }
-  #   }
-  #
-  #   bot = Bot::WriteGithubIssueRequests.new(options)
-  #   bot.execute
-  #
-  class WriteGithubIssueRequests < Bot::Base
-    # read function to execute the PostgresDB Read component
-    #
-    def read
-      reader = Read::Postgres.new(read_options.merge(conditions))
-
-      reader.execute
-    end
-
-    # Process function to write GitHub issues requests.
-    #
-    def process
-      return { success: { created: nil } } if unprocessable_response
-
-      read_response.data["issues"].each { |request| create_request(request) }
-
-      { success: { created: true } }
-    end
-
-    # Write function to execute the PostgresDB write component
-    #
-    def write
-      write = Write::Postgres.new(write_options, process_response)
-
-      write.execute
-    end
-
-    private
-
-    def conditions
-      {
-        where: "archived=$1 AND tag=$2 AND stage=$3 ORDER BY inserted_at ASC",
-        params: [false, read_options[:tag], "unprocessed"]
-      }
-    end
-
-    def create_request(request)
-      write_data = { success: { request: } }
-
-      Write::Postgres.new(process_options, write_data).execute
-    end
-  end
-end