fix: misleading error when sending different user id for the same email (#144)

* fix: error handling approach while sending headers

* test: add test for duplicate record

* chore: update error check

Author: scortier

internal/server/v1beta1/server.go

@@ -56,6 +56,9 @@ func (server *APIServer) validateUserInCtx(ctx context.Context) (string, error)
 		if errors.Is(err, user.ErrNoUserInformation) {
 			return "", status.Errorf(codes.InvalidArgument, err.Error())
 		}
+		if errors.As(err, &user.DuplicateRecordError{UUID: usr.UUID, Email: usr.Email}) {
+			return "", status.Errorf(codes.AlreadyExists, err.Error())
+		}
 		return "", status.Errorf(codes.Internal, codes.Internal.String())
 	}
 	if userID == "" {

internal/store/postgres/user_repository.go

@@ -32,7 +32,7 @@ func (r *UserRepository) UpsertByEmail(ctx context.Context, ud *user.User) (stri
 				RETURNING id
 		`, um.UUID, um.Email, um.Provider).Scan(&userID); err != nil {
 		err := checkPostgresError(err)
-		if errors.Is(err, errDuplicateKey) {
+		if errors.Is(err, sql.ErrNoRows) {
 			return "", user.DuplicateRecordError{UUID: ud.UUID, Email: ud.Email}
 		}
 		return "", err

internal/store/postgres/user_repository_test.go

@@ -204,6 +204,22 @@ func (r *UserRepositoryTestSuite) TestUpsertByEmail() {
 		r.Empty(id)
 	})
 
+	r.Run("return ErrDuplicateRecord if record already exist", func() {
+		usr := &user.User{UUID: uuid.NewString(), Email: "[email protected]"}
+
+		err := r.insertEmail(usr.Email)
+		r.NoError(err)
+
+		usr.UUID = uuid.NewString()
+		id, err := r.repository.UpsertByEmail(r.ctx, usr)
+		r.NoError(err)
+		r.NotEmpty(id)
+
+		id, err = r.repository.UpsertByEmail(r.ctx, usr)
+		r.ErrorIs(err, user.DuplicateRecordError{UUID: usr.UUID, Email: usr.Email})
+		r.Empty(id)
+	})
+
 	r.Run("new row is inserted with uuid and email if user not exist", func() {
 		usr := &user.User{UUID: uuid.NewString(), Email: "[email protected]"}
 		id, err := r.repository.UpsertByEmail(r.ctx, usr)