aep/Mini-ERP-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: форматирование кода - убраны лишние пустые строки

Browse Source
This commit is contained in:
Andrey Epifantsev
2025-08-27 15:05:25 +04:00
parent cce7622ae1
commit 0f93308c65
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core-service/internal/models/models.go
View File

@@ -90,9 +90,9 @@ type OrganizationResponse struct {
// LoginResponse ответ на аутентификацию // LoginResponse ответ на аутентификацию
type LoginResponse struct { type LoginResponse struct {
Token string `json:"token"` Token string `json:"token"`
User UserResponse `json:"user"` User UserResponse `json:"user"`
Organization OrganizationResponse `json:"organization"` Organization OrganizationResponse `json:"organization"`
} }
// CreateLocationRequest запрос на создание места хранения // CreateLocationRequest запрос на создание места хранения

25
core-service/internal/repository/organizations.go
View File

@@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"erp-mvp/core-service/internal/models" "erp-mvp/core-service/internal/models"
"github.com/google/uuid" "github.com/google/uuid"
) )
@@ -29,18 +30,18 @@ func (r *organizationRepository) Create(ctx context.Context, org *models.Organiz
INSERT INTO organizations (id, name, type, settings, created_at) INSERT INTO organizations (id, name, type, settings, created_at)
VALUES ($1, $2, $3, $4, $5) VALUES ($1, $2, $3, $4, $5)
` `
// Конвертируем JSON в строку // Конвертируем JSON в строку
settingsJSON, err := json.Marshal(org.Settings) settingsJSON, err := json.Marshal(org.Settings)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshal settings: %w", err) return fmt.Errorf("failed to marshal settings: %w", err)
} }
_, err = r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON), org.CreatedAt) _, err = r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON), org.CreatedAt)
if err != nil { if err != nil {
return fmt.Errorf("failed to create organization: %w", err) return fmt.Errorf("failed to create organization: %w", err)
} }
return nil return nil
} }
@@ -50,7 +51,7 @@ func (r *organizationRepository) GetByID(ctx context.Context, id uuid.UUID) (*mo
FROM organizations FROM organizations
WHERE id = $1 WHERE id = $1
` `
var settingsJSON []byte var settingsJSON []byte
org := &models.Organization{} org := &models.Organization{}
err := r.db.QueryRowContext(ctx, query, id).Scan( err := r.db.QueryRowContext(ctx, query, id).Scan(
@@ -60,14 +61,14 @@ func (r *organizationRepository) GetByID(ctx context.Context, id uuid.UUID) (*mo
&settingsJSON, &settingsJSON,
&org.CreatedAt, &org.CreatedAt,
) )
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil, fmt.Errorf("organization not found") return nil, fmt.Errorf("organization not found")
} }
return nil, fmt.Errorf("failed to get organization: %w", err) return nil, fmt.Errorf("failed to get organization: %w", err)
} }
// Конвертируем JSON строку в map // Конвертируем JSON строку в map
if len(settingsJSON) > 0 { if len(settingsJSON) > 0 {
err = json.Unmarshal(settingsJSON, &org.Settings) err = json.Unmarshal(settingsJSON, &org.Settings)
@@ -77,7 +78,7 @@ func (r *organizationRepository) GetByID(ctx context.Context, id uuid.UUID) (*mo
} else { } else {
org.Settings = make(models.JSON) org.Settings = make(models.JSON)
} }
return org, nil return org, nil
} }
@@ -87,26 +88,26 @@ func (r *organizationRepository) Update(ctx context.Context, org *models.Organiz
SET name = $2, type = $3, settings = $4 SET name = $2, type = $3, settings = $4
WHERE id = $1 WHERE id = $1
` `
// Конвертируем JSON в строку // Конвертируем JSON в строку
settingsJSON, err := json.Marshal(org.Settings) settingsJSON, err := json.Marshal(org.Settings)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshal settings: %w", err) return fmt.Errorf("failed to marshal settings: %w", err)
} }
result, err := r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON)) result, err := r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON))
if err != nil { if err != nil {
return fmt.Errorf("failed to update organization: %w", err) return fmt.Errorf("failed to update organization: %w", err)
} }
rowsAffected, err := result.RowsAffected() rowsAffected, err := result.RowsAffected()
if err != nil { if err != nil {
return fmt.Errorf("failed to get rows affected: %w", err) return fmt.Errorf("failed to get rows affected: %w", err)
} }
if rowsAffected == 0 { if rowsAffected == 0 {
return fmt.Errorf("organization not found") return fmt.Errorf("organization not found")
} }
return nil return nil
} }