chore: build
ci-api / test (push) Failing after 8m7s
ci-web / test (push) Failing after 5m5s

This commit is contained in:
Xor290
2026-09-20 12:18:33 +02:00
parent 8f4c7fa47a
commit 919c807004
174 changed files with 9669 additions and 1308 deletions
+36 -11
View File
@@ -18,13 +18,13 @@ func NewHandler(service *Service) *Handler {
type userResponse struct {
ID uuid.UUID `json:"id"`
Email string `json:"email"`
Username string `json:"username"`
Role string `json:"role"`
IsActive bool `json:"is_active"`
}
func toResponse(u *User) userResponse {
return userResponse{ID: u.ID, Email: u.Email, Role: u.Role, IsActive: u.IsActive}
return userResponse{ID: u.ID, Username: u.Username, Role: u.Role, IsActive: u.IsActive}
}
func (h *Handler) List(c *gin.Context) {
@@ -41,7 +41,7 @@ func (h *Handler) List(c *gin.Context) {
}
type createUserRequest struct {
Email string `json:"email" binding:"required,email"`
Username string `json:"username" binding:"required,min=3,max=50"`
Password string `json:"password" binding:"required,min=12"`
Role string `json:"role" binding:"required,oneof=admin customer"`
}
@@ -52,11 +52,17 @@ func (h *Handler) Create(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "validation error", "details": err.Error()})
return
}
user, err := h.service.Create(c.Request.Context(), req.Email, req.Password, req.Role)
user, err := h.service.Create(c.Request.Context(), req.Username, req.Password, req.Role)
if err != nil {
if errors.Is(err, ErrEmailTaken) {
c.JSON(http.StatusConflict, gin.H{"error": "email already in use"})
if errors.Is(err, ErrAdminLimitReached) {
c.JSON(http.StatusConflict, gin.H{"error": "admin limit reached"})
}
if errors.Is(err, ErrUsernameTaken) {
c.JSON(http.StatusConflict, gin.H{"error": "username already in use"})
return
}
if errors.Is(err, ErrCustomerAccountsDisabled) {
c.JSON(http.StatusForbidden, gin.H{"error": "customer accounts are disabled: enable customer login or registration first"})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to create user"})
@@ -83,8 +89,27 @@ func (h *Handler) Get(c *gin.Context) {
c.JSON(http.StatusOK, toResponse(user))
}
func (h *Handler) GetRole(c *gin.Context) {
role := c.Param("role")
if role == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid role"})
return
}
count, err := h.service.CountByRole(c.Request.Context(), role)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"error": "failed to count users",
})
return
}
c.JSON(http.StatusOK, count)
}
type updateUserRequest struct {
Email string `json:"email" binding:"required,email"`
Username string `json:"username" binding:"required,min=3,max=50"`
IsActive bool `json:"is_active"`
}
@@ -100,14 +125,14 @@ func (h *Handler) Update(c *gin.Context) {
return
}
user, err := h.service.UpdateProfile(c.Request.Context(), id, req.Email, req.IsActive)
user, err := h.service.UpdateProfile(c.Request.Context(), id, req.Username, req.IsActive)
if err != nil {
if errors.Is(err, ErrNotFound) {
c.JSON(http.StatusNotFound, gin.H{"error": "user not found"})
return
}
if errors.Is(err, ErrEmailTaken) {
c.JSON(http.StatusConflict, gin.H{"error": "email already in use"})
if errors.Is(err, ErrUsernameTaken) {
c.JSON(http.StatusConflict, gin.H{"error": "username already in use"})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update user"})