foreman_patch 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61017bed1470ce847f846672dfeebd6a6067de86accd24b6eead1f91e4d9e40e
-  data.tar.gz: dd6090434ba0a7268ec4181c05329269aebd3c1e1cd688d52f5a0ec35ef04429
+  metadata.gz: 0e085e0af8a761e81fc5c3cddd51588babe0e0e6397d2f2448cbb7c346ef8b42
+  data.tar.gz: 752762b8b5a4f034e348500315e5a962ffd9e87b3875cc3943e4fbbeaad79a60
 SHA512:
-  metadata.gz: 7ecbf824ada84059985681bdd48af13c6407ed64e3ff4adf828600b41a06758dc2dbf04c6bdc449af9261d8f1ce1ffebb9fd26e50cd2fd11c0f336a9de28d0a6
-  data.tar.gz: 7deff88e4728fcfac393bfa24aafa1756d463e4eca2707694aec5283e644066f7d4719f51894493b187a8aac52bbc71b7e0c744efc256735dee9798ea831c175
+  metadata.gz: 054e1ea317df4617f8c6748239c80401c45c3c61efb8f666e6495e7f502346bf612d55c9dca07f70ff5d3fafde7ec357e441dabe7721f67a566de965e28b33b3
+  data.tar.gz: 3c07b4f6f0d4b0fb154819a3f1f0c7e931bbe59beacfe4bdca42de9b3ca53b45a6864c5c855b011dc0d4947144e8ca58dbca4100c9a1db9b822010bca0a3d56e

data/app/lib/actions/foreman_patch/window/publish.rb

@@ -15,7 +15,7 @@ module Actions
 
           ticket.save
 
-          output.update(response: ticket.response)
+          output.update(response: ticket.to_h)
         end
 
         def window

data/app/services/foreman_patch/ticket/affected_items.rb

@@ -51,9 +51,9 @@ module ForemanPatch
         hosts.each_with_object([]) do |host, batches|
           batches.push([]) if batches.empty?
 
-          batch = batch.last.push(host)
+          batch = batches.last.push(host)
 
