NOISSUE - Fix rejected invitations query (#2433)

Signed-off-by: WashingtonKK <[email protected]>
absmach · Sep 19, 2024 · e611165 · e611165
1 parent 67aee00
commit e611165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/internal/api/common.go b/internal/api/common.go
@@ -179,6 +179,8 @@ func EncodeError(_ context.Context, err error, w http.ResponseWriter) {
 		w.WriteHeader(http.StatusNotFound)
 
 	case errors.Contains(err, errors.ErrStatusAlreadyAssigned),
+		errors.Contains(err, svcerr.ErrInvitationAlreadyRejected),
+		errors.Contains(err, svcerr.ErrInvitationAlreadyAccepted),
 		errors.Contains(err, svcerr.ErrConflict):
 		err = unwrap(err)
 		w.WriteHeader(http.StatusConflict)

diff --git a/invitations/postgres/invitations.go b/invitations/postgres/invitations.go
@@ -178,7 +178,7 @@ func pageQuery(pm invitations.Page) string {
 		query = append(query, "confirmed_at IS NOT NULL")
 	}
 	if pm.State == invitations.Pending {
-		query = append(query, "confirmed_at IS NULL")
+		query = append(query, "confirmed_at IS NULL AND rejected_at IS NULL")
 	}
 	if pm.State == invitations.Rejected {
 		query = append(query, "rejected_at IS NOT NULL")