herdst_worker 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da174a99ab5adb9ead51ce658fe766168a67f192c2b29c4dece4bb053497182
-  data.tar.gz: 0623b5535cafcd7fa59b2de19ee8571d119e472940d692b9aa8dcfbb145aeaa8
+  metadata.gz: f923f35476bb893010b8dfe3fd0ecd8d60cfe599d21b187d1ef2c615e721a8c0
+  data.tar.gz: db24d82e075659d3cdb955e184f0504d44769f615341c53e33a8140ea022ed3d
 SHA512:
-  metadata.gz: 873c462a26fc7dcec6c02b59e6a5bb3a4b08c52ccf7b06aa093d6db677fb858ef6ba0985cd4a3c07e3e3dc48a083d42732def672adde350db6e53f15638e637a
-  data.tar.gz: 6bf8ff1584c6d7a2936d249b54f22ae85fe791cd4f196e3693f6d02e4ecd8ab21f6c18e3e5bf60c4ecf4b04ca5fb902e1b10dd23761ae398f9618adb3276a889
+  metadata.gz: 94aaf2d09122cdb0eb8b386cb91f3207d7cbb1a98dfc7ad3bbfecbcdedbded460162c73fd4d83daae306d885de83be76c517eb2efc27b0109c0c04302cf7cf12
+  data.tar.gz: 4c1a7e468c82f9467eb6a57d020d5e64057185b15399ab8c8debae202eca047d2fd7fcae5ebed9da67a4a277ffb513ce6de8d6cd0eb9581c76040b9f40fd6a07

data/lib/herdst_worker/configuration/metadata.rb

@@ -60,6 +60,24 @@ module HerdstWorker
             def get_aws_credentials
                 self.get_aws_credentials! rescue nil
             end
+
+
+            def get_tasks_info
+                metadata = make_request!(get_metadata_uri)
+
+                ecs_client = Aws::ECS::Client.new(
+                    :region => self.secrets["AWS_REGION"],
+                    :credentials => self.aws_credentials
+                )
+                
+                ecs_client.describe_tasks(
+                    :cluster => metadata["Cluster"],
+                    :tasks => [
+                        metadata["TaskARN"]
+                    ],
+                    :include => ["TAGS"]
+                )
+            end
             
             
             def get_aws_credentials!
@@ -103,28 +121,14 @@ module HerdstWorker
                     return self.secrets["DEPLOYMENT_ENV"] if self.secrets["DEPLOYMENT_ENV"]
                     
                     if self.is_prod?
-                        metadata = make_request!(get_metadata_uri)
-                        
-                        ecs_client = Aws::ECS::Client.new(
-                            :region => self.secrets["AWS_REGION"],
-                            :credentials => self.aws_credentials
-                        )
-                        
-                        ecs_response = ecs_client.describe_tasks(
-                            :cluster => metadata["Cluster"],
-                            :tasks => [
-                                metadata["TaskARN"]
-                            ],
-                            :include => ["TAGS"]
-                        )
-                        
-                        ecs_response["tasks"][0]["tags"].each do |i|
+                        info = self.get_tasks_info
+                        info["tasks"][0]["tags"].each do |i|
                             self[i["key"]] = i["value"]
                         end
                         
                         report_error("Deployment env not found") unless self.secrets["DEPLOYMENT_ENV"]
                         
-                        self["RELEASE_VERSION"] = ecs_response["tasks"][0]["containers"][0]["containerArn"] rescue nil
+                        self["RELEASE_VERSION"] = info["tasks"][0]["containers"][0]["containerArn"] rescue nil
                     else
                         self["DEPLOYMENT_ENV"] = "development"
                     end

data/lib/herdst_worker/queue/facade.rb

@@ -92,6 +92,8 @@ module HerdstWorker
             
             
             def create_email_queue_message(template, company, message_data, attributes = nil, delay = 2)
+                company_key = company.class.name.downcase.to_sym
+                
                 # Convert instances of ApplicationRecord to attributes instead of json representation
                 message_data.each do |key, value|
                     message_data[key] = value.attributes if value.is_a?(ActiveRecord::Base)
@@ -108,8 +110,8 @@ module HerdstWorker
                 data[:type] = "email"
                 data[:template] = template
                 data[:data] = message_data || {}
-                data[:data][:company] = company unless data[:data][:company].present?
-                
+                data[:data][company_key] = company unless data[:data][company_key].present?
+
                 # Add message structure
                 message = Hash.new
                 message[:id] = SecureRandom.hex(32)

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Herd.St
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport