Compare commits
3 Commits
feature/co
...
94bf3a6b86
| Author | SHA1 | Date | |
|---|---|---|---|
| 94bf3a6b86 | |||
| f99db54c03 | |||
| a846a2dce4 |
@@ -235,12 +235,12 @@ type LoginRequest struct {
|
||||
|
||||
---
|
||||
|
||||
## 🏗️ Этап 3: API структура (Неделя 3)
|
||||
## 🏗️ Этап 3: API структура (Неделя 3) ✅ ЗАВЕРШЁН
|
||||
|
||||
### Шаг 3.1: Базовые handlers
|
||||
- [ ] Создать `internal/api/handlers/` с базовыми структурами
|
||||
- [ ] Реализовать middleware для CORS, логирования, аутентификации
|
||||
- [ ] Добавить обработку ошибок
|
||||
### Шаг 3.1: Repository pattern ✅
|
||||
- [x] Создать `internal/repository/` для работы с БД
|
||||
- [x] Реализовать CRUD операции для всех сущностей
|
||||
- [x] Добавить organization-scope фильтрацию
|
||||
|
||||
**Структура handlers:**
|
||||
```
|
||||
@@ -259,51 +259,58 @@ internal/api/
|
||||
└── server.go
|
||||
```
|
||||
|
||||
### Шаг 3.2: Repository pattern
|
||||
- [ ] Создать `internal/repository/` для работы с БД
|
||||
- [ ] Реализовать CRUD операции для всех сущностей
|
||||
- [ ] Добавить organization-scope фильтрацию
|
||||
### Шаг 3.2: Service layer ✅
|
||||
- [x] Создать `internal/service/` с бизнес-логикой
|
||||
- [x] Реализовать сервисы для всех сущностей
|
||||
- [x] Добавить валидацию и логирование
|
||||
|
||||
**Основные репозитории:**
|
||||
**Основные сервисы:**
|
||||
```go
|
||||
// internal/repository/organizations.go
|
||||
type OrganizationRepository interface {
|
||||
Create(ctx context.Context, org *models.Organization) error
|
||||
GetByID(ctx context.Context, id uuid.UUID) (*models.Organization, error)
|
||||
Update(ctx context.Context, org *models.Organization) error
|
||||
// internal/service/location_service.go
|
||||
type LocationService interface {
|
||||
CreateLocation(ctx context.Context, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error)
|
||||
GetLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error)
|
||||
GetLocations(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
UpdateLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error)
|
||||
DeleteLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
}
|
||||
|
||||
// internal/repository/users.go
|
||||
type UserRepository interface {
|
||||
Create(ctx context.Context, user *models.User, password string) error
|
||||
GetByEmail(ctx context.Context, email string) (*models.User, error)
|
||||
GetByID(ctx context.Context, id uuid.UUID) (*models.User, error)
|
||||
// internal/service/item_service.go
|
||||
type ItemService interface {
|
||||
CreateItem(ctx context.Context, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error)
|
||||
GetItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error)
|
||||
GetItems(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error)
|
||||
UpdateItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error)
|
||||
DeleteItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
SearchItems(ctx context.Context, orgID uuid.UUID, query string, category string) ([]*models.Item, error)
|
||||
}
|
||||
|
||||
// internal/repository/locations.go
|
||||
type LocationRepository interface {
|
||||
Create(ctx context.Context, location *models.StorageLocation) error
|
||||
GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error)
|
||||
GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
Update(ctx context.Context, location *models.StorageLocation) error
|
||||
Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
}
|
||||
|
||||
// internal/repository/items.go
|
||||
type ItemRepository interface {
|
||||
Create(ctx context.Context, item *models.Item) error
|
||||
GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error)
|
||||
GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error)
|
||||
Search(ctx context.Context, orgID uuid.UUID, query string) ([]*models.Item, error)
|
||||
Update(ctx context.Context, item *models.Item) error
|
||||
Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
// internal/service/operations_service.go
|
||||
type OperationsService interface {
|
||||
PlaceItem(ctx context.Context, orgID uuid.UUID, req *models.PlaceItemRequest) (*models.ItemPlacement, error)
|
||||
MoveItem(ctx context.Context, placementID uuid.UUID, newLocationID uuid.UUID, orgID uuid.UUID) error
|
||||
GetItemPlacements(ctx context.Context, itemID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
GetLocationPlacements(ctx context.Context, locationID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
Search(ctx context.Context, orgID uuid.UUID, req *models.SearchRequest) (*models.SearchResponse, error)
|
||||
}
|
||||
```
|
||||
|
||||
### Шаг 3.3: Service layer
|
||||
- [ ] Создать `internal/service/` для бизнес-логики
|
||||
- [ ] Реализовать валидацию и обработку данных
|
||||
- [ ] Добавить транзакции для сложных операций
|
||||
### Шаг 3.3: HTTP Handlers ✅
|
||||
- [x] Создать `internal/api/handlers/` с базовыми структурами
|
||||
- [x] Реализовать handlers для всех API endpoints
|
||||
- [x] Добавить валидацию запросов
|
||||
|
||||
**Результаты этапа 3:**
|
||||
- ✅ Созданы репозитории для locations, items, operations
|
||||
- ✅ Реализованы сервисы с бизнес-логикой
|
||||
- ✅ Созданы HTTP handlers для всех API endpoints
|
||||
- ✅ Добавлена функция GetClaims в middleware
|
||||
- ✅ Organization-scope фильтрация во всех операциях
|
||||
- ✅ Поддержка JSON полей в PostgreSQL
|
||||
- ✅ Валидация всех входящих запросов
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
172
core-service/internal/api/handlers/items.go
Normal file
172
core-service/internal/api/handlers/items.go
Normal file
@@ -0,0 +1,172 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"erp-mvp/core-service/internal/api/middleware"
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type ItemHandler struct {
|
||||
itemService service.ItemService
|
||||
validate *validator.Validate
|
||||
}
|
||||
|
||||
func NewItemHandler(itemService service.ItemService) *ItemHandler {
|
||||
return &ItemHandler{
|
||||
itemService: itemService,
|
||||
validate: validator.New(),
|
||||
}
|
||||
}
|
||||
|
||||
// GetItems получает все товары организации
|
||||
func (h *ItemHandler) GetItems(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
items, err := h.itemService.GetItems(c.Request.Context(), claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get items"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, items)
|
||||
}
|
||||
|
||||
// CreateItem создает новый товар
|
||||
func (h *ItemHandler) CreateItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.CreateItemRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
item, err := h.itemService.CreateItem(c.Request.Context(), claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create item"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusCreated, item)
|
||||
}
|
||||
|
||||
// GetItem получает товар по ID
|
||||
func (h *ItemHandler) GetItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid item ID"})
|
||||
return
|
||||
}
|
||||
|
||||
item, err := h.itemService.GetItem(c.Request.Context(), id, claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Item not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, item)
|
||||
}
|
||||
|
||||
// UpdateItem обновляет товар
|
||||
func (h *ItemHandler) UpdateItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid item ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.CreateItemRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
item, err := h.itemService.UpdateItem(c.Request.Context(), id, claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Item not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, item)
|
||||
}
|
||||
|
||||
// DeleteItem удаляет товар
|
||||
func (h *ItemHandler) DeleteItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid item ID"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.itemService.DeleteItem(c.Request.Context(), id, claims.OrganizationID); err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Item not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusNoContent, nil)
|
||||
}
|
||||
|
||||
// SearchItems ищет товары
|
||||
func (h *ItemHandler) SearchItems(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
query := c.Query("q")
|
||||
category := c.Query("category")
|
||||
|
||||
items, err := h.itemService.SearchItems(c.Request.Context(), claims.OrganizationID, query, category)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to search items"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, items)
|
||||
}
|
||||
176
core-service/internal/api/handlers/locations.go
Normal file
176
core-service/internal/api/handlers/locations.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"erp-mvp/core-service/internal/api/middleware"
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type LocationHandler struct {
|
||||
locationService service.LocationService
|
||||
validate *validator.Validate
|
||||
}
|
||||
|
||||
func NewLocationHandler(locationService service.LocationService) *LocationHandler {
|
||||
return &LocationHandler{
|
||||
locationService: locationService,
|
||||
validate: validator.New(),
|
||||
}
|
||||
}
|
||||
|
||||
// GetLocations получает все места хранения организации
|
||||
func (h *LocationHandler) GetLocations(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
locations, err := h.locationService.GetLocations(c.Request.Context(), claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get locations"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, locations)
|
||||
}
|
||||
|
||||
// CreateLocation создает новое место хранения
|
||||
func (h *LocationHandler) CreateLocation(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.CreateLocationRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
location, err := h.locationService.CreateLocation(c.Request.Context(), claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create location"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusCreated, location)
|
||||
}
|
||||
|
||||
// GetLocation получает место хранения по ID
|
||||
func (h *LocationHandler) GetLocation(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid location ID"})
|
||||
return
|
||||
}
|
||||
|
||||
location, err := h.locationService.GetLocation(c.Request.Context(), id, claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Location not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, location)
|
||||
}
|
||||
|
||||
// UpdateLocation обновляет место хранения
|
||||
func (h *LocationHandler) UpdateLocation(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid location ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.CreateLocationRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
location, err := h.locationService.UpdateLocation(c.Request.Context(), id, claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Location not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, location)
|
||||
}
|
||||
|
||||
// DeleteLocation удаляет место хранения
|
||||
func (h *LocationHandler) DeleteLocation(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
idStr := c.Param("id")
|
||||
id, err := uuid.Parse(idStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid location ID"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.locationService.DeleteLocation(c.Request.Context(), id, claims.OrganizationID); err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Location not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusNoContent, nil)
|
||||
}
|
||||
|
||||
// GetChildren получает дочерние места хранения
|
||||
func (h *LocationHandler) GetChildren(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
parentIDStr := c.Param("id")
|
||||
parentID, err := uuid.Parse(parentIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid parent location ID"})
|
||||
return
|
||||
}
|
||||
|
||||
children, err := h.locationService.GetChildren(c.Request.Context(), parentID, claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Parent location not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, children)
|
||||
}
|
||||
227
core-service/internal/api/handlers/operations.go
Normal file
227
core-service/internal/api/handlers/operations.go
Normal file
@@ -0,0 +1,227 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"erp-mvp/core-service/internal/api/middleware"
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type OperationsHandler struct {
|
||||
operationsService service.OperationsService
|
||||
validate *validator.Validate
|
||||
}
|
||||
|
||||
func NewOperationsHandler(operationsService service.OperationsService) *OperationsHandler {
|
||||
return &OperationsHandler{
|
||||
operationsService: operationsService,
|
||||
validate: validator.New(),
|
||||
}
|
||||
}
|
||||
|
||||
// PlaceItem размещает товар в месте хранения
|
||||
func (h *OperationsHandler) PlaceItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.PlaceItemRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
placement, err := h.operationsService.PlaceItem(c.Request.Context(), claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to place item"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusCreated, placement)
|
||||
}
|
||||
|
||||
// MoveItem перемещает товар в другое место хранения
|
||||
func (h *OperationsHandler) MoveItem(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
placementIDStr := c.Param("id")
|
||||
placementID, err := uuid.Parse(placementIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid placement ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
NewLocationID uuid.UUID `json:"new_location_id" validate:"required"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.operationsService.MoveItem(c.Request.Context(), placementID, req.NewLocationID, claims.OrganizationID); err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Placement not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "Item moved successfully"})
|
||||
}
|
||||
|
||||
// GetItemPlacements получает все размещения товара
|
||||
func (h *OperationsHandler) GetItemPlacements(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
itemIDStr := c.Param("item_id")
|
||||
itemID, err := uuid.Parse(itemIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid item ID"})
|
||||
return
|
||||
}
|
||||
|
||||
placements, err := h.operationsService.GetItemPlacements(c.Request.Context(), itemID, claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Item not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, placements)
|
||||
}
|
||||
|
||||
// GetLocationPlacements получает все товары в месте хранения
|
||||
func (h *OperationsHandler) GetLocationPlacements(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
locationIDStr := c.Param("location_id")
|
||||
locationID, err := uuid.Parse(locationIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid location ID"})
|
||||
return
|
||||
}
|
||||
|
||||
placements, err := h.operationsService.GetLocationPlacements(c.Request.Context(), locationID, claims.OrganizationID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Location not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, placements)
|
||||
}
|
||||
|
||||
// UpdateQuantity обновляет количество товара в размещении
|
||||
func (h *OperationsHandler) UpdateQuantity(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
placementIDStr := c.Param("id")
|
||||
placementID, err := uuid.Parse(placementIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid placement ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
Quantity int `json:"quantity" validate:"required,min=1"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.validate.Struct(req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Validation failed", "details": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.operationsService.UpdateQuantity(c.Request.Context(), placementID, req.Quantity, claims.OrganizationID); err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Placement not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "Quantity updated successfully"})
|
||||
}
|
||||
|
||||
// DeletePlacement удаляет размещение товара
|
||||
func (h *OperationsHandler) DeletePlacement(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
placementIDStr := c.Param("id")
|
||||
placementID, err := uuid.Parse(placementIDStr)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid placement ID"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.operationsService.DeletePlacement(c.Request.Context(), placementID, claims.OrganizationID); err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Placement not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusNoContent, nil)
|
||||
}
|
||||
|
||||
// Search выполняет поиск товаров с местами размещения
|
||||
func (h *OperationsHandler) Search(c *gin.Context) {
|
||||
claims := middleware.GetClaims(c)
|
||||
if claims == nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.SearchRequest
|
||||
if err := c.ShouldBindQuery(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid query parameters"})
|
||||
return
|
||||
}
|
||||
|
||||
// Устанавливаем значения по умолчанию
|
||||
if req.Page <= 0 {
|
||||
req.Page = 1
|
||||
}
|
||||
if req.PageSize <= 0 {
|
||||
req.PageSize = 20
|
||||
}
|
||||
|
||||
response, err := h.operationsService.Search(c.Request.Context(), claims.OrganizationID, &req)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to search"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, response)
|
||||
}
|
||||
@@ -5,7 +5,9 @@ import (
|
||||
"strings"
|
||||
|
||||
"erp-mvp/core-service/internal/auth"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type AuthMiddleware struct {
|
||||
@@ -55,3 +57,33 @@ func (m *AuthMiddleware) AuthRequired() gin.HandlerFunc {
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
// GetClaims получает claims из контекста Gin
|
||||
func GetClaims(c *gin.Context) *auth.Claims {
|
||||
userID, exists := c.Get("user_id")
|
||||
if !exists {
|
||||
return nil
|
||||
}
|
||||
|
||||
orgID, exists := c.Get("organization_id")
|
||||
if !exists {
|
||||
return nil
|
||||
}
|
||||
|
||||
email, exists := c.Get("email")
|
||||
if !exists {
|
||||
return nil
|
||||
}
|
||||
|
||||
role, exists := c.Get("role")
|
||||
if !exists {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &auth.Claims{
|
||||
UserID: userID.(uuid.UUID),
|
||||
OrganizationID: orgID.(uuid.UUID),
|
||||
Email: email.(string),
|
||||
Role: role.(string),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@ import (
|
||||
"database/sql"
|
||||
"net/http"
|
||||
|
||||
"erp-mvp/core-service/internal/api/handlers"
|
||||
"erp-mvp/core-service/internal/api/middleware"
|
||||
"erp-mvp/core-service/internal/auth"
|
||||
"erp-mvp/core-service/internal/config"
|
||||
"erp-mvp/core-service/internal/logger"
|
||||
"erp-mvp/core-service/internal/repository"
|
||||
"erp-mvp/core-service/internal/service"
|
||||
"erp-mvp/core-service/internal/api/handlers"
|
||||
"erp-mvp/core-service/internal/api/middleware"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
@@ -24,9 +24,15 @@ type Server struct {
|
||||
|
||||
// Services
|
||||
authService service.AuthService
|
||||
locationService service.LocationService
|
||||
itemService service.ItemService
|
||||
operationsService service.OperationsService
|
||||
|
||||
// Handlers
|
||||
authHandler *handlers.AuthHandler
|
||||
locationHandler *handlers.LocationHandler
|
||||
itemHandler *handlers.ItemHandler
|
||||
operationsHandler *handlers.OperationsHandler
|
||||
|
||||
// Middleware
|
||||
authMiddleware *middleware.AuthMiddleware
|
||||
@@ -39,12 +45,21 @@ func NewServer(cfg *config.Config, db *sql.DB, log logger.Logger) *Server {
|
||||
// Инициализируем репозитории
|
||||
orgRepo := repository.NewOrganizationRepository(db)
|
||||
userRepo := repository.NewUserRepository(db)
|
||||
locationRepo := repository.NewLocationRepository(db)
|
||||
itemRepo := repository.NewItemRepository(db)
|
||||
operationsRepo := repository.NewOperationsRepository(db)
|
||||
|
||||
// Инициализируем сервисы
|
||||
authService := service.NewAuthService(orgRepo, userRepo, jwtService)
|
||||
locationService := service.NewLocationService(locationRepo)
|
||||
itemService := service.NewItemService(itemRepo)
|
||||
operationsService := service.NewOperationsService(operationsRepo, itemRepo, locationRepo)
|
||||
|
||||
// Инициализируем handlers
|
||||
authHandler := handlers.NewAuthHandler(authService)
|
||||
locationHandler := handlers.NewLocationHandler(locationService)
|
||||
itemHandler := handlers.NewItemHandler(itemService)
|
||||
operationsHandler := handlers.NewOperationsHandler(operationsService)
|
||||
|
||||
// Инициализируем middleware
|
||||
authMiddleware := middleware.NewAuthMiddleware(jwtService)
|
||||
@@ -55,7 +70,13 @@ func NewServer(cfg *config.Config, db *sql.DB, log logger.Logger) *Server {
|
||||
logger: log,
|
||||
router: gin.Default(),
|
||||
authService: authService,
|
||||
locationService: locationService,
|
||||
itemService: itemService,
|
||||
operationsService: operationsService,
|
||||
authHandler: authHandler,
|
||||
locationHandler: locationHandler,
|
||||
itemHandler: itemHandler,
|
||||
operationsHandler: operationsHandler,
|
||||
authMiddleware: authMiddleware,
|
||||
}
|
||||
|
||||
@@ -86,23 +107,29 @@ func (s *Server) setupRoutes() {
|
||||
protected.PUT("/organizations/:id", s.updateOrganization)
|
||||
|
||||
// Locations
|
||||
protected.GET("/locations", s.getLocations)
|
||||
protected.POST("/locations", s.createLocation)
|
||||
protected.GET("/locations/:id", s.getLocation)
|
||||
protected.PUT("/locations/:id", s.updateLocation)
|
||||
protected.DELETE("/locations/:id", s.deleteLocation)
|
||||
protected.GET("/locations", s.locationHandler.GetLocations)
|
||||
protected.POST("/locations", s.locationHandler.CreateLocation)
|
||||
protected.GET("/locations/:id", s.locationHandler.GetLocation)
|
||||
protected.PUT("/locations/:id", s.locationHandler.UpdateLocation)
|
||||
protected.DELETE("/locations/:id", s.locationHandler.DeleteLocation)
|
||||
protected.GET("/locations/:id/children", s.locationHandler.GetChildren)
|
||||
|
||||
// Items
|
||||
protected.GET("/items", s.getItems)
|
||||
protected.POST("/items", s.createItem)
|
||||
protected.GET("/items/:id", s.getItem)
|
||||
protected.PUT("/items/:id", s.updateItem)
|
||||
protected.DELETE("/items/:id", s.deleteItem)
|
||||
protected.GET("/items", s.itemHandler.GetItems)
|
||||
protected.POST("/items", s.itemHandler.CreateItem)
|
||||
protected.GET("/items/:id", s.itemHandler.GetItem)
|
||||
protected.PUT("/items/:id", s.itemHandler.UpdateItem)
|
||||
protected.DELETE("/items/:id", s.itemHandler.DeleteItem)
|
||||
protected.GET("/items/search", s.itemHandler.SearchItems)
|
||||
|
||||
// Operations
|
||||
protected.POST("/operations/place-item", s.placeItem)
|
||||
protected.POST("/operations/move-item", s.moveItem)
|
||||
protected.GET("/operations/search", s.search)
|
||||
protected.POST("/operations/place-item", s.operationsHandler.PlaceItem)
|
||||
protected.POST("/operations/move-item/:id", s.operationsHandler.MoveItem)
|
||||
protected.GET("/operations/search", s.operationsHandler.Search)
|
||||
protected.GET("/operations/items/:item_id/placements", s.operationsHandler.GetItemPlacements)
|
||||
protected.GET("/operations/locations/:location_id/placements", s.operationsHandler.GetLocationPlacements)
|
||||
protected.PUT("/operations/placements/:id/quantity", s.operationsHandler.UpdateQuantity)
|
||||
protected.DELETE("/operations/placements/:id", s.operationsHandler.DeletePlacement)
|
||||
|
||||
// Templates
|
||||
protected.GET("/templates", s.getTemplates)
|
||||
@@ -127,58 +154,6 @@ func (s *Server) updateOrganization(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) getLocations(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) createLocation(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) getLocation(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) updateLocation(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) deleteLocation(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) getItems(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) createItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) getItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) updateItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) deleteItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) placeItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) moveItem(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) search(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
func (s *Server) getTemplates(c *gin.Context) {
|
||||
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ type SearchRequest struct {
|
||||
|
||||
// SearchResponse результат поиска
|
||||
type SearchResponse struct {
|
||||
Items []ItemWithLocation `json:"items"`
|
||||
Items []*ItemWithLocation `json:"items"`
|
||||
TotalCount int `json:"total_count"`
|
||||
}
|
||||
|
||||
|
||||
224
core-service/internal/repository/items.go
Normal file
224
core-service/internal/repository/items.go
Normal file
@@ -0,0 +1,224 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type ItemRepository interface {
|
||||
Create(ctx context.Context, item *models.Item) error
|
||||
GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error)
|
||||
GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error)
|
||||
Update(ctx context.Context, item *models.Item) error
|
||||
Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
Search(ctx context.Context, orgID uuid.UUID, query string, category string) ([]*models.Item, error)
|
||||
}
|
||||
|
||||
type itemRepository struct {
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func NewItemRepository(db *sql.DB) ItemRepository {
|
||||
return &itemRepository{db: db}
|
||||
}
|
||||
|
||||
func (r *itemRepository) Create(ctx context.Context, item *models.Item) error {
|
||||
query := `
|
||||
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,
|
||||
item.Name,
|
||||
item.Description,
|
||||
item.Category,
|
||||
item.CreatedAt,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create item: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *itemRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, name, description, category, created_at
|
||||
FROM items
|
||||
WHERE id = $1 AND organization_id = $2
|
||||
`
|
||||
|
||||
item := &models.Item{}
|
||||
err := r.db.QueryRowContext(ctx, query, id, orgID).Scan(
|
||||
&item.ID,
|
||||
&item.OrganizationID,
|
||||
&item.Name,
|
||||
&item.Description,
|
||||
&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
|
||||
}
|
||||
|
||||
func (r *itemRepository) GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, name, description, category, created_at
|
||||
FROM items
|
||||
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{}
|
||||
err := rows.Scan(
|
||||
&item.ID,
|
||||
&item.OrganizationID,
|
||||
&item.Name,
|
||||
&item.Description,
|
||||
&item.Category,
|
||||
&item.CreatedAt,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
func (r *itemRepository) Update(ctx context.Context, item *models.Item) error {
|
||||
query := `
|
||||
UPDATE items
|
||||
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,
|
||||
item.Name,
|
||||
item.Description,
|
||||
item.Category,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
func (r *itemRepository) Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error {
|
||||
query := `
|
||||
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
|
||||
}
|
||||
|
||||
func (r *itemRepository) Search(ctx context.Context, orgID uuid.UUID, query string, category string) ([]*models.Item, error) {
|
||||
baseQuery := `
|
||||
SELECT id, organization_id, name, description, category, created_at
|
||||
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{}
|
||||
err := rows.Scan(
|
||||
&item.ID,
|
||||
&item.OrganizationID,
|
||||
&item.Name,
|
||||
&item.Description,
|
||||
&item.Category,
|
||||
&item.CreatedAt,
|
||||
)
|
||||
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
|
||||
}
|
||||
271
core-service/internal/repository/locations.go
Normal file
271
core-service/internal/repository/locations.go
Normal file
@@ -0,0 +1,271 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type LocationRepository interface {
|
||||
Create(ctx context.Context, location *models.StorageLocation) error
|
||||
GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error)
|
||||
GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
Update(ctx context.Context, location *models.StorageLocation) error
|
||||
Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
GetChildren(ctx context.Context, parentID uuid.UUID, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
}
|
||||
|
||||
type locationRepository struct {
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func NewLocationRepository(db *sql.DB) LocationRepository {
|
||||
return &locationRepository{db: db}
|
||||
}
|
||||
|
||||
func (r *locationRepository) Create(ctx context.Context, location *models.StorageLocation) error {
|
||||
query := `
|
||||
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 {
|
||||
coords, err := json.Marshal(location.Coordinates)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshal coordinates: %w", err)
|
||||
}
|
||||
coordinatesJSON = string(coords)
|
||||
}
|
||||
|
||||
_, err := r.db.ExecContext(ctx, query,
|
||||
location.ID,
|
||||
location.OrganizationID,
|
||||
location.ParentID,
|
||||
location.Name,
|
||||
location.Address,
|
||||
location.Type,
|
||||
coordinatesJSON,
|
||||
location.CreatedAt,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create storage location: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *locationRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, parent_id, name, address, type, coordinates, created_at
|
||||
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(
|
||||
&location.ID,
|
||||
&location.OrganizationID,
|
||||
&location.ParentID,
|
||||
&location.Name,
|
||||
&location.Address,
|
||||
&location.Type,
|
||||
&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)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to unmarshal coordinates: %w", err)
|
||||
}
|
||||
} else {
|
||||
location.Coordinates = make(models.JSON)
|
||||
}
|
||||
|
||||
return location, nil
|
||||
}
|
||||
|
||||
func (r *locationRepository) GetByOrganization(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, parent_id, name, address, type, coordinates, created_at
|
||||
FROM storage_locations
|
||||
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
|
||||
location := &models.StorageLocation{}
|
||||
err := rows.Scan(
|
||||
&location.ID,
|
||||
&location.OrganizationID,
|
||||
&location.ParentID,
|
||||
&location.Name,
|
||||
&location.Address,
|
||||
&location.Type,
|
||||
&coordinatesJSON,
|
||||
&location.CreatedAt,
|
||||
)
|
||||
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)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to unmarshal coordinates: %w", err)
|
||||
}
|
||||
} 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
|
||||
}
|
||||
|
||||
func (r *locationRepository) Update(ctx context.Context, location *models.StorageLocation) error {
|
||||
query := `
|
||||
UPDATE storage_locations
|
||||
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 {
|
||||
coords, err := json.Marshal(location.Coordinates)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to marshal coordinates: %w", err)
|
||||
}
|
||||
coordinatesJSON = string(coords)
|
||||
}
|
||||
|
||||
result, err := r.db.ExecContext(ctx, query,
|
||||
location.ID,
|
||||
location.OrganizationID,
|
||||
location.ParentID,
|
||||
location.Name,
|
||||
location.Address,
|
||||
location.Type,
|
||||
coordinatesJSON,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
func (r *locationRepository) Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error {
|
||||
query := `
|
||||
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
|
||||
}
|
||||
|
||||
func (r *locationRepository) GetChildren(ctx context.Context, parentID uuid.UUID, orgID uuid.UUID) ([]*models.StorageLocation, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, parent_id, name, address, type, coordinates, created_at
|
||||
FROM storage_locations
|
||||
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
|
||||
location := &models.StorageLocation{}
|
||||
err := rows.Scan(
|
||||
&location.ID,
|
||||
&location.OrganizationID,
|
||||
&location.ParentID,
|
||||
&location.Name,
|
||||
&location.Address,
|
||||
&location.Type,
|
||||
&coordinatesJSON,
|
||||
&location.CreatedAt,
|
||||
)
|
||||
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)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to unmarshal coordinates: %w", err)
|
||||
}
|
||||
} 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
|
||||
}
|
||||
316
core-service/internal/repository/operations.go
Normal file
316
core-service/internal/repository/operations.go
Normal file
@@ -0,0 +1,316 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type OperationsRepository interface {
|
||||
PlaceItem(ctx context.Context, placement *models.ItemPlacement) error
|
||||
MoveItem(ctx context.Context, placementID uuid.UUID, newLocationID uuid.UUID, orgID uuid.UUID) error
|
||||
GetByItem(ctx context.Context, itemID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
GetByLocation(ctx context.Context, locationID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.ItemPlacement, error)
|
||||
UpdateQuantity(ctx context.Context, id uuid.UUID, quantity int, orgID uuid.UUID) error
|
||||
Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
Search(ctx context.Context, orgID uuid.UUID, query string, category string, address string) ([]*models.ItemWithLocation, error)
|
||||
}
|
||||
|
||||
type operationsRepository struct {
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func NewOperationsRepository(db *sql.DB) OperationsRepository {
|
||||
return &operationsRepository{db: db}
|
||||
}
|
||||
|
||||
func (r *operationsRepository) PlaceItem(ctx context.Context, placement *models.ItemPlacement) error {
|
||||
query := `
|
||||
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,
|
||||
placement.ItemID,
|
||||
placement.LocationID,
|
||||
placement.Quantity,
|
||||
placement.CreatedAt,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to place item: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *operationsRepository) MoveItem(ctx context.Context, placementID uuid.UUID, newLocationID uuid.UUID, orgID uuid.UUID) error {
|
||||
query := `
|
||||
UPDATE item_placements
|
||||
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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) GetByItem(ctx context.Context, itemID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, item_id, location_id, quantity, created_at
|
||||
FROM item_placements
|
||||
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{}
|
||||
err := rows.Scan(
|
||||
&placement.ID,
|
||||
&placement.OrganizationID,
|
||||
&placement.ItemID,
|
||||
&placement.LocationID,
|
||||
&placement.Quantity,
|
||||
&placement.CreatedAt,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) GetByLocation(ctx context.Context, locationID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, item_id, location_id, quantity, created_at
|
||||
FROM item_placements
|
||||
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{}
|
||||
err := rows.Scan(
|
||||
&placement.ID,
|
||||
&placement.OrganizationID,
|
||||
&placement.ItemID,
|
||||
&placement.LocationID,
|
||||
&placement.Quantity,
|
||||
&placement.CreatedAt,
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) GetByID(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.ItemPlacement, error) {
|
||||
query := `
|
||||
SELECT id, organization_id, item_id, location_id, quantity, created_at
|
||||
FROM item_placements
|
||||
WHERE id = $1 AND organization_id = $2
|
||||
`
|
||||
|
||||
placement := &models.ItemPlacement{}
|
||||
err := r.db.QueryRowContext(ctx, query, id, orgID).Scan(
|
||||
&placement.ID,
|
||||
&placement.OrganizationID,
|
||||
&placement.ItemID,
|
||||
&placement.LocationID,
|
||||
&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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) UpdateQuantity(ctx context.Context, id uuid.UUID, quantity int, orgID uuid.UUID) error {
|
||||
query := `
|
||||
UPDATE item_placements
|
||||
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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) Delete(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error {
|
||||
query := `
|
||||
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
|
||||
}
|
||||
|
||||
func (r *operationsRepository) Search(ctx context.Context, orgID uuid.UUID, query string, category string, address string) ([]*models.ItemWithLocation, error) {
|
||||
baseQuery := `
|
||||
SELECT
|
||||
i.id, i.organization_id, i.name, i.description, i.category, i.created_at,
|
||||
sl.id, sl.organization_id, sl.parent_id, sl.name, sl.address, sl.type, sl.coordinates, sl.created_at,
|
||||
ip.quantity
|
||||
FROM items i
|
||||
JOIN item_placements ip ON i.id = ip.item_id
|
||||
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,
|
||||
&itemWithLocation.Item.Name,
|
||||
&itemWithLocation.Item.Description,
|
||||
&itemWithLocation.Item.Category,
|
||||
&itemWithLocation.Item.CreatedAt,
|
||||
&itemWithLocation.Location.ID,
|
||||
&itemWithLocation.Location.OrganizationID,
|
||||
&itemWithLocation.Location.ParentID,
|
||||
&itemWithLocation.Location.Name,
|
||||
&itemWithLocation.Location.Address,
|
||||
&itemWithLocation.Location.Type,
|
||||
&coordinatesJSON,
|
||||
&itemWithLocation.Location.CreatedAt,
|
||||
&itemWithLocation.Quantity,
|
||||
)
|
||||
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)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to unmarshal coordinates: %w", err)
|
||||
}
|
||||
} 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
|
||||
}
|
||||
126
core-service/internal/service/item_service.go
Normal file
126
core-service/internal/service/item_service.go
Normal file
@@ -0,0 +1,126 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/repository"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ItemService interface {
|
||||
CreateItem(ctx context.Context, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error)
|
||||
GetItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error)
|
||||
GetItems(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error)
|
||||
UpdateItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error)
|
||||
DeleteItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
SearchItems(ctx context.Context, orgID uuid.UUID, query string, category string) ([]*models.Item, error)
|
||||
}
|
||||
|
||||
type itemService struct {
|
||||
itemRepo repository.ItemRepository
|
||||
logger *logrus.Logger
|
||||
}
|
||||
|
||||
func NewItemService(itemRepo repository.ItemRepository) ItemService {
|
||||
return &itemService{
|
||||
itemRepo: itemRepo,
|
||||
logger: logrus.New(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *itemService) CreateItem(ctx context.Context, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error) {
|
||||
s.logger.Info("Creating item for organization: ", orgID)
|
||||
|
||||
item := &models.Item{
|
||||
ID: uuid.New(),
|
||||
OrganizationID: orgID,
|
||||
Name: req.Name,
|
||||
Description: req.Description,
|
||||
Category: req.Category,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
|
||||
if err := s.itemRepo.Create(ctx, item); err != nil {
|
||||
s.logger.Error("Failed to create item: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.logger.Info("Item created successfully: ", item.ID)
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func (s *itemService) GetItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.Item, error) {
|
||||
s.logger.Info("Getting item: ", id, " for organization: ", orgID)
|
||||
|
||||
item, err := s.itemRepo.GetByID(ctx, id, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get item: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func (s *itemService) GetItems(ctx context.Context, orgID uuid.UUID) ([]*models.Item, error) {
|
||||
s.logger.Info("Getting all items for organization: ", orgID)
|
||||
|
||||
items, err := s.itemRepo.GetByOrganization(ctx, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get items: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (s *itemService) UpdateItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateItemRequest) (*models.Item, error) {
|
||||
s.logger.Info("Updating item: ", id, " for organization: ", orgID)
|
||||
|
||||
// Сначала получаем существующий товар
|
||||
item, err := s.itemRepo.GetByID(ctx, id, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get item for update: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Обновляем поля
|
||||
item.Name = req.Name
|
||||
item.Description = req.Description
|
||||
item.Category = req.Category
|
||||
|
||||
if err := s.itemRepo.Update(ctx, item); err != nil {
|
||||
s.logger.Error("Failed to update item: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.logger.Info("Item updated successfully: ", item.ID)
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func (s *itemService) DeleteItem(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error {
|
||||
s.logger.Info("Deleting item: ", id, " for organization: ", orgID)
|
||||
|
||||
if err := s.itemRepo.Delete(ctx, id, orgID); err != nil {
|
||||
s.logger.Error("Failed to delete item: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
s.logger.Info("Item deleted successfully: ", id)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *itemService) SearchItems(ctx context.Context, orgID uuid.UUID, query string, category string) ([]*models.Item, error) {
|
||||
s.logger.Info("Searching items for organization: ", orgID, " query: ", query, " category: ", category)
|
||||
|
||||
items, err := s.itemRepo.Search(ctx, orgID, query, category)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to search items: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return items, nil
|
||||
}
|
||||
130
core-service/internal/service/location_service.go
Normal file
130
core-service/internal/service/location_service.go
Normal file
@@ -0,0 +1,130 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/repository"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type LocationService interface {
|
||||
CreateLocation(ctx context.Context, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error)
|
||||
GetLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error)
|
||||
GetLocations(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
UpdateLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error)
|
||||
DeleteLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error
|
||||
GetChildren(ctx context.Context, parentID uuid.UUID, orgID uuid.UUID) ([]*models.StorageLocation, error)
|
||||
}
|
||||
|
||||
type locationService struct {
|
||||
locationRepo repository.LocationRepository
|
||||
logger *logrus.Logger
|
||||
}
|
||||
|
||||
func NewLocationService(locationRepo repository.LocationRepository) LocationService {
|
||||
return &locationService{
|
||||
locationRepo: locationRepo,
|
||||
logger: logrus.New(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *locationService) CreateLocation(ctx context.Context, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error) {
|
||||
s.logger.Info("Creating location for organization: ", orgID)
|
||||
|
||||
location := &models.StorageLocation{
|
||||
ID: uuid.New(),
|
||||
OrganizationID: orgID,
|
||||
ParentID: req.ParentID,
|
||||
Name: req.Name,
|
||||
Address: req.Address,
|
||||
Type: req.Type,
|
||||
Coordinates: req.Coordinates,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
|
||||
if err := s.locationRepo.Create(ctx, location); err != nil {
|
||||
s.logger.Error("Failed to create location: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.logger.Info("Location created successfully: ", location.ID)
|
||||
return location, nil
|
||||
}
|
||||
|
||||
func (s *locationService) GetLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) (*models.StorageLocation, error) {
|
||||
s.logger.Info("Getting location: ", id, " for organization: ", orgID)
|
||||
|
||||
location, err := s.locationRepo.GetByID(ctx, id, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get location: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return location, nil
|
||||
}
|
||||
|
||||
func (s *locationService) GetLocations(ctx context.Context, orgID uuid.UUID) ([]*models.StorageLocation, error) {
|
||||
s.logger.Info("Getting all locations for organization: ", orgID)
|
||||
|
||||
locations, err := s.locationRepo.GetByOrganization(ctx, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get locations: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return locations, nil
|
||||
}
|
||||
|
||||
func (s *locationService) UpdateLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID, req *models.CreateLocationRequest) (*models.StorageLocation, error) {
|
||||
s.logger.Info("Updating location: ", id, " for organization: ", orgID)
|
||||
|
||||
// Сначала получаем существующую локацию
|
||||
location, err := s.locationRepo.GetByID(ctx, id, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get location for update: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Обновляем поля
|
||||
location.ParentID = req.ParentID
|
||||
location.Name = req.Name
|
||||
location.Address = req.Address
|
||||
location.Type = req.Type
|
||||
location.Coordinates = req.Coordinates
|
||||
|
||||
if err := s.locationRepo.Update(ctx, location); err != nil {
|
||||
s.logger.Error("Failed to update location: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.logger.Info("Location updated successfully: ", location.ID)
|
||||
return location, nil
|
||||
}
|
||||
|
||||
func (s *locationService) DeleteLocation(ctx context.Context, id uuid.UUID, orgID uuid.UUID) error {
|
||||
s.logger.Info("Deleting location: ", id, " for organization: ", orgID)
|
||||
|
||||
if err := s.locationRepo.Delete(ctx, id, orgID); err != nil {
|
||||
s.logger.Error("Failed to delete location: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
s.logger.Info("Location deleted successfully: ", id)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *locationService) GetChildren(ctx context.Context, parentID uuid.UUID, orgID uuid.UUID) ([]*models.StorageLocation, error) {
|
||||
s.logger.Info("Getting children for location: ", parentID, " in organization: ", orgID)
|
||||
|
||||
children, err := s.locationRepo.GetChildren(ctx, parentID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get children: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return children, nil
|
||||
}
|
||||
192
core-service/internal/service/operations_service.go
Normal file
192
core-service/internal/service/operations_service.go
Normal file
@@ -0,0 +1,192 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"erp-mvp/core-service/internal/models"
|
||||
"erp-mvp/core-service/internal/repository"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type OperationsService interface {
|
||||
PlaceItem(ctx context.Context, orgID uuid.UUID, req *models.PlaceItemRequest) (*models.ItemPlacement, error)
|
||||
MoveItem(ctx context.Context, placementID uuid.UUID, newLocationID uuid.UUID, orgID uuid.UUID) error
|
||||
GetItemPlacements(ctx context.Context, itemID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
GetLocationPlacements(ctx context.Context, locationID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error)
|
||||
UpdateQuantity(ctx context.Context, placementID uuid.UUID, quantity int, orgID uuid.UUID) error
|
||||
DeletePlacement(ctx context.Context, placementID uuid.UUID, orgID uuid.UUID) error
|
||||
Search(ctx context.Context, orgID uuid.UUID, req *models.SearchRequest) (*models.SearchResponse, error)
|
||||
}
|
||||
|
||||
type operationsService struct {
|
||||
operationsRepo repository.OperationsRepository
|
||||
itemRepo repository.ItemRepository
|
||||
locationRepo repository.LocationRepository
|
||||
logger *logrus.Logger
|
||||
}
|
||||
|
||||
func NewOperationsService(operationsRepo repository.OperationsRepository, itemRepo repository.ItemRepository, locationRepo repository.LocationRepository) OperationsService {
|
||||
return &operationsService{
|
||||
operationsRepo: operationsRepo,
|
||||
itemRepo: itemRepo,
|
||||
locationRepo: locationRepo,
|
||||
logger: logrus.New(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *operationsService) PlaceItem(ctx context.Context, orgID uuid.UUID, req *models.PlaceItemRequest) (*models.ItemPlacement, error) {
|
||||
s.logger.Info("Placing item: ", req.ItemID, " in location: ", req.LocationID, " for organization: ", orgID)
|
||||
|
||||
// Проверяем, что товар существует и принадлежит организации
|
||||
_, err := s.itemRepo.GetByID(ctx, req.ItemID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Item not found or not accessible: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Проверяем, что место хранения существует и принадлежит организации
|
||||
_, err = s.locationRepo.GetByID(ctx, req.LocationID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Location not found or not accessible: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
placement := &models.ItemPlacement{
|
||||
ID: uuid.New(),
|
||||
OrganizationID: orgID,
|
||||
ItemID: req.ItemID,
|
||||
LocationID: req.LocationID,
|
||||
Quantity: req.Quantity,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
|
||||
if err := s.operationsRepo.PlaceItem(ctx, placement); err != nil {
|
||||
s.logger.Error("Failed to place item: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.logger.Info("Item placed successfully: ", placement.ID)
|
||||
return placement, nil
|
||||
}
|
||||
|
||||
func (s *operationsService) MoveItem(ctx context.Context, placementID uuid.UUID, newLocationID uuid.UUID, orgID uuid.UUID) error {
|
||||
s.logger.Info("Moving item placement: ", placementID, " to location: ", newLocationID, " for organization: ", orgID)
|
||||
|
||||
// Проверяем, что размещение существует и принадлежит организации
|
||||
placement, err := s.operationsRepo.GetByID(ctx, placementID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Item placement not found or not accessible: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
// Проверяем, что новое место хранения существует и принадлежит организации
|
||||
_, err = s.locationRepo.GetByID(ctx, newLocationID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("New location not found or not accessible: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.operationsRepo.MoveItem(ctx, placementID, newLocationID, orgID); err != nil {
|
||||
s.logger.Error("Failed to move item: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
s.logger.Info("Item moved successfully from location: ", placement.LocationID, " to: ", newLocationID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *operationsService) GetItemPlacements(ctx context.Context, itemID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error) {
|
||||
s.logger.Info("Getting placements for item: ", itemID, " in organization: ", orgID)
|
||||
|
||||
// Проверяем, что товар существует и принадлежит организации
|
||||
_, err := s.itemRepo.GetByID(ctx, itemID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Item not found or not accessible: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
placements, err := s.operationsRepo.GetByItem(ctx, itemID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get item placements: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return placements, nil
|
||||
}
|
||||
|
||||
func (s *operationsService) GetLocationPlacements(ctx context.Context, locationID uuid.UUID, orgID uuid.UUID) ([]*models.ItemPlacement, error) {
|
||||
s.logger.Info("Getting placements for location: ", locationID, " in organization: ", orgID)
|
||||
|
||||
// Проверяем, что место хранения существует и принадлежит организации
|
||||
_, err := s.locationRepo.GetByID(ctx, locationID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Location not found or not accessible: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
placements, err := s.operationsRepo.GetByLocation(ctx, locationID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to get location placements: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return placements, nil
|
||||
}
|
||||
|
||||
func (s *operationsService) UpdateQuantity(ctx context.Context, placementID uuid.UUID, quantity int, orgID uuid.UUID) error {
|
||||
s.logger.Info("Updating quantity for placement: ", placementID, " to: ", quantity, " in organization: ", orgID)
|
||||
|
||||
// Проверяем, что размещение существует и принадлежит организации
|
||||
_, err := s.operationsRepo.GetByID(ctx, placementID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Item placement not found or not accessible: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.operationsRepo.UpdateQuantity(ctx, placementID, quantity, orgID); err != nil {
|
||||
s.logger.Error("Failed to update quantity: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
s.logger.Info("Quantity updated successfully for placement: ", placementID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *operationsService) DeletePlacement(ctx context.Context, placementID uuid.UUID, orgID uuid.UUID) error {
|
||||
s.logger.Info("Deleting placement: ", placementID, " for organization: ", orgID)
|
||||
|
||||
// Проверяем, что размещение существует и принадлежит организации
|
||||
_, err := s.operationsRepo.GetByID(ctx, placementID, orgID)
|
||||
if err != nil {
|
||||
s.logger.Error("Item placement not found or not accessible: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.operationsRepo.Delete(ctx, placementID, orgID); err != nil {
|
||||
s.logger.Error("Failed to delete placement: ", err)
|
||||
return err
|
||||
}
|
||||
|
||||
s.logger.Info("Placement deleted successfully: ", placementID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *operationsService) Search(ctx context.Context, orgID uuid.UUID, req *models.SearchRequest) (*models.SearchResponse, error) {
|
||||
s.logger.Info("Searching items with locations for organization: ", orgID, " query: ", req.Query)
|
||||
|
||||
results, err := s.operationsRepo.Search(ctx, orgID, req.Query, req.Category, req.Address)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to search items with locations: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
response := &models.SearchResponse{
|
||||
Items: results,
|
||||
TotalCount: len(results),
|
||||
}
|
||||
|
||||
return response, nil
|
||||
}
|
||||
BIN
core-service/main
Executable file
BIN
core-service/main
Executable file
Binary file not shown.
Reference in New Issue
Block a user