From 44025738fa9f04163be5d007a7a3d5da71c150a6 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Tue, 28 Feb 2023 07:31:54 +0800
Subject: [PATCH] chore: remove format error

---
 store/error.go          | 18 ------------------
 store/shortcut.go       | 30 +++++++++++++++---------------
 store/user.go           | 24 ++++++++++++------------
 store/user_setting.go   | 14 +++++++-------
 store/workspace.go      | 32 ++++++++++++++++----------------
 store/workspace_user.go | 24 ++++++++++++------------
 6 files changed, 62 insertions(+), 80 deletions(-)

diff --git a/store/error.go b/store/error.go
index 2bbef29..72440ea 100644
--- a/store/error.go
+++ b/store/error.go
@@ -1,19 +1 @@
 package store
-
-import (
-	"database/sql"
-	"errors"
-)
-
-func FormatError(err error) error {
-	if err == nil {
-		return nil
-	}
-
-	switch err {
-	case sql.ErrNoRows:
-		return errors.New("data not found")
-	default:
-		return err
-	}
-}
diff --git a/store/shortcut.go b/store/shortcut.go
index 34f473c..8443366 100644
--- a/store/shortcut.go
+++ b/store/shortcut.go
@@ -63,7 +63,7 @@ func (s *Store) ComposeShortcut(ctx context.Context, shortcut *api.Shortcut) err
 func (s *Store) CreateShortcut(ctx context.Context, create *api.ShortcutCreate) (*api.Shortcut, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -73,7 +73,7 @@ func (s *Store) CreateShortcut(ctx context.Context, create *api.ShortcutCreate)
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.shortcutCache.Store(shortcutRaw.ID, shortcutRaw)
@@ -84,7 +84,7 @@ func (s *Store) CreateShortcut(ctx context.Context, create *api.ShortcutCreate)
 func (s *Store) PatchShortcut(ctx context.Context, patch *api.ShortcutPatch) (*api.Shortcut, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -94,7 +94,7 @@ func (s *Store) PatchShortcut(ctx context.Context, patch *api.ShortcutPatch) (*a
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.shortcutCache.Store(shortcutRaw.ID, shortcutRaw)
@@ -105,7 +105,7 @@ func (s *Store) PatchShortcut(ctx context.Context, patch *api.ShortcutPatch) (*a
 func (s *Store) FindShortcutList(ctx context.Context, find *api.ShortcutFind) ([]*api.Shortcut, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -132,7 +132,7 @@ func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.
 
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -154,17 +154,17 @@ func (s *Store) FindShortcut(ctx context.Context, find *api.ShortcutFind) (*api.
 func (s *Store) DeleteShortcut(ctx context.Context, delete *api.ShortcutDelete) error {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 	defer tx.Rollback()
 
 	err = deleteShortcut(ctx, tx, delete)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	if err := tx.Commit(); err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	if delete.ID != nil {
@@ -200,7 +200,7 @@ func createShortcut(ctx context.Context, tx *sql.Tx, create *api.ShortcutCreate)
 		&shortcutRaw.Description,
 		&shortcutRaw.Visibility,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &shortcutRaw, nil
@@ -243,7 +243,7 @@ func patchShortcut(ctx context.Context, tx *sql.Tx, patch *api.ShortcutPatch) (*
 		&shortcutRaw.Description,
 		&shortcutRaw.Visibility,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &shortcutRaw, nil
@@ -300,7 +300,7 @@ func findShortcutList(ctx context.Context, tx *sql.Tx, find *api.ShortcutFind) (
 		args...,
 	)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer rows.Close()
 
@@ -319,14 +319,14 @@ func findShortcutList(ctx context.Context, tx *sql.Tx, find *api.ShortcutFind) (
 			&shortcutRaw.Description,
 			&shortcutRaw.Visibility,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		shortcutRawList = append(shortcutRawList, &shortcutRaw)
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return shortcutRawList, nil
@@ -348,7 +348,7 @@ func deleteShortcut(ctx context.Context, tx *sql.Tx, delete *api.ShortcutDelete)
 	result, err := tx.ExecContext(ctx, `
 		DELETE FROM shortcut WHERE `+strings.Join(where, " AND "), args...)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	rows, _ := result.RowsAffected()
diff --git a/store/user.go b/store/user.go
index eb011ed..dec1983 100644
--- a/store/user.go
+++ b/store/user.go
@@ -45,7 +45,7 @@ func (raw *userRaw) toUser() *api.User {
 func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.User, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -55,7 +55,7 @@ func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.Us
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.userCache.Store(userRaw.ID, userRaw)
@@ -66,7 +66,7 @@ func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.Us
 func (s *Store) PatchUser(ctx context.Context, patch *api.UserPatch) (*api.User, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -76,7 +76,7 @@ func (s *Store) PatchUser(ctx context.Context, patch *api.UserPatch) (*api.User,
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.userCache.Store(userRaw.ID, userRaw)
@@ -87,7 +87,7 @@ func (s *Store) PatchUser(ctx context.Context, patch *api.UserPatch) (*api.User,
 func (s *Store) FindUserList(ctx context.Context, find *api.UserFind) ([]*api.User, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -138,17 +138,17 @@ func (s *Store) FindUser(ctx context.Context, find *api.UserFind) (*api.User, er
 func (s *Store) DeleteUser(ctx context.Context, delete *api.UserDelete) error {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 	defer tx.Rollback()
 
 	err = deleteUser(ctx, tx, delete)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	if err := tx.Commit(); err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	s.userCache.Delete(delete.ID)
@@ -182,7 +182,7 @@ func createUser(ctx context.Context, tx *sql.Tx, create *api.UserCreate) (*userR
 		&userRaw.PasswordHash,
 		&userRaw.OpenID,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &userRaw, nil
@@ -217,7 +217,7 @@ func patchUser(ctx context.Context, tx *sql.Tx, patch *api.UserPatch) (*userRaw,
 	`
 	row, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer row.Close()
 
@@ -233,7 +233,7 @@ func patchUser(ctx context.Context, tx *sql.Tx, patch *api.UserPatch) (*userRaw,
 			&userRaw.PasswordHash,
 			&userRaw.OpenID,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		if err := row.Err(); err != nil {
@@ -309,7 +309,7 @@ func deleteUser(ctx context.Context, tx *sql.Tx, delete *api.UserDelete) error {
 		DELETE FROM user WHERE id = ?
 	`, delete.ID)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	rows, _ := result.RowsAffected()
diff --git a/store/user_setting.go b/store/user_setting.go
index 70f8215..1aa5db1 100644
--- a/store/user_setting.go
+++ b/store/user_setting.go
@@ -25,7 +25,7 @@ func (raw *userSettingRaw) toUserSetting() *api.UserSetting {
 func (s *Store) UpsertUserSetting(ctx context.Context, upsert *api.UserSettingUpsert) (*api.UserSetting, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -46,7 +46,7 @@ func (s *Store) UpsertUserSetting(ctx context.Context, upsert *api.UserSettingUp
 func (s *Store) FindUserSettingList(ctx context.Context, find *api.UserSettingFind) ([]*api.UserSetting, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -66,7 +66,7 @@ func (s *Store) FindUserSettingList(ctx context.Context, find *api.UserSettingFi
 func (s *Store) FindUserSetting(ctx context.Context, find *api.UserSettingFind) (*api.UserSetting, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -101,7 +101,7 @@ func upsertUserSetting(ctx context.Context, tx *sql.Tx, upsert *api.UserSettingU
 		&userSettingRaw.Key,
 		&userSettingRaw.Value,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &userSettingRaw, nil
@@ -125,7 +125,7 @@ func findUserSettingList(ctx context.Context, tx *sql.Tx, find *api.UserSettingF
 		WHERE ` + strings.Join(where, " AND ")
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer rows.Close()
 
@@ -137,14 +137,14 @@ func findUserSettingList(ctx context.Context, tx *sql.Tx, find *api.UserSettingF
 			&userSettingRaw.Key,
 			&userSettingRaw.Value,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		userSettingRawList = append(userSettingRawList, &userSettingRaw)
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return userSettingRawList, nil
diff --git a/store/workspace.go b/store/workspace.go
index fa10582..d64eabd 100644
--- a/store/workspace.go
+++ b/store/workspace.go
@@ -45,7 +45,7 @@ func (raw *workspaceRaw) toWorkspace() *api.Workspace {
 func (s *Store) CreateWorkspace(ctx context.Context, create *api.WorkspaceCreate) (*api.Workspace, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -55,7 +55,7 @@ func (s *Store) CreateWorkspace(ctx context.Context, create *api.WorkspaceCreate
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.workspaceCache.Store(workspaceRaw.ID, workspaceRaw)
@@ -66,7 +66,7 @@ func (s *Store) CreateWorkspace(ctx context.Context, create *api.WorkspaceCreate
 func (s *Store) PatchWorkspace(ctx context.Context, patch *api.WorkspacePatch) (*api.Workspace, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -76,7 +76,7 @@ func (s *Store) PatchWorkspace(ctx context.Context, patch *api.WorkspacePatch) (
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	s.workspaceCache.Store(workspaceRaw.ID, workspaceRaw)
@@ -87,7 +87,7 @@ func (s *Store) PatchWorkspace(ctx context.Context, patch *api.WorkspacePatch) (
 func (s *Store) FindWordspaceList(ctx context.Context, find *api.WorkspaceFind) ([]*api.Workspace, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -114,7 +114,7 @@ func (s *Store) FindWorkspace(ctx context.Context, find *api.WorkspaceFind) (*ap
 
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -138,17 +138,17 @@ func (s *Store) FindWorkspace(ctx context.Context, find *api.WorkspaceFind) (*ap
 func (s *Store) DeleteWorkspace(ctx context.Context, delete *api.WorkspaceDelete) error {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 	defer tx.Rollback()
 
 	err = deleteWorkspace(ctx, tx, delete)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	if err := tx.Commit(); err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	s.workspaceCache.Delete(delete.ID)
@@ -182,7 +182,7 @@ func createWorkspace(ctx context.Context, tx *sql.Tx, create *api.WorkspaceCreat
 		&workspaceRaw.Title,
 		&workspaceRaw.Description,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &workspaceRaw, nil
@@ -214,7 +214,7 @@ func patchWorkspace(ctx context.Context, tx *sql.Tx, patch *api.WorkspacePatch)
 	`
 	row, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer row.Close()
 
@@ -230,7 +230,7 @@ func patchWorkspace(ctx context.Context, tx *sql.Tx, patch *api.WorkspacePatch)
 			&workspaceRaw.Title,
 			&workspaceRaw.Description,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		if err := row.Err(); err != nil {
@@ -275,7 +275,7 @@ func findWorkspaceList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceFind)
 	`
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer rows.Close()
 
@@ -292,14 +292,14 @@ func findWorkspaceList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceFind)
 			&workspaceRaw.Title,
 			&workspaceRaw.Description,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		workspaceRawList = append(workspaceRawList, &workspaceRaw)
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return workspaceRawList, nil
@@ -310,7 +310,7 @@ func deleteWorkspace(ctx context.Context, tx *sql.Tx, delete *api.WorkspaceDelet
 		DELETE FROM workspace WHERE id = ?
 	`, delete.ID)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	rows, _ := result.RowsAffected()
diff --git a/store/workspace_user.go b/store/workspace_user.go
index 6df766e..03902ee 100644
--- a/store/workspace_user.go
+++ b/store/workspace_user.go
@@ -60,7 +60,7 @@ func (s *Store) ComposeWorkspaceUserListForWorkspace(ctx context.Context, worksp
 func (s *Store) UpsertWorkspaceUser(ctx context.Context, upsert *api.WorkspaceUserUpsert) (*api.WorkspaceUser, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -70,7 +70,7 @@ func (s *Store) UpsertWorkspaceUser(ctx context.Context, upsert *api.WorkspaceUs
 	}
 
 	if err := tx.Commit(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	workspaceUser := workspaceUserRaw.toWorkspaceUser()
@@ -81,7 +81,7 @@ func (s *Store) UpsertWorkspaceUser(ctx context.Context, upsert *api.WorkspaceUs
 func (s *Store) FindWordspaceUserList(ctx context.Context, find *api.WorkspaceUserFind) ([]*api.WorkspaceUser, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -101,7 +101,7 @@ func (s *Store) FindWordspaceUserList(ctx context.Context, find *api.WorkspaceUs
 func (s *Store) FindWordspaceUser(ctx context.Context, find *api.WorkspaceUserFind) (*api.WorkspaceUser, error) {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer tx.Rollback()
 
@@ -123,17 +123,17 @@ func (s *Store) FindWordspaceUser(ctx context.Context, find *api.WorkspaceUserFi
 func (s *Store) DeleteWorkspaceUser(ctx context.Context, delete *api.WorkspaceUserDelete) error {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 	defer tx.Rollback()
 
 	err = deleteWorkspaceUser(ctx, tx, delete)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	if err := tx.Commit(); err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	return nil
@@ -164,7 +164,7 @@ func upsertWorkspaceUser(ctx context.Context, tx *sql.Tx, upsert *api.WorkspaceU
 		&workspaceUserRaw.UserID,
 		&workspaceUserRaw.Role,
 	); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return &workspaceUserRaw, nil
@@ -189,7 +189,7 @@ func findWorkspaceUserList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceU
 		WHERE ` + strings.Join(where, " AND ")
 	rows, err := tx.QueryContext(ctx, query, args...)
 	if err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 	defer rows.Close()
 
@@ -201,14 +201,14 @@ func findWorkspaceUserList(ctx context.Context, tx *sql.Tx, find *api.WorkspaceU
 			&workspaceUserRaw.UserID,
 			&workspaceUserRaw.Role,
 		); err != nil {
-			return nil, FormatError(err)
+			return nil, err
 		}
 
 		workspaceUserRawList = append(workspaceUserRawList, &workspaceUserRaw)
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, FormatError(err)
+		return nil, err
 	}
 
 	return workspaceUserRawList, nil
@@ -219,7 +219,7 @@ func deleteWorkspaceUser(ctx context.Context, tx *sql.Tx, delete *api.WorkspaceU
 		DELETE FROM workspace_user WHERE workspace_id = ? AND user_id = ?
 	`, delete.WorkspaceID, delete.UserID)
 	if err != nil {
-		return FormatError(err)
+		return err
 	}
 
 	rows, _ := result.RowsAffected()