-          uri.query = URI.encode_www_form(param.merge({
+          uri.query = URI.encode_www_form(params.merge({
             sysparm_query: "host_nameIN#{batch.join(',')}",
           }))
 
@@ -62,7 +62,7 @@ module ForemanPatch
             batches.push([host])
           end
         end.each_with_object([]) do |batch, items|
-          get(uri.path, params.merge({
+          response = get(uri.path, params.merge({
             sysparm_query: "host_nameIN#{batch.join(',')}",
           }))
 
@@ -77,7 +77,7 @@ module ForemanPatch
           sysparm_fields: 'sys_id,task,ci_item',
         }
 
-        get('/api/now/table/task_ci', params)
+        response = get('/api/now/table/task_ci', params)
 
         response.nil? ? [] : response['result']
       end

data/app/services/foreman_patch/ticket/api.rb

@@ -7,14 +7,6 @@ module ForemanPatch
         Setting[:ticket_api_host]
       end
 
-      def response
-        @response ||= send_request
-      end
-
-      def url
-        request.uri.to_s
-      end
-
       def proxy
         return nil if Setting[:ticket_api_proxy].blank?
 
@@ -22,24 +14,24 @@ module ForemanPatch
       end
 
       def get(path, params = {})
-        create_request(:get, path, params)
+        send_request(:get, path, params)
       end
 
       def post(path, payload, params = {})
-        create_request(:post, path, params, payload)
+        send_request(:post, path, params, payload)
       end
 
       def put(path, payload, params = {})
-        create_request(:put, path, params, payload)
+        send_request(:put, path, params, payload)
       end
 
       def delete(path)
-        create_request(:delete, path)
+        send_request(:delete, path)
       end
 
-      def create_request(method, path, params = {}, payload = nil)
-        @response = nil
-
+      private 
+      
+      def send_request(method, path, params = {}, payload = nil)
         args = {
           method: method,
           url: URI.join(Setting[:ticket_api_host], path).to_s,
@@ -55,17 +47,12 @@ module ForemanPatch
         args[:payload] = payload.to_json unless payload.nil?
         args[:proxy] = proxy
 
-        @request = RestClient::Request.new(args)
-      end
-
-      def send_request
-        @response = JSON.parse(@request.execute)
+        JSON.parse(RestClient::Request.execute(args))
       rescue RestClient::ExceptionWithResponse => error
         Rails.logger.error(error.response)
       rescue => error
         Rails.logger.error(error)
       end
-      
     end
   end
 end

data/app/services/foreman_patch/ticket/change_request.rb

@@ -5,42 +5,43 @@ module ForemanPatch
 
       attr_reader :window, :response, :affected_items
 
-      def self.publish(window)
-        ticket = Ticket.new(window)
-        ticket.save
-      end
-
       def initialize(window)
         @window = window
-        @hash = {}
+        @ticket = {}
         reload
       end
 
       def reload
         return if window.ticket_id.blank?
 
-        get(path)
-
-        @affected_items = AffectedItems.new(self)
+        response = get(path)
+        unless response.empty?
+          @ticket = response['result']
+        
+          @affected_items = AffectedItems.new(self)
+        end
 
-        ticket
+        @ticket
       end
 
       def save
+        response = {}
         if window.ticket_id.blank?
-          post(path, payload)
+          response = post(path, payload)
         else
-          put(path, payload)
+          response = put(path, payload)
         end
 
         unless response.empty?
+          @ticket = response['result']
+
+          window.update(ticket_id: id) if id != window.ticket_id
+
           @affected_items = AffectedItems.new(self)
           @affected_items.set(window.hosts)
         end
 
-        window.update(ticket_id: id)
-
-        ticket
+        @ticket
       end
 
       def payload
@@ -48,11 +49,11 @@ module ForemanPatch
       end
 
       def id
-        ticket.fetch(Setting[:ticket_id_field], window.ticket_id)
+        @ticket.fetch(Setting[:ticket_id_field], window.ticket_id)
       end
 
       def label
-        ticket.fetch(Setting[:ticket_label_field], window.name)
+        @ticket.fetch(Setting[:ticket_label_field], window.name)
       end
 
       def link
@@ -62,11 +63,15 @@ module ForemanPatch
       end
 
       def keys
-        ticket.keys
+        @ticket.keys
       end
 
       def [](key)
-        ticket[key]
+        @ticket[key]
+      end
+
+      def to_h
+        @ticket
       end
 
       class Jail < Safemode::Jail
@@ -75,12 +80,6 @@ module ForemanPatch
 
       private
 
-      def ticket
-        return {} if response.empty?
-
-        response['result']
-      end
-
       def path
         path = Setting[:ticket_api_path]
         path += "/#{window.ticket_id}" unless id.blank?

data/lib/foreman_patch/version.rb

@@ -1,3 +1,3 @@
 module ForemanPatch
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/public/assets/foreman_patch/foreman_patch.json

@@ -1 +1 @@
-{"files":{"foreman_patch/cycle_plans-ff3d252119622a68828ff70f4a97328303963002237dbf850e92d6a706e93667.scss":{"logical_path":"foreman_patch/cycle_plans.scss","mtime":"2024-12-04T21:07:08+00:00","size":106,"digest":"aa7bb2d36a98d83776b4dd9dd93431ba648b84a37478f93c445eb9bda0f84006","integrity":"sha256-qnuy02qY2Dd2tN2d2TQxumSLhKN0ePk8RF65vaD4QAY="},"foreman_patch/foreman_patch-be2e2ba89548f4a490612e8a6cd1cdebc0473be89f8023a3df7612f05a75d301.css":{"logical_path":"foreman_patch/foreman_patch.css","mtime":"2024-12-04T21:07:08+00:00","size":87,"digest":"d6fdcb3359ce0ca3edd9a493467bc366b5f2b52a0d3e2fd2b5d1dec121ef31ff","integrity":"sha256-1v3LM1nODKPt2aSTRnvDZrXytSoNPi/StdHewSHvMf8="},"foreman_patch/plan_edit_windows-9ba20f84f3ecf2c4eb903acd57d30ee3e16f023a79db30bc614aa22f26442ce3.js":{"logical_path":"foreman_patch/plan_edit_windows.js","mtime":"2024-12-04T21:07:08+00:00","size":144,"digest":"be5de0eef57205a38f90eda24c8f8aed707f5d30e8a5abbc3ce9f198ea55a620","integrity":"sha256-vl3g7vVyBaOPkO2iTI+K7XB/XTDopau8POnxmOpVpiA="}},"assets":{"foreman_patch/cycle_plans.scss":"foreman_patch/cycle_plans-ff3d252119622a68828ff70f4a97328303963002237dbf850e92d6a706e93667.scss","foreman_patch/foreman_patch.css":"foreman_patch/foreman_patch-be2e2ba89548f4a490612e8a6cd1cdebc0473be89f8023a3df7612f05a75d301.css","foreman_patch/plan_edit_windows.js":"foreman_patch/plan_edit_windows-9ba20f84f3ecf2c4eb903acd57d30ee3e16f023a79db30bc614aa22f26442ce3.js"}}
+{"files":{"foreman_patch/cycle_plans-ff3d252119622a68828ff70f4a97328303963002237dbf850e92d6a706e93667.scss":{"logical_path":"foreman_patch/cycle_plans.scss","mtime":"2025-01-06T17:18:57+00:00","size":106,"digest":"aa7bb2d36a98d83776b4dd9dd93431ba648b84a37478f93c445eb9bda0f84006","integrity":"sha256-qnuy02qY2Dd2tN2d2TQxumSLhKN0ePk8RF65vaD4QAY="},"foreman_patch/foreman_patch-be2e2ba89548f4a490612e8a6cd1cdebc0473be89f8023a3df7612f05a75d301.css":{"logical_path":"foreman_patch/foreman_patch.css","mtime":"2025-01-06T17:18:57+00:00","size":87,"digest":"d6fdcb3359ce0ca3edd9a493467bc366b5f2b52a0d3e2fd2b5d1dec121ef31ff","integrity":"sha256-1v3LM1nODKPt2aSTRnvDZrXytSoNPi/StdHewSHvMf8="},"foreman_patch/plan_edit_windows-9ba20f84f3ecf2c4eb903acd57d30ee3e16f023a79db30bc614aa22f26442ce3.js":{"logical_path":"foreman_patch/plan_edit_windows.js","mtime":"2025-01-06T17:18:57+00:00","size":144,"digest":"be5de0eef57205a38f90eda24c8f8aed707f5d30e8a5abbc3ce9f198ea55a620","integrity":"sha256-vl3g7vVyBaOPkO2iTI+K7XB/XTDopau8POnxmOpVpiA="}},"assets":{"foreman_patch/cycle_plans.scss":"foreman_patch/cycle_plans-ff3d252119622a68828ff70f4a97328303963002237dbf850e92d6a706e93667.scss","foreman_patch/foreman_patch.css":"foreman_patch/foreman_patch-be2e2ba89548f4a490612e8a6cd1cdebc0473be89f8023a3df7612f05a75d301.css","foreman_patch/plan_edit_windows.js":"foreman_patch/plan_edit_windows-9ba20f84f3ecf2c4eb903acd57d30ee3e16f023a79db30bc614aa22f26442ce3.js"}}