Don't error on deleted users

Signed-off-by: Jan Steffen <[email protected]>

internal/scimserver/user_handler.go

@@ -314,6 +314,11 @@ func (h *userHandler) Delete(r *http.Request, id string) error {
 
 	_, err = h.cmdHandlerClient.Execute(ctx, cmd.CreateCommand(uid, commandTypes.DeleteUser))
 	if err != nil {
+		err = errors.TranslateFromGrpcError(err)
+		if err == errors.ErrDeleted {
+			return nil
+		}
+
 		return scim_errors.ScimError{
 			Status: http.StatusInternalServerError,
 			Detail: err.Error(),

internal/scimserver/user_handler_test.go

@@ -85,6 +85,28 @@ var _ = Describe("internal/scimserver/UserHandler", func() {
 				scimErr, ok := err.(scim_errors.ScimError)
 				Expect(ok).To(BeTrue())
 
+				Expect(scimErr.Status).To(Equal(http.StatusNotFound))
+			})
+			It("doesn't return deleted user", func() {
+				deletedUser := &projections.User{
+					Id:    uuid.New().String(),
+					Name:  "test.user.a",
+					Email: "[email protected]",
+					Metadata: &projections.LifecycleMetadata{
+						Deleted: timestamppb.Now(),
+					},
+				}
+				commandHandlerClient := mock_eventsourcing.NewMockCommandHandlerClient(mockCtrl)
+				userClient := mock_domain.NewMockUserClient(mockCtrl)
+				userHandler := NewUserHandler(commandHandlerClient, userClient)
+
+				userClient.EXPECT().GetById(ctx, gomock.Any()).Return(deletedUser, nil)
+
+				_, err := userHandler.Get(request, deletedUser.Id)
+				Expect(err).To(HaveOccurred())
+				scimErr, ok := err.(scim_errors.ScimError)
+				Expect(ok).To(BeTrue())
+
 				Expect(scimErr.Status).To(Equal(http.StatusNotFound))
 			})
 		})