fix

internal/app/auth_v1/create.go

@@ -14,10 +14,10 @@ func (s *User) Create(ctx context.Context, req *desc.CreateRequest) (*desc.Creat
 	fmt.Printf("Create User email: %s", req.GetEmail())
 	fmt.Printf("Create User role: %s", req.GetRole())
 
-	query, args, err := s.sq.Insert(Users).
-		Columns(UsersName, UsersEmail, UsersPassword, UsersPasswordConfirm, UsersRole).
-		Values(req.GetName(), req.GetEmail(), req.GetPassword(), req.GetPasswordConfirm(), req.GetRole()).
-		Suffix(fmt.Sprintf("RETURNING %s", UsersID)).ToSql()
+	query, args, err := s.sq.Insert(users).
+		Columns(usersName, usersEmail, usersPassword, usersRole).
+		Values(req.GetName(), req.GetEmail(), req.GetPassword(), req.GetRole()).
+		Suffix(fmt.Sprintf("RETURNING %s", usersID)).ToSql()
 
 	if err != nil {
 		log.Printf("failed to build query create user: %s", err.Error())

internal/app/auth_v1/delete.go

@@ -14,8 +14,8 @@ import (
 func (s *User) Delete(ctx context.Context, req *desc.DeleteRequest) (*empty.Empty, error) {
 	fmt.Printf("User delete with ID: %d", req.GetId())
 
-	query, args, err := s.sq.Delete(Users).Where(squirrel.Eq{
-		UsersID: req.GetId(),
+	query, args, err := s.sq.Delete(users).Where(squirrel.Eq{
+		usersID: req.GetId(),
 	}).ToSql()
 
 	if err != nil {

internal/app/auth_v1/get.go

@@ -2,10 +2,12 @@ package auth_v1
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 
 	"github.com/Masterminds/squirrel"
+	"github.com/jackc/pgx/v5"
 	desc "github.com/markgenuine/auth/pkg/auth_v1"
 )
 
@@ -14,19 +16,24 @@ func (s *User) Get(ctx context.Context, req *desc.GetRequest) (*desc.GetResponse
 	fmt.Printf("Get user with ID: %d", req.GetId())
 
 	query, args, err := s.sq.Select(
-		UsersID, UsersName, UsersEmail, UsersPassword, UsersPasswordConfirm,
-		UsersRole, UsersCreatedAt, UsersUpdatedAt).
-		Where(squirrel.Eq{UsersID: req.GetId()}).
+		usersID, usersName, usersEmail, usersPassword,
+		usersRole, usersCreatedAt, usersUpdatedAt).
+		Where(squirrel.Eq{usersID: req.GetId()}).
 		ToSql()
-	
+
 	if err != nil {
 		log.Printf("failed to build query get user: %s", err.Error())
 		return nil, err
 	}
 
 	var res *desc.GetResponse
+
 	err = s.poolDB.QueryRow(ctx, query, args...).Scan(res)
 	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errors.New("user not found")
+		}
+
 		log.Printf("failed to get user: %s", err.Error())
 		return nil, err
 	}

internal/app/auth_v1/service.go

@@ -7,32 +7,14 @@ import (
 )
 
 const (
-	// Users ...
-	Users = "users"
-
-	// UsersID ...
-	UsersID = "id"
-
-	// UsersName ...
-	UsersName = "name"
-
-	// UsersEmail ...
-	UsersEmail = "email"
-
-	// UsersPassword ...
-	UsersPassword = "password"
-
-	// UsersPasswordConfirm ...
-	UsersPasswordConfirm = "password_confirm"
-
-	// UsersRole ...
-	UsersRole = "role"
-
-	// UsersCreatedAt ...
-	UsersCreatedAt = "created_at"
-
-	// UsersUpdatedAt ...
-	UsersUpdatedAt = "updated_at"
+	users          = "users"
+	usersID        = "id"
+	usersName      = "name"
+	usersEmail     = "email"
+	usersPassword  = "password"
+	usersRole      = "role"
+	usersCreatedAt = "created_at"
+	usersUpdatedAt = "updated_at"
 )
 
 // User - type for proto implementation

internal/app/auth_v1/update.go

@@ -15,26 +15,26 @@ import (
 func (s *User) Update(ctx context.Context, req *desc.UpdateRequest) (*empty.Empty, error) {
 	fmt.Printf("Update user with ID: %d", req.GetId())
 
-	builder := s.sq.Update(Users).Where(squirrel.Eq{UsersID: req.GetId()})
+	builder := s.sq.Update(users).Where(squirrel.Eq{usersID: req.GetId()})
 
 	var modify bool
 	if req.GetName() != nil {
-		builder.Set(UsersName, req.GetName())
+		builder.Set(usersName, req.GetName())
 		modify = true
 	}
 
 	if req.GetEmail() != nil {
-		builder.Set(UsersEmail, req.GetEmail())
+		builder.Set(usersEmail, req.GetEmail())
 		modify = true
 	}
 
 	if req.GetRole() != desc.Role_UNKNOWN {
-		builder.Set(UsersRole, req.GetRole().String())
+		builder.Set(usersRole, req.GetRole().String())
 		modify = true
 	}
 
 	if modify {
-		builder.Set(UsersUpdatedAt, time.Now())
+		builder.Set(usersUpdatedAt, time.Now())
 		query, args, err := builder.ToSql()
 		if err != nil {
 			log.Printf("failed to build query update user: %s", err.Error())

migrations/20240224143554_init_db.sql

@@ -5,7 +5,6 @@ create table if not exists users(
     name text not null,
     email text not null,
     password text not null,
-    password_confirm text not null,
     role text not null,
     created_at timestamp not null default now(),
     updated_at timestamp