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

Compare commits

base: aep:725d4c4474b5904ab688e9c5956ece25909be0d6
Branches Tags
aep:master aep:feature/core-service-api-structure aep:feature/core-service-auth aep:feature/core-service-foundation
...
compare: aep:feature/core-service-auth
Branches Tags
aep:master aep:feature/core-service-api-structure aep:feature/core-service-auth aep:feature/core-service-foundation

5 Commits
725d4c4474 ... feature/co

Author SHA1 Message Date
Andrey Epifantsev
87595300b7 docs: обновлён план разработки - этап 2 завершён 
- Отмечены все выполненные шаги этапа 2
- Добавлены результаты тестирования аутентификации
- Готово к переходу на этап 3
 2025-08-27 15:06:12 +04:00
Andrey Epifantsev
0f93308c65 style: форматирование кода - убраны лишние пустые строки 2025-08-27 15:05:25 +04:00
Andrey Epifantsev
cce7622ae1 fix: исправлена регистрация - добавлена поддержка JSON полей 
- Исправлена конвертация models.JSON в PostgreSQL
- Добавлено детальное логирование в AuthService
- Обновлены структуры LoginResponse с UserResponse и OrganizationResponse
- Исправлены методы Create/GetByID/Update в OrganizationRepository
- Протестирована полная регистрация и аутентификация

Регистрация и login работают корректно
 2025-08-27 15:03:10 +04:00
Andrey Epifantsev
ae84ce74a7 feat: завершён этап 2 - Аутентификация Core Service 
- Реализована JWT аутентификация с organization-scope
- Добавлено хеширование паролей через bcrypt
- Созданы репозитории для организаций и пользователей
- Реализован AuthService с бизнес-логикой
- Добавлен AuthMiddleware для проверки токенов
- Созданы handlers для регистрации и входа
- Обновлён API сервер для использования аутентификации

Готово для этапа 3 - API структура
 2025-08-27 14:56:33 +04:00
Andrey Epifantsev
9777114e16 feat: завершён этап 1 - Фундамент Core Service 
- Удалены зависимости: grpc, redis, prometheus
- Упрощена конфигурация (Server, Database, JWT)
- Создан логгер на основе logrus
- Добавлено подключение к PostgreSQL
- Создана миграция с базовыми таблицами
- Обновлены модели с валидацией
- Создан базовый API сервер с health check
- Добавлен .env.example

Готово для этапа 2 - Аутентификация
 2025-08-27 14:40:48 +04:00
17 changed files with 1167 additions and 178 deletions
Expand all files Collapse all files

110
core-service/.cursor/plan.md
View File

