Merge branch 'vij-adjust-sam-destroyed-worker' into 'master'

Only remove SeatAssignment if no other membership

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173699



Merged-by: Mohamed Hamda <mhamda@gitlab.com>
Approved-by: Bishwa Hang Rai <bhrai@gitlab.com>
Approved-by: Mohamed Hamda <mhamda@gitlab.com>
Reviewed-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Reviewed-by: Bishwa Hang Rai <bhrai@gitlab.com>
Reviewed-by: Mohamed Hamda <mhamda@gitlab.com>
Co-authored-by: Vijay Hawoldar <vhawoldar@gitlab.com>

ee/app/workers/gitlab_subscriptions/members/destroyed_worker.rb

@@ -17,7 +17,7 @@ def handle_event(event)
 
         return unless user && namespace&.group_namespace?
 
-        return if namespace.billed_project_user?(user) || namespace.billed_group_user?(user)
+        return if ::Member.in_hierarchy(namespace).with_user(user).exists?
 
         GitlabSubscriptions::SeatAssignment.find_by_namespace_and_user(namespace, user)&.destroy
       end

ee/spec/workers/gitlab_subscriptions/members/destroyed_worker_spec.rb

@@ -89,17 +89,25 @@
       it_behaves_like 'returns early'
     end
 
-    context 'when user is still billed member of group hierarchy' do
+    context 'when user is still a member of group hierarchy' do
       let(:another_sub_group) { create(:group, parent: root_namespace) }
 
       before do
-        another_sub_group.add_developer(user)
+        another_sub_group.add_guest(user)
       end
 
       it_behaves_like 'returns early'
+
+      context 'when the user is blocked' do
+        before do
+          user.block!
+        end
+
+        it_behaves_like 'returns early'
+      end
     end
 
-    context 'when user is still billed member of project hierarchy' do
+    context 'when user is still a member of project hierarchy' do
       let(:project) { build(:project, group: root_namespace) }
 
       before do