From af7cdb292ce9c131e0a609dffe10e9e6a6ae6088 Mon Sep 17 00:00:00 2001 From: Harsh Date: Fri, 9 Jan 2026 04:08:44 +0530 Subject: [PATCH 1/2] fix: Update project state logic to correctly handle user roles and deactivation Signed-off-by: Harsh --- .../authentication/pkg/project/repository.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/chaoscenter/authentication/pkg/project/repository.go b/chaoscenter/authentication/pkg/project/repository.go index 0fd8a0db75a..d69985eb710 100644 --- a/chaoscenter/authentication/pkg/project/repository.go +++ b/chaoscenter/authentication/pkg/project/repository.go @@ -365,11 +365,19 @@ func (r repository) UpdateProjectState(ctx context.Context, userID string, deact {"members", bson.D{ {"$elemMatch", bson.D{ {"user_id", userID}, - {"role", bson.D{ - {"$eq", entities.RoleOwner}, + {"role", entities.RoleOwner}, + }}, + }}, + {"members", bson.D{ + {"$not", bson.D{ + {"$elemMatch", bson.D{ + {"user_id", bson.D{{"$ne", userID}}}, + {"role", entities.RoleOwner}, + {"deactivated_at", 0}, }}, }}, - }}} + }}, + } update = bson.D{ {"$set", bson.D{ From 05f90992cbcdc86fa375a8052322f98609bf393a Mon Sep 17 00:00:00 2001 From: Harsh Date: Fri, 9 Jan 2026 04:48:12 +0530 Subject: [PATCH 2/2] fixes Signed-off-by: Harsh --- chaoscenter/authentication/pkg/project/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/authentication/pkg/project/repository.go b/chaoscenter/authentication/pkg/project/repository.go index d69985eb710..43632e911e6 100644 --- a/chaoscenter/authentication/pkg/project/repository.go +++ b/chaoscenter/authentication/pkg/project/repository.go @@ -373,7 +373,7 @@ func (r repository) UpdateProjectState(ctx context.Context, userID string, deact {"$elemMatch", bson.D{ {"user_id", bson.D{{"$ne", userID}}}, {"role", entities.RoleOwner}, - {"deactivated_at", 0}, + {"deactivated_at", bson.D{{"$not", bson.D{{"$gt", int64(0)}}}}}, }}, }}, }},