uffizzi_core 2.1.21 → 2.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ddf1cdf5ca4493e22183f6af9fc269b6e84e75cbb069362837cd760c92c1324
-  data.tar.gz: 25d66bc0bb87075efb2de98620d7f63ac981edda10d4648d57ffb7fd0bbd7623
+  metadata.gz: 0006c772fa6daeaecbd5eab034433a8e66b5b6090b5af1f52dc93627ddbab788
+  data.tar.gz: 2df15f2b34462e716536e71bb55567cab5792dffbe7e6f797d0ceee8de5badca
 SHA512:
-  metadata.gz: 69caa51097ef93e07376fb2dc80c8a0295ae319bc25a7fc4b91fd7f60370669859629834791787633c5610889f3fa383810583d9029435115234b5dac3e152a4
-  data.tar.gz: 90823bbec114d8cec8f405c9c7081ca4cb8e039c74ff00ec7d125ec600e0a264cfb4560dfc954853b08d6f09364c85a377a9884818220df428ebd782ada7a95c
+  metadata.gz: 9b4082dc0121834a765c085c7554ffc6aa789018d77d33d5390a5a422c313fe39460cc5fdeed9c26d3bfaffb56c4e744ec7110bdb30c8d3cbc2be6302a72e6b0
+  data.tar.gz: f4b51425b29c3fb7cf81b6964503e45acee38ab0d193a019261bd94d4bee2d8c564694795a49438c10a7029871cb0157e7cfcc624dcbed425f1c0db2aeb7a21e

data/app/lib/uffizzi_core/concerns/models/membership.rb

@@ -22,9 +22,14 @@ module UffizziCore::Concerns::Models::Membership
     aasm(:state) do
       state :active, initial: true
       state :blocked
+      state :inactive
 
       event :activate do
-        transitions from: [:blocked], to: :active
+        transitions from: [:blocked, :inactive], to: :active
+      end
+
+      event :deactivate do
+        transitions from: [:active], to: :inactive
       end
 
       event :block do

data/app/services/uffizzi_core/activity_item_service.rb

@@ -45,18 +45,16 @@ class UffizziCore::ActivityItemService
       deployment = container.deployment
       service = UffizziCore::ManageActivityItemsService.new(deployment)
       container_status_item = service.container_status_item(container)
+      return if container_status_item.nil?
+
       status = container_status_item[:status]
       last_event = activity_item.events.order_by_id.last
-
       activity_item.events.create(state: status) if last_event&.state != status
 
-      if failed?(status)
-        UffizziCore::ActivityItemService.fail_deployment!(activity_item)
-        notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
-      end
+      return handle_failed_status(activity_item, deployment) if failed?(status)
 
       if deployed?(status) && UffizziCore::ContainerService.ingress_container?(container)
-        deployment.update(last_deploy_at: last_event.created_at)
+        return deployment.update(last_deploy_at: last_event.created_at)
       end
 
       return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)
@@ -66,6 +64,11 @@ class UffizziCore::ActivityItemService
 
     private
 
+    def handle_failed_status(activity_item, deployment)
+      UffizziCore::ActivityItemService.fail_deployment!(activity_item)
+      notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
+    end
+
     def create_item!(activity_item_attributes)
       activity_item = UffizziCore::ActivityItem.find_by(activity_item_attributes)
       return activity_item unless completed?(activity_item)

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.1.21'
+  VERSION = '2.1.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.21
+  version: 2.1.23
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm