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

core-service/internal/repository/items.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"erp-mvp/core-service/internal/models"
+
 	"github.com/google/uuid"
 )
 
@@ -31,7 +32,7 @@ func (r *itemRepository) Create(ctx context.Context, item *models.Item) error {
 		INSERT INTO items (id, organization_id, name, description, category, created_at)
 		VALUES ($1, $2, $3, $4, $5, $6)
 	`
-	
+
 	_, err := r.db.ExecContext(ctx, query,
 		item.ID,
 		item.OrganizationID,
@@ -43,7 +44,7 @@ func (r *itemRepository) Create(ctx context.Context, item *models.Item) error {
 	if err != nil {
 		return fmt.Errorf("failed to create item: %w", err)
 	}
-	
+
 	return nil
 }
 
@@ -53,7 +54,7 @@ func (r *itemRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uuid.U
 		FROM items
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	item := &models.Item{}
 	err := r.db.QueryRowContext(ctx, query, id, orgID).Scan(
 		&item.ID,
@@ -63,14 +64,14 @@ func (r *itemRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uuid.U
 		&item.Category,
 		&item.CreatedAt,
 	)
-	
+
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil, fmt.Errorf("item not found")
 		}
 		return nil, fmt.Errorf("failed to get item: %w", err)
 	}
-	
+
 	return item, nil
 }
 
@@ -81,13 +82,13 @@ func (r *itemRepository) GetByOrganization(ctx context.Context, orgID uuid.UUID)
 		WHERE organization_id = $1
 		ORDER BY name
 	`
-	
+
 	rows, err := r.db.QueryContext(ctx, query, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query items: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var items []*models.Item
 	for rows.Next() {
 		item := &models.Item{}
@@ -102,14 +103,14 @@ func (r *itemRepository) GetByOrganization(ctx context.Context, orgID uuid.UUID)
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan item: %w", err)
 		}
-		
+
 		items = append(items, item)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating items: %w", err)
 	}
-	
+
 	return items, nil
 }
 