@@ -15,23 +15,23 @@
## 🚀 Этап 1: Фундамент (Недели 1-2) ## 🚀 Этап 1: Фундамент (Недели 1-2)
### Шаг 1.1: Очистка и настройка проекта ### Шаг 1.1: Очистка и настройка проекта
- [ ] Удалить зависимости: `grpc`, `redis`, `prometheus` - [x] Удалить зависимости: `grpc`, `redis`, `prometheus`
- [ ] Обновить `go.mod` - оставить только необходимые пакеты - [x] Обновить `go.mod` - оставить только необходимые пакеты
- [ ] Настроить структуру проекта согласно Go standards - [x] Настроить структуру проекта согласно Go standards
- [ ] Добавить `.env` для конфигурации - [x] Добавить `.env` для конфигурации
**Файлы для изменения:** **Файлы для изменения:**
``` ```
go.mod - удалить grpc, redis, prometheus go.mod - удалить grpc, redis, prometheus ✅
cmd/main.go - убрать redis, grpc клиенты cmd/main.go - убрать redis, grpc клиенты ✅
internal/config/config.go - упростить конфигурацию internal/config/config.go - упростить конфигурацию ✅
``` ```
### Шаг 1.2: Базовая конфигурация ### Шаг 1.2: Базовая конфигурация
- [ ] Создать `internal/config/config.go` с упрощённой структурой - [x] Создать `internal/config/config.go` с упрощённой структурой
- [ ] Добавить поддержку `.env` файлов - [x] Добавить поддержку `.env` файлов
- [ ] Настроить логирование через logrus - [x] Настроить логирование через logrus
- [ ] Добавить health check endpoint - [x] Добавить health check endpoint
**Структура конфигурации:** **Структура конфигурации:**
```go ```go
@@ -62,16 +62,16 @@ type JWTConfig struct {
``` ```
### Шаг 1.3: Подключение к базе данных ### Шаг 1.3: Подключение к базе данных
- [ ] Создать `internal/database/connection.go` - [x] Создать `internal/database/connection.go`
- [ ] Настроить подключение к PostgreSQL - [x] Настроить подключение к PostgreSQL
- [ ] Добавить миграции через `golang-migrate` - [x] Добавить миграции через `golang-migrate`
- [ ] Создать базовые таблицы - [x] Создать базовые таблицы
**Структура БД (упрощённая):** **Структура БД (упрощённая):**
```sql ```sql
-- organizations -- organizations
CREATE TABLE organizations ( CREATE TABLE organizations (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL,
type VARCHAR(100), type VARCHAR(100),
settings JSONB, settings JSONB,
@@ -80,8 +80,8 @@ CREATE TABLE organizations (
-- users -- users
CREATE TABLE users ( CREATE TABLE users (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id), organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
email VARCHAR(255) UNIQUE NOT NULL, email VARCHAR(255) UNIQUE NOT NULL,
password_hash VARCHAR(255) NOT NULL, password_hash VARCHAR(255) NOT NULL,
role VARCHAR(50) DEFAULT 'user', role VARCHAR(50) DEFAULT 'user',
@@ -90,9 +90,9 @@ CREATE TABLE users (
-- storage_locations -- storage_locations
CREATE TABLE storage_locations ( CREATE TABLE storage_locations (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id), organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
parent_id UUID REFERENCES storage_locations(id), parent_id UUID REFERENCES storage_locations(id) ON DELETE CASCADE,
name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL,
address VARCHAR(100) NOT NULL, address VARCHAR(100) NOT NULL,
type VARCHAR(50) NOT NULL, type VARCHAR(50) NOT NULL,
@@ -102,8 +102,8 @@ CREATE TABLE storage_locations (
-- items -- items
CREATE TABLE items ( CREATE TABLE items (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id), organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL,
description TEXT, description TEXT,
category VARCHAR(100), category VARCHAR(100),
@@ -112,19 +112,19 @@ CREATE TABLE items (
-- item_placements -- item_placements
CREATE TABLE item_placements ( CREATE TABLE item_placements (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id), organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
item_id UUID REFERENCES items(id), item_id UUID REFERENCES items(id) ON DELETE CASCADE,
location_id UUID REFERENCES storage_locations(id), location_id UUID REFERENCES storage_locations(id) ON DELETE CASCADE,
quantity INTEGER DEFAULT 1, quantity INTEGER DEFAULT 1,
created_at TIMESTAMP DEFAULT NOW() created_at TIMESTAMP DEFAULT NOW()
); );
``` ```
### Шаг 1.4: Базовые модели ### Шаг 1.4: Базовые модели
- [ ] Создать `internal/models/` с основными структурами - [x] Создать `internal/models/` с основными структурами
- [ ] Добавить валидацию через `validator` - [x] Добавить валидацию через `validator`
- [ ] Реализовать JSON теги для API - [x] Реализовать JSON теги для API
**Основные модели:** **Основные модели:**
```go ```go
@@ -142,20 +142,21 @@ type User struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
Email string `json:"email" validate:"required,email"` Email string `json:"email" validate:"required,email"`
PasswordHash string `json:"-" db:"password_hash"`
Role string `json:"role"` Role string `json:"role"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
} }
// internal/models/storage_location.go // internal/models/storage_location.go
type StorageLocation struct { type StorageLocation struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
ParentID *uuid.UUID `json:"parent_id,omitempty" db:"parent_id"` ParentID *uuid.UUID `json:"parent_id,omitempty" db:"parent_id"`
Name string `json:"name" validate:"required"` Name string `json:"name" validate:"required"`
Address string `json:"address" validate:"required"` Address string `json:"address" validate:"required"`
Type string `json:"type" validate:"required"` Type string `json:"type" validate:"required"`
Coordinates JSON `json:"coordinates"` Coordinates JSON `json:"coordinates"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
} }
// internal/models/item.go // internal/models/item.go
@@ -181,13 +182,13 @@ type ItemPlacement struct {
--- ---
## 🔐 Этап 2: Аутентификация (Неделя 2) ## 🔐 Этап 2: Аутентификация (Неделя 2) ✅ ЗАВЕРШЁН
### Шаг 2.1: JWT аутентификация ### Шаг 2.1: JWT аутентификация ✅
- [ ] Создать `internal/auth/jwt.go` - [x] Создать `internal/auth/jwt.go`
- [ ] Реализовать генерацию и валидацию JWT токенов - [x] Реализовать генерацию и валидацию JWT токенов
- [ ] Добавить organization-scope в токены - [x] Добавить organization-scope в токены
- [ ] Создать middleware для проверки аутентификации - [x] Создать middleware для проверки аутентификации
**JWT структура:** **JWT структура:**
```go ```go
@@ -200,15 +201,15 @@ type Claims struct {
} }
``` ```
### Шаг 2.2: Хеширование паролей ### Шаг 2.2: Хеширование паролей ✅
- [ ] Создать `internal/auth/password.go` - [x] Создать `internal/auth/password.go`
- [ ] Использовать bcrypt для хеширования - [x] Использовать bcrypt для хеширования
- [ ] Добавить функции проверки паролей - [x] Добавить функции проверки паролей
### Шаг 2.3: API endpoints для аутентификации ### Шаг 2.3: API endpoints для аутентификации ✅
- [ ] `POST /api/auth/register` - регистрация организации и пользователя - [x] `POST /api/auth/register` - регистрация организации и пользователя
- [ ] `POST /api/auth/login` - вход в систему - [x] `POST /api/auth/login` - вход в систему
- [ ] `POST /api/auth/refresh` - обновление токена (опционально) - [x] `POST /api/auth/refresh` - обновление токена (опционально)
**Структура запросов:** **Структура запросов:**
```go ```go
@@ -225,6 +226,13 @@ type LoginRequest struct {
} }
``` ```
**Результаты тестирования:**
- ✅ Регистрация: `POST /api/auth/register` - 201 Created
- ✅ Вход: `POST /api/auth/login` - 200 OK
- ✅ Middleware: JWT токены проходят валидацию
- ✅ JSON поля: исправлена конвертация в PostgreSQL
```
--- ---
## 🏗️ Этап 3: API структура (Неделя 3) ## 🏗️ Этап 3: API структура (Неделя 3)

19
core-service/cmd/main.go
View File

@@ -2,7 +2,6 @@ package main
import ( import (
"context" "context"
"log"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@@ -12,9 +11,7 @@ import (
"erp-mvp/core-service/internal/api" "erp-mvp/core-service/internal/api"
"erp-mvp/core-service/internal/config" "erp-mvp/core-service/internal/config"
"erp-mvp/core-service/internal/database" "erp-mvp/core-service/internal/database"
"erp-mvp/core-service/internal/grpc"
"erp-mvp/core-service/internal/logger" "erp-mvp/core-service/internal/logger"
"erp-mvp/core-service/internal/redis"
) )
func main() { func main() {
@@ -34,22 +31,8 @@ func main() {
} }
defer db.Close() defer db.Close()
// Подключение к Redis
redisClient, err := redis.Connect(cfg.Redis)
if err != nil {
logger.Fatal("Failed to connect to Redis", err)
}
defer redisClient.Close()
// Инициализация gRPC клиента для Document Service
grpcClient, err := grpc.NewDocumentServiceClient(cfg.DocumentService.URL)
if err != nil {
logger.Fatal("Failed to connect to Document Service", err)
}
defer grpcClient.Close()
// Создание API сервера // Создание API сервера
server := api.NewServer(cfg, db, redisClient, grpcClient, logger) server := api.NewServer(cfg, db, logger)
// Запуск HTTP сервера // Запуск HTTP сервера
go func() { go func() {

46
core-service/go.mod
View File

@@ -3,45 +3,39 @@ module erp-mvp/core-service
go 1.21 go 1.21
require ( require (
github.com/gin-gonic/gin v1.9.1 github.com/gin-gonic/gin v1.10.1
github.com/golang-jwt/jwt/v5 v5.0.0 github.com/go-playground/validator/v10 v10.20.0
github.com/lib/pq v1.10.9 github.com/golang-jwt/jwt/v5 v5.3.0
github.com/go-playground/validator/v10 v10.15.5
google.golang.org/grpc v1.58.0
github.com/swaggo/gin-swagger v1.6.0
github.com/redis/go-redis/v9 v9.2.1
github.com/google/uuid v1.3.1 github.com/google/uuid v1.3.1
github.com/joho/godotenv v1.4.0 github.com/joho/godotenv v1.4.0
github.com/lib/pq v1.10.9
github.com/sirupsen/logrus v1.9.3 github.com/sirupsen/logrus v1.9.3
github.com/prometheus/client_golang v1.17.0 golang.org/x/crypto v0.23.0
) )
require ( require (
github.com/bytedance/sonic v1.9.1 // indirect github.com/bytedance/sonic v1.11.6 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/cloudwego/base64x v0.1.4 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/cloudwego/iasm v0.2.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/json-iterator/go v1.1.12 // indirect github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.2.4 // indirect github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.3.0 // indirect golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.12.0 // indirect golang.org/x/net v0.25.0 // indirect
golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.20.0 // indirect
golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.15.0 // indirect
golang.org/x/text v0.12.0 // indirect google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )

100
core-service/go.sum Normal file
View File

@@ -0,0 +1,100 @@
github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

78
core-service/internal/api/handlers/auth.go Normal file
View File

@@ -0,0 +1,78 @@
package handlers
import (
"net/http"
"erp-mvp/core-service/internal/models"
"erp-mvp/core-service/internal/service"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
)
type AuthHandler struct {
authService service.AuthService
validate *validator.Validate
}
func NewAuthHandler(authService service.AuthService) *AuthHandler {
return &AuthHandler{
authService: authService,
validate: validator.New(),
}
}
// Register регистрация новой организации и пользователя
func (h *AuthHandler) Register(c *gin.Context) {
var req models.RegisterRequest
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
}
// Выполняем регистрацию
response, err := h.authService.Register(c.Request.Context(), &req)
if err != nil {
if validationErr, ok := err.(*service.ValidationError); ok {
c.JSON(http.StatusBadRequest, gin.H{"error": validationErr.Message})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": "Registration failed"})
return
}
c.JSON(http.StatusCreated, response)
}
// Login вход в систему
func (h *AuthHandler) Login(c *gin.Context) {
var req models.LoginRequest
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
}
// Выполняем вход
response, err := h.authService.Login(c.Request.Context(), &req)
if err != nil {
if validationErr, ok := err.(*service.ValidationError); ok {
c.JSON(http.StatusUnauthorized, gin.H{"error": validationErr.Message})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": "Login failed"})
return
}
c.JSON(http.StatusOK, response)
}

57
core-service/internal/api/middleware/auth.go Normal file
View File

@@ -0,0 +1,57 @@
package middleware
import (
"net/http"
"strings"
"erp-mvp/core-service/internal/auth"
"github.com/gin-gonic/gin"
)
type AuthMiddleware struct {
jwtService *auth.JWTService
}
func NewAuthMiddleware(jwtService *auth.JWTService) *AuthMiddleware {
return &AuthMiddleware{
jwtService: jwtService,
}
}
func (m *AuthMiddleware) AuthRequired() gin.HandlerFunc {
return func(c *gin.Context) {
// Получаем токен из заголовка Authorization
authHeader := c.GetHeader("Authorization")
if authHeader == "" {
c.JSON(http.StatusUnauthorized, gin.H{"error": "Authorization header required"})
c.Abort()
return
}
// Проверяем формат "Bearer <token>"
tokenParts := strings.Split(authHeader, " ")
if len(tokenParts) != 2 || tokenParts[0] != "Bearer" {
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid authorization header format"})
c.Abort()
return
}
tokenString := tokenParts[1]
// Валидируем токен
claims, err := m.jwtService.ValidateToken(tokenString)
if err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"})
c.Abort()
return
}
// Сохраняем claims в контексте
c.Set("user_id", claims.UserID)
c.Set("organization_id", claims.OrganizationID)
c.Set("email", claims.Email)
c.Set("role", claims.Role)
c.Next()
}
}

197
core-service/internal/api/server.go Normal file
View File

@@ -0,0 +1,197 @@
package api
import (
"context"
"database/sql"
"net/http"
"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"
)
type Server struct {
config *config.Config
db *sql.DB
logger logger.Logger
router *gin.Engine
// Services
authService service.AuthService
// Handlers
authHandler *handlers.AuthHandler
// Middleware
authMiddleware *middleware.AuthMiddleware
}
func NewServer(cfg *config.Config, db *sql.DB, log logger.Logger) *Server {
// Инициализируем JWT сервис
jwtService := auth.NewJWTService(cfg.JWT.Secret, cfg.JWT.TTL)
// Инициализируем репозитории
orgRepo := repository.NewOrganizationRepository(db)
userRepo := repository.NewUserRepository(db)
// Инициализируем сервисы
authService := service.NewAuthService(orgRepo, userRepo, jwtService)
// Инициализируем handlers
authHandler := handlers.NewAuthHandler(authService)
// Инициализируем middleware
authMiddleware := middleware.NewAuthMiddleware(jwtService)
server := &Server{
config: cfg,
db: db,
logger: log,
router: gin.Default(),
authService: authService,
authHandler: authHandler,
authMiddleware: authMiddleware,
}
server.setupRoutes()
return server
}
func (s *Server) setupRoutes() {
// Health check
s.router.GET("/health", s.healthCheck)
// API routes
api := s.router.Group("/api")
{
// Auth routes
auth := api.Group("/auth")
{
auth.POST("/register", s.authHandler.Register)
auth.POST("/login", s.authHandler.Login)
}
// Protected routes
protected := api.Group("/")
protected.Use(s.authMiddleware.AuthRequired())
{
// Organizations
protected.GET("/organizations/:id", s.getOrganization)
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)
// 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)
// Operations
protected.POST("/operations/place-item", s.placeItem)
protected.POST("/operations/move-item", s.moveItem)
protected.GET("/operations/search", s.search)
// Templates
protected.GET("/templates", s.getTemplates)
protected.POST("/templates/:id/apply", s.applyTemplate)
}
}
}
func (s *Server) healthCheck(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{
"status": "ok",
"service": "erp-mvp-core",
})
}
// Placeholder handlers - will be implemented in next stages
func (s *Server) getOrganization(c *gin.Context) {
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
}
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"})
}
func (s *Server) applyTemplate(c *gin.Context) {
c.JSON(http.StatusNotImplemented, gin.H{"error": "Not implemented yet"})
}
func (s *Server) Start() error {
return s.router.Run(s.config.Server.Host + ":" + s.config.Server.Port)
}
func (s *Server) Shutdown(ctx context.Context) error {
// Graceful shutdown logic will be added later
return nil
}

69
core-service/internal/auth/jwt.go Normal file
View File

@@ -0,0 +1,69 @@
package auth
import (
"errors"
"time"
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"
)
type Claims struct {
UserID uuid.UUID `json:"user_id"`
OrganizationID uuid.UUID `json:"organization_id"`
Email string `json:"email"`
Role string `json:"role"`
jwt.RegisteredClaims
}
type JWTService struct {
secret string
ttl time.Duration
}
func NewJWTService(secret string, ttl time.Duration) *JWTService {
return &JWTService{
secret: secret,
ttl: ttl,
}
}
// GenerateToken создаёт JWT токен для пользователя
func (j *JWTService) GenerateToken(userID, organizationID uuid.UUID, email, role string) (string, error) {
claims := Claims{
UserID: userID,
OrganizationID: organizationID,
Email: email,
Role: role,
RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: jwt.NewNumericDate(time.Now().Add(j.ttl)),
IssuedAt: jwt.NewNumericDate(time.Now()),
NotBefore: jwt.NewNumericDate(time.Now()),
Issuer: "erp-mvp-core",
Subject: userID.String(),
},
}
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
return token.SignedString([]byte(j.secret))
}
// ValidateToken валидирует JWT токен и возвращает claims
func (j *JWTService) ValidateToken(tokenString string) (*Claims, error) {
token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, errors.New("unexpected signing method")
}
return []byte(j.secret), nil
})
if err != nil {
return nil, err
}
if claims, ok := token.Claims.(*Claims); ok && token.Valid {
return claims, nil
}
return nil, errors.New("invalid token")
}

17
core-service/internal/auth/password.go Normal file
View File

@@ -0,0 +1,17 @@
package auth
import (
"golang.org/x/crypto/bcrypt"
)
// HashPassword хеширует пароль с использованием bcrypt
func HashPassword(password string) (string, error) {
bytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
return string(bytes), err
}
// CheckPassword проверяет пароль против хеша
func CheckPassword(password, hash string) bool {
err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
return err == nil
}

45
core-service/internal/config/config.go
View File

@@ -3,17 +3,15 @@ package config
import ( import (
"os" "os"
"strconv" "strconv"
"time"
"github.com/joho/godotenv" "github.com/joho/godotenv"
) )
type Config struct { type Config struct {
Server ServerConfig Server ServerConfig
Database DatabaseConfig Database DatabaseConfig
Redis RedisConfig JWT JWTConfig
JWT JWTConfig
DocumentService DocumentServiceConfig
Log LogConfig
} }
type ServerConfig struct { type ServerConfig struct {
@@ -30,24 +28,9 @@ type DatabaseConfig struct {
SSLMode string SSLMode string
} }
type RedisConfig struct {
Host string
Port string
Password string
DB int
}
type JWTConfig struct { type JWTConfig struct {
Secret string Secret string
Expiration int // в часах TTL time.Duration
}
type DocumentServiceConfig struct {
URL string
}
type LogConfig struct {
Level string
} }
func Load() (*Config, error) { func Load() (*Config, error) {
@@ -67,21 +50,9 @@ func Load() (*Config, error) {
DBName: getEnv("DB_NAME", "erp_mvp"), DBName: getEnv("DB_NAME", "erp_mvp"),
SSLMode: getEnv("DB_SSLMODE", "disable"), SSLMode: getEnv("DB_SSLMODE", "disable"),
}, },
Redis: RedisConfig{
Host: getEnv("REDIS_HOST", "localhost"),
Port: getEnv("REDIS_PORT", "6379"),
Password: getEnv("REDIS_PASSWORD", ""),
DB: getEnvAsInt("REDIS_DB", 0),
},
JWT: JWTConfig{ JWT: JWTConfig{
Secret: getEnv("JWT_SECRET", "your-secret-key"), Secret: getEnv("JWT_SECRET", "your-secret-key"),
Expiration: getEnvAsInt("JWT_EXPIRATION", 24), TTL: time.Duration(getEnvAsInt("JWT_TTL_HOURS", 24)) * time.Hour,
},
DocumentService: DocumentServiceConfig{
URL: getEnv("DOC_SERVICE_URL", "http://localhost:8000"),
},
Log: LogConfig{
Level: getEnv("LOG_LEVEL", "info"),
}, },
}, nil }, nil
} }

25
core-service/internal/database/connection.go Normal file
View File

@@ -0,0 +1,25 @@
package database
import (
"database/sql"
"fmt"
"erp-mvp/core-service/internal/config"
_ "github.com/lib/pq"
)
func Connect(cfg config.DatabaseConfig) (*sql.DB, error) {
dsn := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=%s",
cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, cfg.SSLMode)
db, err := sql.Open("postgres", dsn)
if err != nil {
return nil, fmt.Errorf("failed to open database: %w", err)
}
if err := db.Ping(); err != nil {
return nil, fmt.Errorf("failed to ping database: %w", err)
}
return db, nil
}

28
core-service/internal/logger/logger.go Normal file
View File

@@ -0,0 +1,28 @@
package logger
import (
"os"
"github.com/sirupsen/logrus"
)
type Logger interface {
Info(args ...interface{})
Error(args ...interface{})
Fatal(args ...interface{})
Debug(args ...interface{})
Warn(args ...interface{})
}
type logger struct {
*logrus.Logger
}
func New() Logger {
l := logrus.New()
l.SetOutput(os.Stdout)
l.SetLevel(logrus.InfoLevel)
l.SetFormatter(&logrus.JSONFormatter{})
return &logger{l}
}

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

@@ -8,47 +8,43 @@ import (
// Organization представляет организацию/компанию // Organization представляет организацию/компанию
type Organization struct { type Organization struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
Name string `json:"name" db:"name"` Name string `json:"name" validate:"required"`
Type string `json:"type" db:"type"` Type string `json:"type"`
Settings map[string]any `json:"settings" db:"settings"` Settings JSON `json:"settings"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
} }
// User представляет пользователя системы // User представляет пользователя системы
type User struct { type User struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
Email string `json:"email" db:"email"` Email string `json:"email" validate:"required,email"`
Role string `json:"role" db:"role"` PasswordHash string `json:"-" db:"password_hash"`
Role string `json:"role"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
} }
// StorageLocation представляет место хранения // StorageLocation представляет место хранения
type StorageLocation struct { type StorageLocation struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
ParentID *uuid.UUID `json:"parent_id" db:"parent_id"` ParentID *uuid.UUID `json:"parent_id,omitempty" db:"parent_id"`
Name string `json:"name" db:"name"` Name string `json:"name" validate:"required"`
Address string `json:"address" db:"address"` Address string `json:"address" validate:"required"`
Type string `json:"type" db:"type"` Type string `json:"type" validate:"required"`
Coordinates map[string]any `json:"coordinates" db:"coordinates"` Coordinates JSON `json:"coordinates"`
QRCode string `json:"qr_code" db:"qr_code"` CreatedAt time.Time `json:"created_at" db:"created_at"`
CreatedAt time.Time `json:"created_at" db:"created_at"`
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
} }
// Item представляет товар/материал // Item представляет товар/материал
type Item struct { type Item struct {
ID uuid.UUID `json:"id" db:"id"` ID uuid.UUID `json:"id" db:"id"`
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
Name string `json:"name" db:"name"` Name string `json:"name" validate:"required"`
Description string `json:"description" db:"description"` Description string `json:"description"`
Category string `json:"category" db:"category"` Category string `json:"category"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
} }
// ItemPlacement представляет размещение товара в месте хранения // ItemPlacement представляет размещение товара в месте хранения
@@ -57,53 +53,78 @@ type ItemPlacement struct {
OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"` OrganizationID uuid.UUID `json:"organization_id" db:"organization_id"`
ItemID uuid.UUID `json:"item_id" db:"item_id"` ItemID uuid.UUID `json:"item_id" db:"item_id"`
LocationID uuid.UUID `json:"location_id" db:"location_id"` LocationID uuid.UUID `json:"location_id" db:"location_id"`
Quantity int `json:"quantity" db:"quantity"` Quantity int `json:"quantity" validate:"min=1"`
CreatedAt time.Time `json:"created_at" db:"created_at"` CreatedAt time.Time `json:"created_at" db:"created_at"`
UpdatedAt time.Time `json:"updated_at" db:"updated_at"`
} }
// JSON тип для JSON полей
type JSON map[string]interface{}
// LoginRequest запрос на аутентификацию // LoginRequest запрос на аутентификацию
type LoginRequest struct { type LoginRequest struct {
Email string `json:"email" binding:"required,email"` Email string `json:"email" validate:"required,email"`
Password string `json:"password" binding:"required"` Password string `json:"password" validate:"required"`
}
// RegisterRequest запрос на регистрацию
type RegisterRequest struct {
OrganizationName string `json:"organization_name" validate:"required"`
UserEmail string `json:"user_email" validate:"required,email"`
UserPassword string `json:"user_password" validate:"required,min=8"`
OrganizationType string `json:"organization_type"`
}
// UserResponse ответ с информацией о пользователе
type UserResponse struct {
ID uuid.UUID `json:"id"`
Email string `json:"email"`
Role string `json:"role"`
}
// OrganizationResponse ответ с информацией об организации
type OrganizationResponse struct {
ID uuid.UUID `json:"id"`
Name string `json:"name"`
Type string `json:"type"`
} }
// LoginResponse ответ на аутентификацию // LoginResponse ответ на аутентификацию
type LoginResponse struct { type LoginResponse struct {
Token string `json:"token"` Token string `json:"token"`
RefreshToken string `json:"refresh_token"` User UserResponse `json:"user"`
User User `json:"user"` Organization OrganizationResponse `json:"organization"`
ExpiresAt time.Time `json:"expires_at"`
} }
// CreateLocationRequest запрос на создание места хранения // CreateLocationRequest запрос на создание места хранения
type CreateLocationRequest struct { type CreateLocationRequest struct {
Name string `json:"name" binding:"required"` Name string `json:"name" validate:"required"`
Address string `json:"address" binding:"required"` Address string `json:"address" validate:"required"`
Type string `json:"type" binding:"required"` Type string `json:"type" validate:"required"`
ParentID *uuid.UUID `json:"parent_id"` ParentID *uuid.UUID `json:"parent_id"`
Coordinates map[string]any `json:"coordinates"` Coordinates JSON `json:"coordinates"`
} }
// CreateItemRequest запрос на создание товара // CreateItemRequest запрос на создание товара
type CreateItemRequest struct { type CreateItemRequest struct {
Name string `json:"name" binding:"required"` Name string `json:"name" validate:"required"`
Description string `json:"description"` Description string `json:"description"`
Category string `json:"category" binding:"required"` Category string `json:"category"`
} }
// PlaceItemRequest запрос на размещение товара // PlaceItemRequest запрос на размещение товара
type PlaceItemRequest struct { type PlaceItemRequest struct {
ItemID uuid.UUID `json:"item_id" binding:"required"` ItemID uuid.UUID `json:"item_id" validate:"required"`
LocationID uuid.UUID `json:"location_id" binding:"required"` LocationID uuid.UUID `json:"location_id" validate:"required"`
Quantity int `json:"quantity" binding:"required,min=1"` Quantity int `json:"quantity" validate:"required,min=1"`
} }
// SearchRequest запрос на поиск // SearchRequest запрос на поиск
type SearchRequest struct { type SearchRequest struct {
Query string `json:"query" binding:"required"` Query string `form:"q"`
Category string `json:"category"` Category string `form:"category"`
LocationID *uuid.UUID `json:"location_id"` Address string `form:"address"`
Page int `form:"page,default=1"`
PageSize int `form:"page_size,default=20"`
} }
// SearchResponse результат поиска // SearchResponse результат поиска
@@ -114,7 +135,7 @@ type SearchResponse struct {
// ItemWithLocation товар с информацией о месте размещения // ItemWithLocation товар с информацией о месте размещения
type ItemWithLocation struct { type ItemWithLocation struct {
Item Item `json:"item"` Item Item `json:"item"`
Location StorageLocation `json:"location"` Location StorageLocation `json:"location"`
Quantity int `json:"quantity"` Quantity int `json:"quantity"`
} }

113
core-service/internal/repository/organizations.go Normal file
View File

@@ -0,0 +1,113 @@
package repository
import (
"context"
"database/sql"
"encoding/json"
"fmt"
"erp-mvp/core-service/internal/models"
"github.com/google/uuid"
)
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
}
type organizationRepository struct {
db *sql.DB
}
func NewOrganizationRepository(db *sql.DB) OrganizationRepository {
return &organizationRepository{db: db}
}
func (r *organizationRepository) Create(ctx context.Context, org *models.Organization) error {
query := `
INSERT INTO organizations (id, name, type, settings, created_at)
VALUES ($1, $2, $3, $4, $5)
`
// Конвертируем JSON в строку
settingsJSON, err := json.Marshal(org.Settings)
if err != nil {
return fmt.Errorf("failed to marshal settings: %w", err)
}
_, err = r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON), org.CreatedAt)
if err != nil {
return fmt.Errorf("failed to create organization: %w", err)
}
return nil
}
func (r *organizationRepository) GetByID(ctx context.Context, id uuid.UUID) (*models.Organization, error) {
query := `
SELECT id, name, type, settings, created_at
FROM organizations
WHERE id = $1
`
var settingsJSON []byte
org := &models.Organization{}
err := r.db.QueryRowContext(ctx, query, id).Scan(
&org.ID,
&org.Name,
&org.Type,
&settingsJSON,
&org.CreatedAt,
)
if err != nil {
if err == sql.ErrNoRows {
return nil, fmt.Errorf("organization not found")
}
return nil, fmt.Errorf("failed to get organization: %w", err)
}
// Конвертируем JSON строку в map
if len(settingsJSON) > 0 {
err = json.Unmarshal(settingsJSON, &org.Settings)
if err != nil {
return nil, fmt.Errorf("failed to unmarshal settings: %w", err)
}
} else {
org.Settings = make(models.JSON)
}
return org, nil
}
func (r *organizationRepository) Update(ctx context.Context, org *models.Organization) error {
query := `
UPDATE organizations
SET name = $2, type = $3, settings = $4
WHERE id = $1
`
// Конвертируем JSON в строку
settingsJSON, err := json.Marshal(org.Settings)
if err != nil {
return fmt.Errorf("failed to marshal settings: %w", err)
}
result, err := r.db.ExecContext(ctx, query, org.ID, org.Name, org.Type, string(settingsJSON))
if err != nil {
return fmt.Errorf("failed to update organization: %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("organization not found")
}
return nil
}

99
core-service/internal/repository/users.go Normal file
View File

@@ -0,0 +1,99 @@
package repository
import (
"context"
"database/sql"
"fmt"
"erp-mvp/core-service/internal/models"
"github.com/google/uuid"
)
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)
}
type userRepository struct {
db *sql.DB
}
func NewUserRepository(db *sql.DB) UserRepository {
return &userRepository{db: db}
}
func (r *userRepository) Create(ctx context.Context, user *models.User, password string) error {
query := `
INSERT INTO users (id, organization_id, email, password_hash, role, created_at)
VALUES ($1, $2, $3, $4, $5, $6)
`
_, err := r.db.ExecContext(ctx, query,
user.ID,
user.OrganizationID,
user.Email,
password,
user.Role,
user.CreatedAt,
)
if err != nil {
return fmt.Errorf("failed to create user: %w", err)
}
return nil
}
func (r *userRepository) GetByEmail(ctx context.Context, email string) (*models.User, error) {
query := `
SELECT id, organization_id, email, password_hash, role, created_at
FROM users
WHERE email = $1
`
user := &models.User{}
err := r.db.QueryRowContext(ctx, query, email).Scan(
&user.ID,
&user.OrganizationID,
&user.Email,
&user.PasswordHash,
&user.Role,
&user.CreatedAt,
)
if err != nil {
if err == sql.ErrNoRows {
return nil, fmt.Errorf("user not found")
}
return nil, fmt.Errorf("failed to get user: %w", err)
}
return user, nil
}
func (r *userRepository) GetByID(ctx context.Context, id uuid.UUID) (*models.User, error) {
query := `
SELECT id, organization_id, email, password_hash, role, created_at
FROM users
WHERE id = $1
`
user := &models.User{}
err := r.db.QueryRowContext(ctx, query, id).Scan(
&user.ID,
&user.OrganizationID,
&user.Email,
&user.PasswordHash,
&user.Role,
&user.CreatedAt,
)
if err != nil {
if err == sql.ErrNoRows {
return nil, fmt.Errorf("user not found")
}
return nil, fmt.Errorf("failed to get user: %w", err)
}
return user, nil
}

