fix go formatting

pilcrowonpaper · pilcrowonpaper · commit 32c39aed789c · 2025-09-07T17:49:48.000+09:00
diff --git a/code/go-user-server-actions-sql-mysql_go b/code/go-user-server-actions-sql-mysql_go
@@ -30,8 +30,7 @@ type actionsStruct struct {
 func (actions *actionsStruct) CreateUserAction(actionInvocationId string, emailAddress string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte) (userserver.UserStruct, error) {
 	id := generateRandomId()
 
-	_, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)",
-		id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
+	_, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)", id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -80,6 +79,7 @@ func (actions *actionsStruct) GetUserAction(actionInvocationId string, userId st
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+	
 	return user, nil
 }
 
@@ -106,11 +106,12 @@ func (actions *actionsStruct) GetUserByEmailAddressAction(_ string, emailAddress
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+
 	return user, nil
 }
 
 func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId string, emailAddress string, userEmailAddressCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -120,54 +121,57 @@ func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId stri
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) UpdateUserPasswordHashAction(_ string, userId string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte, userPasswordHashCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?",
-		passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?", passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) IncrementUserSessionsCounterAction(_ string, userId string, userSessionsCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) DeleteUserAction(_ string, userId string) error {
-	res, err := actions.db.Exec("DELETE FROM app_user WHERE id = ?", userId)
+	result, err := actions.db.Exec("DELETE FROM app_user WHERE id = ?", userId)
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
diff --git a/code/go-user-server-actions-sql-postgresql_go b/code/go-user-server-actions-sql-postgresql_go
@@ -30,8 +30,7 @@ type actionsStruct struct {
 func (actions *actionsStruct) CreateUserAction(actionInvocationId string, emailAddress string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte) (userserver.UserStruct, error) {
 	id := generateRandomId()
 
-	_, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES ($1, $2, $3, $4, $5)",
-		id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
+	_, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES ($1, $2, $3, $4, $5)", id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -80,6 +79,7 @@ func (actions *actionsStruct) GetUserAction(actionInvocationId string, userId st
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+
 	return user, nil
 }
 
@@ -106,11 +106,12 @@ func (actions *actionsStruct) GetUserByEmailAddressAction(_ string, emailAddress
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+
 	return user, nil
 }
 
 func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId string, emailAddress string, userEmailAddressCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET email_address = $1, email_address_counter = email_address_counter + 1 WHERE id = $2 AND email_address_counter = $3", emailAddress, userId, userEmailAddressCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET email_address = $1, email_address_counter = email_address_counter + 1 WHERE id = $2 AND email_address_counter = $3", emailAddress, userId, userEmailAddressCounter)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -120,54 +121,57 @@ func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId stri
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) UpdateUserPasswordHashAction(_ string, userId string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte, userPasswordHashCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET password_hash = $1, password_hash_algorithm_id = $2, password_salt = $3, password_hash_counter = password_hash_counter + 1 WHERE id = $4 AND password_hash_counter = $5",
-		passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET password_hash = $1, password_hash_algorithm_id = $2, password_salt = $3, password_hash_counter = password_hash_counter + 1 WHERE id = $4 AND password_hash_counter = $5", passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) IncrementUserSessionsCounterAction(_ string, userId string, userSessionsCounter int32) error {
-	res, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = $1 AND sessions_counter = $2", userId, userSessionsCounter)
+	result, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = $1 AND sessions_counter = $2", userId, userSessionsCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) DeleteUserAction(_ string, userId string) error {
-	res, err := actions.db.Exec("DELETE FROM app_user WHERE id = $1", userId)
+	result, err := actions.db.Exec("DELETE FROM app_user WHERE id = $1", userId)
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
diff --git a/code/go-user-server-actions-sql-sqlite_go b/code/go-user-server-actions-sql-sqlite_go
@@ -30,8 +30,7 @@ type actionsStruct struct {
 func (actions *actionsStruct) CreateUserAction(actionInvocationId string, emailAddress string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte) (userserver.UserStruct, error) {
 	id := generateRandomId()
 
-	_, err := actions.db.Exec("INSERT INTO user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)",
-		id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
+	_, err := actions.db.Exec("INSERT INTO user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)", id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -80,6 +79,7 @@ func (actions *actionsStruct) GetUserAction(actionInvocationId string, userId st
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+
 	return user, nil
 }
 
@@ -106,11 +106,12 @@ func (actions *actionsStruct) GetUserByEmailAddressAction(_ string, emailAddress
 		fmt.Println(err)
 		return userserver.UserStruct{}, userserver.NewActionError("internal_error")
 	}
+
 	return user, nil
 }
 
 func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId string, emailAddress string, userEmailAddressCounter int32) error {
-	res, err := actions.db.Exec("UPDATE user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)
+	result, err := actions.db.Exec("UPDATE user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)
 
 	if err != nil {
 		if isUniqueConstraintError(err) {
@@ -120,54 +121,56 @@ func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId stri
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) UpdateUserPasswordHashAction(_ string, userId string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte, userPasswordHashCounter int32) error {
-	res, err := actions.db.Exec("UPDATE user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?",
-		passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
+	result, err := actions.db.Exec("UPDATE user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?", passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
 	return nil
 }
 
 func (actions *actionsStruct) IncrementUserSessionsCounterAction(_ string, userId string, userSessionsCounter int32) error {
-	res, err := actions.db.Exec("UPDATE user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)
+	result, err := actions.db.Exec("UPDATE user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)
 
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }
 
 func (actions *actionsStruct) DeleteUserAction(_ string, userId string) error {
-	res, err := actions.db.Exec("DELETE FROM user WHERE id = ?", userId)
+	result, err := actions.db.Exec("DELETE FROM user WHERE id = ?", userId)
 	if err != nil {
 		fmt.Println(err)
 		return userserver.NewActionError("internal_error")
 	}
 
-	rowsAffected, _ := res.RowsAffected()
+	rowsAffected, _ := result.RowsAffected()
 	if rowsAffected < 1 {
 		return userserver.NewActionError("user_not_found")
 	}
+
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ type actionsStruct struct {`
`30`	`30`	`func (actions *actionsStruct) CreateUserAction(actionInvocationId string, emailAddress string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte) (userserver.UserStruct, error) {`
`31`	`31`	`id := generateRandomId()`
`32`	`32`
`33`		`- _, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)",`
`34`		`- id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)`
	`33`	`+ _, err := actions.db.Exec("INSERT INTO app_user (id, email_address, password_hash, password_hash_algorithm_id, password_salt) VALUES (?, ?, ?, ?, ?)", id, emailAddress, passwordHash, passwordHashAlgorithmId, passwordSalt)`
`35`	`34`
`36`	`35`	`if err != nil {`
`37`	`36`	`if isUniqueConstraintError(err) {`
`@@ -80,6 +79,7 @@ func (actions *actionsStruct) GetUserAction(actionInvocationId string, userId st`
`80`	`79`	`fmt.Println(err)`
`81`	`80`	`return userserver.UserStruct{}, userserver.NewActionError("internal_error")`
`82`	`81`	`}`
	`82`	`+`
`83`	`83`	`return user, nil`
`84`	`84`	`}`
`85`	`85`
`@@ -106,11 +106,12 @@ func (actions *actionsStruct) GetUserByEmailAddressAction(_ string, emailAddress`
`106`	`106`	`fmt.Println(err)`
`107`	`107`	`return userserver.UserStruct{}, userserver.NewActionError("internal_error")`
`108`	`108`	`}`
	`109`	`+`
`109`	`110`	`return user, nil`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId string, emailAddress string, userEmailAddressCounter int32) error {`
`113`		`- res, err := actions.db.Exec("UPDATE app_user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)`
	`114`	`+ result, err := actions.db.Exec("UPDATE app_user SET email_address = ?, email_address_counter = email_address_counter + 1 WHERE id = ? AND email_address_counter = ?", emailAddress, userId, userEmailAddressCounter)`
`114`	`115`
`115`	`116`	`if err != nil {`
`116`	`117`	`if isUniqueConstraintError(err) {`
`@@ -120,54 +121,57 @@ func (actions *actionsStruct) UpdateUserEmailAddressAction(_ string, userId stri`
`120`	`121`	`return userserver.NewActionError("internal_error")`
`121`	`122`	`}`
`122`	`123`
`123`		`- rowsAffected, _ := res.RowsAffected()`
	`124`	`+ rowsAffected, _ := result.RowsAffected()`
`124`	`125`	`if rowsAffected < 1 {`
`125`	`126`	`return userserver.NewActionError("user_not_found")`
`126`	`127`	`}`
	`128`	`+`
`127`	`129`	`return nil`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`func (actions *actionsStruct) UpdateUserPasswordHashAction(_ string, userId string, passwordHash []byte, passwordHashAlgorithmId string, passwordSalt []byte, userPasswordHashCounter int32) error {`
`131`		`- res, err := actions.db.Exec("UPDATE app_user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?",`
`132`		`- passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)`
	`133`	`+ result, err := actions.db.Exec("UPDATE app_user SET password_hash = ?, password_hash_algorithm_id = ?, password_salt = ?, password_hash_counter = password_hash_counter + 1 WHERE id = ? AND password_hash_counter = ?", passwordHash, passwordHashAlgorithmId, passwordSalt, userId, userPasswordHashCounter)`
`133`	`134`
`134`	`135`	`if err != nil {`
`135`	`136`	`fmt.Println(err)`
`136`	`137`	`return userserver.NewActionError("internal_error")`
`137`	`138`	`}`
`138`	`139`
`139`		`- rowsAffected, _ := res.RowsAffected()`
	`140`	`+ rowsAffected, _ := result.RowsAffected()`
`140`	`141`	`if rowsAffected < 1 {`
`141`	`142`	`return userserver.NewActionError("user_not_found")`
`142`	`143`	`}`
	`144`	`+`
`143`	`145`	`return nil`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`func (actions *actionsStruct) IncrementUserSessionsCounterAction(_ string, userId string, userSessionsCounter int32) error {`
`147`		`- res, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)`
	`149`	`+ result, err := actions.db.Exec("UPDATE app_user SET sessions_counter = sessions_counter + 1 WHERE id = ? AND sessions_counter = ?", userId, userSessionsCounter)`
`148`	`150`
`149`	`151`	`if err != nil {`
`150`	`152`	`fmt.Println(err)`
`151`	`153`	`return userserver.NewActionError("internal_error")`
`152`	`154`	`}`
`153`	`155`
`154`		`- rowsAffected, _ := res.RowsAffected()`
	`156`	`+ rowsAffected, _ := result.RowsAffected()`
`155`	`157`	`if rowsAffected < 1 {`
`156`	`158`	`return userserver.NewActionError("user_not_found")`
`157`	`159`	`}`
	`160`	`+`
`158`	`161`	`return nil`
`159`	`162`	`}`
`160`	`163`
`161`	`164`	`func (actions *actionsStruct) DeleteUserAction(_ string, userId string) error {`
`162`		`- res, err := actions.db.Exec("DELETE FROM app_user WHERE id = ?", userId)`
	`165`	`+ result, err := actions.db.Exec("DELETE FROM app_user WHERE id = ?", userId)`
`163`	`166`	`if err != nil {`
`164`	`167`	`fmt.Println(err)`
`165`	`168`	`return userserver.NewActionError("internal_error")`
`166`	`169`	`}`
`167`	`170`
`168`		`- rowsAffected, _ := res.RowsAffected()`
	`171`	`+ rowsAffected, _ := result.RowsAffected()`
`169`	`172`	`if rowsAffected < 1 {`
`170`	`173`	`return userserver.NewActionError("user_not_found")`
`171`	`174`	`}`
	`175`	`+`
`172`	`176`	`return nil`
`173`	`177`	`}`