@@ -119,7 +120,7 @@ func (r *itemRepository) Update(ctx context.Context, item *models.Item) error {
 		SET name = $3, description = $4, category = $5
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query,
 		item.ID,
 		item.OrganizationID,
@@ -130,16 +131,16 @@ func (r *itemRepository) Update(ctx context.Context, item *models.Item) error {
 	if err != nil {
 		return fmt.Errorf("failed to update item: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("item not found")
 	}
-	
+
 	return nil
 }
 
@@ -148,21 +149,21 @@ func (r *itemRepository) Delete(ctx context.Context, id uuid.UUID, orgID uuid.UU
 		DELETE FROM items
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query, id, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to delete item: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("item not found")
 	}
-	
+
 	return nil
 }
 
@@ -172,31 +173,31 @@ func (r *itemRepository) Search(ctx context.Context, orgID uuid.UUID, query stri
 		FROM items
 		WHERE organization_id = $1
 	`
-	
+
 	var args []interface{}
 	args = append(args, orgID)
 	argIndex := 2
-	
+
 	if query != "" {
 		baseQuery += fmt.Sprintf(" AND (name ILIKE $%d OR description ILIKE $%d)", argIndex, argIndex)
 		args = append(args, "%"+query+"%")
 		argIndex++
 	}
-	
+
 	if category != "" {
 		baseQuery += fmt.Sprintf(" AND category = $%d", argIndex)
 		args = append(args, category)
 		argIndex++
 	}
-	
+
 	baseQuery += " ORDER BY name"
-	
+
 	rows, err := r.db.QueryContext(ctx, baseQuery, args...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to search items: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var items []*models.Item
 	for rows.Next() {
 		item := &models.Item{}
@@ -211,13 +212,13 @@ func (r *itemRepository) Search(ctx context.Context, orgID uuid.UUID, query stri
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan item: %w", err)
 		}
-		
+
 		items = append(items, item)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating search results: %w", err)
 	}
-	
+
 	return items, nil
 }

core-service/internal/repository/locations.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"erp-mvp/core-service/internal/models"
+
 	"github.com/google/uuid"
 )
 
@@ -32,7 +33,7 @@ func (r *locationRepository) Create(ctx context.Context, location *models.Storag
 		INSERT INTO storage_locations (id, organization_id, parent_id, name, address, type, coordinates, created_at)
 		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
 	`
-	
+
 	// Конвертируем JSON в строку
 	var coordinatesJSON string
 	if location.Coordinates != nil {
@@ -42,7 +43,7 @@ func (r *locationRepository) Create(ctx context.Context, location *models.Storag
 		}
 		coordinatesJSON = string(coords)
 	}
-	
+
 	_, err := r.db.ExecContext(ctx, query,
 		location.ID,
 		location.OrganizationID,
@@ -56,7 +57,7 @@ func (r *locationRepository) Create(ctx context.Context, location *models.Storag
 	if err != nil {
 		return fmt.Errorf("failed to create storage location: %w", err)
 	}
-	
+
 	return nil
 }
 
@@ -66,7 +67,7 @@ func (r *locationRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uu
 		FROM storage_locations
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	var coordinatesJSON []byte
 	location := &models.StorageLocation{}
 	err := r.db.QueryRowContext(ctx, query, id, orgID).Scan(
@@ -79,14 +80,14 @@ func (r *locationRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uu
 		&coordinatesJSON,
 		&location.CreatedAt,
 	)
-	
+
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil, fmt.Errorf("storage location not found")
 		}
 		return nil, fmt.Errorf("failed to get storage location: %w", err)
 	}
-	
+
 	// Конвертируем JSON строку в map
 	if len(coordinatesJSON) > 0 {
 		err = json.Unmarshal(coordinatesJSON, &location.Coordinates)
@@ -96,7 +97,7 @@ func (r *locationRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uu
 	} else {
 		location.Coordinates = make(models.JSON)
 	}
-	
+
 	return location, nil
 }
 
@@ -107,13 +108,13 @@ func (r *locationRepository) GetByOrganization(ctx context.Context, orgID uuid.U
 		WHERE organization_id = $1
 		ORDER BY name
 	`
-	
+
 	rows, err := r.db.QueryContext(ctx, query, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query storage locations: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var locations []*models.StorageLocation
 	for rows.Next() {
 		var coordinatesJSON []byte
@@ -131,7 +132,7 @@ func (r *locationRepository) GetByOrganization(ctx context.Context, orgID uuid.U
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan storage location: %w", err)
 		}
-		
+
 		// Конвертируем JSON строку в map
 		if len(coordinatesJSON) > 0 {
 			err = json.Unmarshal(coordinatesJSON, &location.Coordinates)
@@ -141,14 +142,14 @@ func (r *locationRepository) GetByOrganization(ctx context.Context, orgID uuid.U
 		} else {
 			location.Coordinates = make(models.JSON)
 		}
-		
+
 		locations = append(locations, location)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating storage locations: %w", err)
 	}
-	
+
 	return locations, nil
 }
 
@@ -158,7 +159,7 @@ func (r *locationRepository) Update(ctx context.Context, location *models.Storag
 		SET parent_id = $3, name = $4, address = $5, type = $6, coordinates = $7
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	// Конвертируем JSON в строку
 	var coordinatesJSON string
 	if location.Coordinates != nil {
@@ -168,7 +169,7 @@ func (r *locationRepository) Update(ctx context.Context, location *models.Storag
 		}
 		coordinatesJSON = string(coords)
 	}
-	
+
 	result, err := r.db.ExecContext(ctx, query,
 		location.ID,
 		location.OrganizationID,
@@ -181,16 +182,16 @@ func (r *locationRepository) Update(ctx context.Context, location *models.Storag
 	if err != nil {
 		return fmt.Errorf("failed to update storage location: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("storage location not found")
 	}
-	
+
 	return nil
 }
 
@@ -199,21 +200,21 @@ func (r *locationRepository) Delete(ctx context.Context, id uuid.UUID, orgID uui
 		DELETE FROM storage_locations
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query, id, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to delete storage location: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("storage location not found")
 	}
-	
+
 	return nil
 }
 
@@ -224,13 +225,13 @@ func (r *locationRepository) GetChildren(ctx context.Context, parentID uuid.UUID
 		WHERE parent_id = $1 AND organization_id = $2
 		ORDER BY name
 	`
-	
+
 	rows, err := r.db.QueryContext(ctx, query, parentID, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query child locations: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var locations []*models.StorageLocation
 	for rows.Next() {
 		var coordinatesJSON []byte
@@ -248,7 +249,7 @@ func (r *locationRepository) GetChildren(ctx context.Context, parentID uuid.UUID
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan child location: %w", err)
 		}
-		
+
 		// Конвертируем JSON строку в map
 		if len(coordinatesJSON) > 0 {
 			err = json.Unmarshal(coordinatesJSON, &location.Coordinates)
@@ -258,13 +259,13 @@ func (r *locationRepository) GetChildren(ctx context.Context, parentID uuid.UUID
 		} else {
 			location.Coordinates = make(models.JSON)
 		}
-		
+
 		locations = append(locations, location)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating child locations: %w", err)
 	}
-	
+
 	return locations, nil
 }

core-service/internal/repository/operations.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"erp-mvp/core-service/internal/models"
+
 	"github.com/google/uuid"
 )
 
@@ -34,7 +35,7 @@ func (r *operationsRepository) PlaceItem(ctx context.Context, placement *models.
 		INSERT INTO item_placements (id, organization_id, item_id, location_id, quantity, created_at)
 		VALUES ($1, $2, $3, $4, $5, $6)
 	`
-	
+
 	_, err := r.db.ExecContext(ctx, query,
 		placement.ID,
 		placement.OrganizationID,
@@ -46,7 +47,7 @@ func (r *operationsRepository) PlaceItem(ctx context.Context, placement *models.
 	if err != nil {
 		return fmt.Errorf("failed to place item: %w", err)
 	}
-	
+
 	return nil
 }
 
@@ -56,21 +57,21 @@ func (r *operationsRepository) MoveItem(ctx context.Context, placementID uuid.UU
 		SET location_id = $2
 		WHERE id = $1 AND organization_id = $3
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query, placementID, newLocationID, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to move item: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("item placement not found")
 	}
-	
+
 	return nil
 }
 
@@ -81,13 +82,13 @@ func (r *operationsRepository) GetByItem(ctx context.Context, itemID uuid.UUID,
 		WHERE item_id = $1 AND organization_id = $2
 		ORDER BY created_at DESC
 	`
-	
+
 	rows, err := r.db.QueryContext(ctx, query, itemID, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query item placements: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var placements []*models.ItemPlacement
 	for rows.Next() {
 		placement := &models.ItemPlacement{}
@@ -102,14 +103,14 @@ func (r *operationsRepository) GetByItem(ctx context.Context, itemID uuid.UUID,
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan item placement: %w", err)
 		}
-		
+
 		placements = append(placements, placement)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating item placements: %w", err)
 	}
-	
+
 	return placements, nil
 }
 
@@ -120,13 +121,13 @@ func (r *operationsRepository) GetByLocation(ctx context.Context, locationID uui
 		WHERE location_id = $1 AND organization_id = $2
 		ORDER BY created_at DESC
 	`
-	
+
 	rows, err := r.db.QueryContext(ctx, query, locationID, orgID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query location placements: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var placements []*models.ItemPlacement
 	for rows.Next() {
 		placement := &models.ItemPlacement{}
@@ -141,14 +142,14 @@ func (r *operationsRepository) GetByLocation(ctx context.Context, locationID uui
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan item placement: %w", err)
 		}
-		
+
 		placements = append(placements, placement)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating location placements: %w", err)
 	}
-	
+
 	return placements, nil
 }
 
@@ -158,7 +159,7 @@ func (r *operationsRepository) GetByID(ctx context.Context, id uuid.UUID, orgID
 		FROM item_placements
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	placement := &models.ItemPlacement{}
 	err := r.db.QueryRowContext(ctx, query, id, orgID).Scan(
 		&placement.ID,
@@ -168,14 +169,14 @@ func (r *operationsRepository) GetByID(ctx context.Context, id uuid.UUID, orgID
 		&placement.Quantity,
 		&placement.CreatedAt,
 	)
-	
+
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil, fmt.Errorf("item placement not found")
 		}
 		return nil, fmt.Errorf("failed to get item placement: %w", err)
 	}
-	
+
 	return placement, nil
 }
 
@@ -185,21 +186,21 @@ func (r *operationsRepository) UpdateQuantity(ctx context.Context, id uuid.UUID,
 		SET quantity = $2
 		WHERE id = $1 AND organization_id = $3
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query, id, quantity, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to update quantity: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("item placement not found")
 	}
-	
+
 	return nil
 }
 
@@ -208,21 +209,21 @@ func (r *operationsRepository) Delete(ctx context.Context, id uuid.UUID, orgID u
 		DELETE FROM item_placements
 		WHERE id = $1 AND organization_id = $2
 	`
-	
+
 	result, err := r.db.ExecContext(ctx, query, id, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to delete item placement: %w", err)
 	}
-	
+
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
 		return fmt.Errorf("failed to get rows affected: %w", err)
 	}
-	
+
 	if rowsAffected == 0 {
 		return fmt.Errorf("item placement not found")
 	}
-	
+
 	return nil
 }
 
@@ -237,42 +238,42 @@ func (r *operationsRepository) Search(ctx context.Context, orgID uuid.UUID, quer
 		JOIN storage_locations sl ON ip.location_id = sl.id
 		WHERE i.organization_id = $1 AND sl.organization_id = $1
 	`
-	
+
 	var args []interface{}
 	args = append(args, orgID)
 	argIndex := 2
-	
+
 	if query != "" {
 		baseQuery += fmt.Sprintf(" AND (i.name ILIKE $%d OR i.description ILIKE $%d)", argIndex, argIndex)
 		args = append(args, "%"+query+"%")
 		argIndex++
 	}
-	
+
 	if category != "" {
 		baseQuery += fmt.Sprintf(" AND i.category = $%d", argIndex)
 		args = append(args, category)
 		argIndex++
 	}
-	
+
 	if address != "" {
 		baseQuery += fmt.Sprintf(" AND sl.address ILIKE $%d", argIndex)
 		args = append(args, "%"+address+"%")
 		argIndex++
 	}
-	
+
 	baseQuery += " ORDER BY i.name, sl.name"
-	
+
 	rows, err := r.db.QueryContext(ctx, baseQuery, args...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to search items with locations: %w", err)
 	}
 	defer rows.Close()
-	
+
 	var results []*models.ItemWithLocation
 	for rows.Next() {
 		var coordinatesJSON []byte
 		itemWithLocation := &models.ItemWithLocation{}
-		
+
 		err := rows.Scan(
 			&itemWithLocation.Item.ID,
 			&itemWithLocation.Item.OrganizationID,
@@ -293,7 +294,7 @@ func (r *operationsRepository) Search(ctx context.Context, orgID uuid.UUID, quer
 		if err != nil {
 			return nil, fmt.Errorf("failed to scan item with location: %w", err)
 		}
-		
+
 		// Конвертируем JSON строку в map
 		if len(coordinatesJSON) > 0 {
 			err = json.Unmarshal(coordinatesJSON, &itemWithLocation.Location.Coordinates)
@@ -303,13 +304,13 @@ func (r *operationsRepository) Search(ctx context.Context, orgID uuid.UUID, quer
 		} else {
 			itemWithLocation.Location.Coordinates = make(models.JSON)
 		}
-		
+
 		results = append(results, itemWithLocation)
 	}
-	
+
 	if err = rows.Err(); err != nil {
 		return nil, fmt.Errorf("error iterating search results: %w", err)
 	}
-	
+
 	return results, nil
 }