tsk-35: Update name of user (#38)
Closes #35 Reviewed-on: phoenix/textsender-auth#38 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
package endpoint
|
||||
|
||||
// Endpoint for registering a user
|
||||
const Register = "/api/v1/register"
|
||||
const Login = "/api/v1/login"
|
||||
const UpdatePassword = "/api/v1/user/password/update"
|
||||
const (
|
||||
// Endpoint for registering a user
|
||||
Register = "/api/v1/register"
|
||||
Login = "/api/v1/login"
|
||||
UpdatePassword = "/api/v1/user/password/update"
|
||||
UpdateName = "/api/v1/user/name/update"
|
||||
|
||||
const CreateServiceUser = "/api/v1/service/register"
|
||||
const LoginServiceUser = "/api/v1/service/login"
|
||||
CreateServiceUser = "/api/v1/service/register"
|
||||
LoginServiceUser = "/api/v1/service/login"
|
||||
|
||||
const TokenRefresh = "/api/v1/token/refresh"
|
||||
TokenRefresh = "/api/v1/token/refresh"
|
||||
)
|
||||
|
||||
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/user"
|
||||
@@ -12,6 +13,15 @@ import (
|
||||
"git.kundeng.us/phoenix/textsender-auth/internal/utility"
|
||||
)
|
||||
|
||||
type UserHandler struct {
|
||||
Config *config.Config
|
||||
UserStore store.UserStore
|
||||
}
|
||||
|
||||
func NewUserHandler(cfg *config.Config, userStore store.UserStore) *UserHandler {
|
||||
return &UserHandler{Config: cfg, UserStore: userStore}
|
||||
}
|
||||
|
||||
type RegisterUser struct {
|
||||
PhoneNumber string `json:"phone_number"`
|
||||
Username string `json:"username"`
|
||||
@@ -29,15 +39,6 @@ type RegisterResponse struct {
|
||||
Data []RegisterResponseItem `json:"data"`
|
||||
}
|
||||
|
||||
type UserHandler struct {
|
||||
Config *config.Config
|
||||
UserStore store.UserStore
|
||||
}
|
||||
|
||||
func NewUserHandler(cfg *config.Config, userStore store.UserStore) *UserHandler {
|
||||
return &UserHandler{Config: cfg, UserStore: userStore}
|
||||
}
|
||||
|
||||
// Register godoc
|
||||
// @Summary Register user
|
||||
// @Description Create a user that can send texts (requires JWT)
|
||||
@@ -112,3 +113,76 @@ func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
RespondWithJson(w, statusCode, &resp)
|
||||
}
|
||||
|
||||
type UpdateNameRequest struct {
|
||||
Firstname *string `json:"first_name,omitempty"`
|
||||
Lastname *string `json:"last_name,omitempty"`
|
||||
UserId uuid.UUID `json:"user_id"`
|
||||
}
|
||||
|
||||
type UpdateNameResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []*user.User `json:"data"`
|
||||
}
|
||||
|
||||
// UpdateName godoc
|
||||
// @Summary Update name of user
|
||||
// @Description Update the first or last name of a user (requires JWT)
|
||||
// @Tags users
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Security BearerAuth
|
||||
// @Param request body UpdateNameRequest true "Data to update name of user"
|
||||
// @Success 200 {object} UpdateNameResponse
|
||||
// @Failure 400 {object} UpdateNameResponse
|
||||
// @Failure 403 {object} UpdateNameResponse
|
||||
// @Failure 500 {object} UpdateNameResponse
|
||||
// @Router /user/name/update [patch]
|
||||
func (u *UserHandler) UpdateName(w http.ResponseWriter, r *http.Request) {
|
||||
var req UpdateNameRequest
|
||||
err := ExtractFromRequest(r, &req)
|
||||
if err != nil {
|
||||
http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
defer r.Body.Close()
|
||||
|
||||
var statusCode int
|
||||
var resp UpdateNameResponse
|
||||
updateFirstname := req.Firstname != nil && len(*req.Firstname) > 0
|
||||
updateLastname := req.Lastname != nil && len(*req.Lastname) > 0
|
||||
|
||||
if req.UserId == uuid.Nil {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "User Id not provided"
|
||||
} else if !updateFirstname && !updateLastname {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "No name provided"
|
||||
} else {
|
||||
ctx := r.Context()
|
||||
if usr, err := u.UserStore.GetUserByID(ctx, req.UserId); err != nil {
|
||||
log.Println("Error:", err)
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
if usr == nil {
|
||||
statusCode = http.StatusNotFound
|
||||
resp.Message = "User not found"
|
||||
} else {
|
||||
// Add query to update names
|
||||
if rowsAffected, err := u.UserStore.UpdateName(ctx, req.Firstname, req.Lastname, usr); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
log.Println("Rows updated:", rowsAffected)
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
resp.Data = append(resp.Data, usr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RespondWithJson(w, statusCode, &resp)
|
||||
}
|
||||
|
||||
@@ -34,3 +34,32 @@ func TestCreateUserWithMock(t *testing.T) {
|
||||
|
||||
assert.NotNil(t, response.Data[0].Id, "Id should not be nil")
|
||||
}
|
||||
|
||||
func TestUpdateNameOfUser(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
cfg := GetConfig()
|
||||
userStore := mock.NewMockUserStore()
|
||||
|
||||
usr := GetTestUser()
|
||||
if err := userStore.CreateUser(ctx, &usr); err != nil {
|
||||
assert.NoError(t, err, "Error creating user")
|
||||
}
|
||||
|
||||
testNameChange := UpdateNameRequest{}
|
||||
testNameChange.Firstname = &[]string{"Bob"}[0]
|
||||
testNameChange.Lastname = &[]string{"De-Buildor"}[0]
|
||||
testNameChange.UserId = usr.Id
|
||||
jsonValue, _ := json.Marshal(testNameChange)
|
||||
|
||||
req, _ := http.NewRequest("PATCH", endpoint.UpdateName, strings.NewReader(string(jsonValue)))
|
||||
rr := httptest.NewRecorder()
|
||||
|
||||
handler := NewUserHandler(cfg, userStore)
|
||||
handler.UpdateName(rr, req)
|
||||
|
||||
assert.Equal(t, http.StatusOK, rr.Code)
|
||||
|
||||
var response UpdateNameResponse
|
||||
err := json.Unmarshal(rr.Body.Bytes(), &response)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package mock
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -157,3 +158,35 @@ func (m *MockUserStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastL
|
||||
|
||||
return 1, nil
|
||||
}
|
||||
|
||||
func (m *MockUserStore) UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
if m.Error != nil {
|
||||
return 0, m.Error
|
||||
}
|
||||
|
||||
if firstname == nil && lastname == nil {
|
||||
return 0, fmt.Errorf("Names not provided")
|
||||
}
|
||||
|
||||
user, exists := m.Users[usr.Id]
|
||||
if !exists {
|
||||
return 0, errors.New("User not found")
|
||||
}
|
||||
|
||||
if firstname != nil && lastname != nil {
|
||||
user.Firstname = firstname
|
||||
user.Lastname = lastname
|
||||
} else if firstname != nil {
|
||||
user.Firstname = firstname
|
||||
} else {
|
||||
user.Lastname = lastname
|
||||
}
|
||||
|
||||
m.Users[usr.Id] = user
|
||||
m.UsersByUsername[user.Username] = user
|
||||
|
||||
return 1, nil
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ type UserStore interface {
|
||||
UserExists(ctx context.Context, username string) (bool, error)
|
||||
UpdatePassword(ctx context.Context, id uuid.UUID, password string) (int64, error)
|
||||
UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error)
|
||||
UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error)
|
||||
}
|
||||
|
||||
type PGUserStore struct {
|
||||
@@ -134,3 +135,39 @@ func (s *PGUserStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLog
|
||||
return affected.RowsAffected(), nil
|
||||
}
|
||||
}
|
||||
|
||||
func (s *PGUserStore) UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error) {
|
||||
var query string
|
||||
|
||||
if firstname == nil && lastname == nil {
|
||||
return 0, fmt.Errorf("Provided names are empty")
|
||||
} else {
|
||||
tableName := "users"
|
||||
if firstname != nil && lastname != nil {
|
||||
query = fmt.Sprintf("UPDATE %s SET first_name = $1, last_name = $2 WHERE id = $3", tableName)
|
||||
if affected, err := s.db.Exec(ctx, query, firstname, lastname, usr.Id); err != nil {
|
||||
return 0, err
|
||||
} else {
|
||||
usr.Firstname = firstname
|
||||
usr.Lastname = lastname
|
||||
return affected.RowsAffected(), nil
|
||||
}
|
||||
} else if firstname != nil {
|
||||
query = fmt.Sprintf("UPDATE %s SET first_name = $1 WHERE id = $2", tableName)
|
||||
if affected, err := s.db.Exec(ctx, query, firstname, usr.Id); err != nil {
|
||||
return 0, err
|
||||
} else {
|
||||
usr.Firstname = firstname
|
||||
return affected.RowsAffected(), nil
|
||||
}
|
||||
} else {
|
||||
query = fmt.Sprintf("UPDATE %s SET last_name = $1 WHERE id = $2", tableName)
|
||||
if affected, err := s.db.Exec(ctx, query, lastname, usr.Id); err != nil {
|
||||
return 0, err
|
||||
} else {
|
||||
usr.Lastname = lastname
|
||||
return affected.RowsAffected(), nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user