feat: specify user creator + list only users related to admin

internal/admin/users.go

@@ -28,7 +28,19 @@ func NewUserDTO(row *repository.User) types.UserDTO {
 }
 
 func (h *AdminHandler) GetUsers(w http.ResponseWriter, r *http.Request) {
-	users, err := h.repo.FindAllUsers(r.Context())
+	userId, ok := util.GetRequestUserId(r.Context())
+	if !ok {
+		web.Error(w, "failed to get user id from auth session", http.StatusInternalServerError)
+		return
+	}
+
+	user, err := h.repo.FindUserId(r.Context(), uuid.MustParse(userId))
+	if err != nil {
+		web.Error(w, "failed to get access information", http.StatusUnauthorized)
+		return
+	}
+
+	users, err := h.repo.FindAdminUsers(r.Context(), &user.ID)
 	if err != nil {
 		log.Println("ERR: Failed to query users from db:", err)
 		web.Error(w, "failed to get all users", http.StatusInternalServerError)
@@ -89,6 +101,18 @@ type CreateUserRequest struct {
 }
 
 func (h *AdminHandler) CreateUser(w http.ResponseWriter, r *http.Request) {
+	userId, ok := util.GetRequestUserId(r.Context())
+	if !ok {
+		web.Error(w, "failed to get user id from auth session", http.StatusInternalServerError)
+		return
+	}
+
+	user, err := h.repo.FindUserId(r.Context(), uuid.MustParse(userId))
+	if err != nil {
+		web.Error(w, "failed to get access information", http.StatusUnauthorized)
+		return
+	}
+
 	var req CreateUserRequest
 
 	decoder := json.NewDecoder(r.Body)
@@ -112,7 +136,7 @@ func (h *AdminHandler) CreateUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, err := h.repo.FindUserEmail(r.Context(), req.Email)
+	_, err = h.repo.FindUserEmail(r.Context(), req.Email)
 	if err == nil {
 		web.Error(w, "user with provided email already exists", http.StatusBadRequest)
 		return
@@ -130,11 +154,12 @@ func (h *AdminHandler) CreateUser(w http.ResponseWriter, r *http.Request) {
 		FullName:     req.FullName,
 		PasswordHash: hash,
 		IsAdmin:      false,
+		CreatedBy:    &user.ID,
 	}
 
 	log.Println("INFO: params for user creation:", params)
 
-	userId, err := h.repo.InsertUser(r.Context(), params)
+	id, err := h.repo.InsertUser(r.Context(), params)
 	if err != nil {
 		log.Println("ERR: Failed to insert user into database:", err)
 		web.Error(w, "failed to create user", http.StatusInternalServerError)
@@ -147,7 +172,7 @@ func (h *AdminHandler) CreateUser(w http.ResponseWriter, r *http.Request) {
 
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(Response{
-		ID: userId.String(),
+		ID: id.String(),
 	}); err != nil {
 		web.Error(w, "failed to encode response", http.StatusInternalServerError)
 	}

internal/repository/users.sql.go

@@ -11,6 +11,43 @@ import (
 	"github.com/google/uuid"
 )
 
+const findAdminUsers = `-- name: FindAdminUsers :many
+SELECT id, email, full_name, password_hash, is_admin, created_at, updated_at, last_login, phone_number, profile_picture, created_by, email_verified FROM users WHERE created_by = $1
+`
+
+func (q *Queries) FindAdminUsers(ctx context.Context, createdBy *uuid.UUID) ([]User, error) {
+	rows, err := q.db.Query(ctx, findAdminUsers, createdBy)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []User
+	for rows.Next() {
+		var i User
+		if err := rows.Scan(
+			&i.ID,
+			&i.Email,
+			&i.FullName,
+			&i.PasswordHash,
+			&i.IsAdmin,
+			&i.CreatedAt,
+			&i.UpdatedAt,
+			&i.LastLogin,
+			&i.PhoneNumber,
+			&i.ProfilePicture,
+			&i.CreatedBy,
+			&i.EmailVerified,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const findAllUsers = `-- name: FindAllUsers :many
 SELECT id, email, full_name, password_hash, is_admin, created_at, updated_at, last_login, phone_number, profile_picture, created_by, email_verified FROM users
 `

queries/users.sql

@@ -1,6 +1,9 @@
 -- name: FindAllUsers :many
 SELECT * FROM users;
 
+-- name: FindAdminUsers :many
+SELECT * FROM users WHERE created_by = $1;
+
 -- name: InsertUser :one
 INSERT INTO users (
     email, full_name, password_hash, is_admin, created_by