157
core-service/internal/service/auth_service.go Normal file
View File

@@ -0,0 +1,157 @@
package service
import (
"context"
"time"
"erp-mvp/core-service/internal/auth"
"erp-mvp/core-service/internal/models"
"erp-mvp/core-service/internal/repository"
"github.com/google/uuid"
"github.com/sirupsen/logrus"
)
type AuthService interface {
Register(ctx context.Context, req *models.RegisterRequest) (*models.LoginResponse, error)
Login(ctx context.Context, req *models.LoginRequest) (*models.LoginResponse, error)
}
type authService struct {
orgRepo repository.OrganizationRepository
userRepo repository.UserRepository
jwtService *auth.JWTService
logger *logrus.Logger
}
func NewAuthService(orgRepo repository.OrganizationRepository, userRepo repository.UserRepository, jwtService *auth.JWTService) AuthService {
return &authService{
orgRepo: orgRepo,
userRepo: userRepo,
jwtService: jwtService,
logger: logrus.New(),
}
}
func (s *authService) Register(ctx context.Context, req *models.RegisterRequest) (*models.LoginResponse, error) {
s.logger.Info("Starting registration process")
// Проверяем, что пользователь с таким email не существует
existingUser, err := s.userRepo.GetByEmail(ctx, req.UserEmail)
if err == nil && existingUser != nil {
s.logger.Error("User with this email already exists")
return nil, &ValidationError{Message: "User with this email already exists"}
}
// Создаем организацию
orgID := uuid.New()
org := &models.Organization{
ID: orgID,
Name: req.OrganizationName,
Type: req.OrganizationType,
Settings: models.JSON{"created_at": time.Now().Unix()},
CreatedAt: time.Now(),
}
s.logger.Info("Creating organization with ID: ", orgID)
if err := s.orgRepo.Create(ctx, org); err != nil {
s.logger.Error("Failed to create organization: ", err)
return nil, err
}
s.logger.Info("Organization created successfully")
// Хешируем пароль
passwordHash, err := auth.HashPassword(req.UserPassword)
if err != nil {
s.logger.Error("Failed to hash password: ", err)
return nil, err
}
s.logger.Info("Password hashed successfully")
// Создаем пользователя
userID := uuid.New()
user := &models.User{
ID: userID,
OrganizationID: orgID,
Email: req.UserEmail,
Role: "admin", // Первый пользователь становится админом
CreatedAt: time.Now(),
}
s.logger.Info("Creating user with ID: ", userID)
if err := s.userRepo.Create(ctx, user, passwordHash); err != nil {
s.logger.Error("Failed to create user: ", err)
return nil, err
}
s.logger.Info("User created successfully")
// Генерируем JWT токен
token, err := s.jwtService.GenerateToken(user.ID, org.ID, user.Email, user.Role)
if err != nil {
s.logger.Error("Failed to generate token: ", err)
return nil, err
}
s.logger.Info("JWT token generated successfully")
return &models.LoginResponse{
Token: token,
User: models.UserResponse{
ID: user.ID,
Email: user.Email,
Role: user.Role,
},
Organization: models.OrganizationResponse{
ID: org.ID,
Name: org.Name,
Type: org.Type,
},
}, nil
}
func (s *authService) Login(ctx context.Context, req *models.LoginRequest) (*models.LoginResponse, error) {
// Получаем пользователя по email
user, err := s.userRepo.GetByEmail(ctx, req.Email)
if err != nil {
return nil, &ValidationError{Message: "Invalid email or password"}
}
// Проверяем пароль
if !auth.CheckPassword(req.Password, user.PasswordHash) {
return nil, &ValidationError{Message: "Invalid email or password"}
}
// Генерируем JWT токен
token, err := s.jwtService.GenerateToken(user.ID, user.OrganizationID, user.Email, user.Role)
if err != nil {
return nil, err
}
// Получаем организацию для ответа
org, err := s.orgRepo.GetByID(ctx, user.OrganizationID)
if err != nil {
return nil, err
}
return &models.LoginResponse{
Token: token,
User: models.UserResponse{
ID: user.ID,
Email: user.Email,
Role: user.Role,
},
Organization: models.OrganizationResponse{
ID: org.ID,
Name: org.Name,
Type: org.Type,
},
}, nil
}
// ValidationError ошибка валидации
type ValidationError struct {
Message string
}
func (e *ValidationError) Error() string {
return e.Message
}

72
core-service/migrations/001_initial_schema.sql Normal file
View File

@@ -0,0 +1,72 @@
-- Initial schema for ERP MVP
-- Migration: 001_initial_schema.sql
-- Enable UUID extension
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-- Organizations table
CREATE TABLE organizations (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
name VARCHAR(255) NOT NULL,
type VARCHAR(100),
settings JSONB,
created_at TIMESTAMP DEFAULT NOW()
);
-- Users table
CREATE TABLE users (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
email VARCHAR(255) UNIQUE NOT NULL,
password_hash VARCHAR(255) NOT NULL,
role VARCHAR(50) DEFAULT 'user',
created_at TIMESTAMP DEFAULT NOW()
);
-- Storage locations table
CREATE TABLE storage_locations (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
parent_id UUID REFERENCES storage_locations(id) ON DELETE CASCADE,
name VARCHAR(255) NOT NULL,
address VARCHAR(100) NOT NULL,
type VARCHAR(50) NOT NULL,
coordinates JSONB,
created_at TIMESTAMP DEFAULT NOW()
);
-- Items table
CREATE TABLE items (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
name VARCHAR(255) NOT NULL,
description TEXT,
category VARCHAR(100),
created_at TIMESTAMP DEFAULT NOW()
);
-- Item placements table
CREATE TABLE item_placements (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
organization_id UUID REFERENCES organizations(id) ON DELETE CASCADE,
item_id UUID REFERENCES items(id) ON DELETE CASCADE,
location_id UUID REFERENCES storage_locations(id) ON DELETE CASCADE,
quantity INTEGER DEFAULT 1,
created_at TIMESTAMP DEFAULT NOW()
);
-- Indexes for better performance
CREATE INDEX idx_users_organization_id ON users(organization_id);
CREATE INDEX idx_users_email ON users(email);
CREATE INDEX idx_storage_locations_organization_id ON storage_locations(organization_id);
CREATE INDEX idx_storage_locations_parent_id ON storage_locations(parent_id);
CREATE INDEX idx_storage_locations_address ON storage_locations(address);
CREATE INDEX idx_items_organization_id ON items(organization_id);
CREATE INDEX idx_items_name ON items(name);
CREATE INDEX idx_items_category ON items(category);
CREATE INDEX idx_item_placements_organization_id ON item_placements(organization_id);
CREATE INDEX idx_item_placements_item_id ON item_placements(item_id);
CREATE INDEX idx_item_placements_location_id ON item_placements(location_id);
-- Unique constraints
CREATE UNIQUE INDEX idx_storage_locations_org_address ON storage_locations(organization_id, address);