admin/FamilyHUB
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed and updated project.

Browse Source
This commit is contained in:
AlexBelyan
2026-01-27 20:27:06 +03:00
parent e6dc59c266
commit 2ee1837fcc
38 changed files with 499 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -3,3 +3,5 @@
.env
secret_key.json
data
archive
volumes
docker-compose.yml
+15
View File
@@ -0,0 +1,15 @@
version: '3.9'
services:
db:
image: postgres:16
container_name: postgres
restart: always
environment:
POSTGRES_USER: familyUser
POSTGRES_PASSWORD: familyPass
POSTGRES_DB: familyHubDB
ports:
- "5432:5432"
volumes:
- ./volumes/postgres:/var/lib/postgresql/data
go.mod
+14 -14
View File
@@ -1,4 +1,4 @@
module GoFinanceManager
module FamilyHub
go 1.25
@@ -8,7 +8,9 @@ require (
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
github.com/golang-migrate/migrate/v4 v4.19.1
github.com/joho/godotenv v1.5.1
github.com/mattn/go-sqlite3 v1.14.33
github.com/lib/pq v1.10.9
github.com/liyue201/goqr v0.0.0-20200803022322-df443203d4ea
github.com/mattn/go-sqlite3 v1.14.34
github.com/stretchr/testify v1.11.1
)
@@ -19,19 +21,20 @@ require (
cloud.google.com/go/compute/metadata v0.8.0 // indirect
cloud.google.com/go/longrunning v0.6.7 // indirect
cloud.google.com/go/vision/v2 v2.9.5 // indirect
github.com/bytedance/sonic v1.14.0 // indirect
github.com/bytedance/sonic/loader v0.3.0 // indirect
github.com/bytedance/gopkg v0.1.3 // indirect
github.com/bytedance/sonic v1.14.2 // indirect
github.com/bytedance/sonic/loader v0.4.0 // indirect
github.com/cloudwego/base64x v0.1.6 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
github.com/gin-contrib/sse v1.1.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.27.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/goccy/go-yaml v1.18.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
@@ -40,36 +43,33 @@ require (
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/quic-go/qpack v0.5.1 // indirect
github.com/quic-go/quic-go v0.54.0 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
github.com/quic-go/quic-go v0.57.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.3.0 // indirect
github.com/ugorji/go/codec v1.3.1 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/arch v0.20.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/mod v0.29.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.38.0 // indirect
google.golang.org/api v0.247.0 // indirect
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/grpc v1.74.2 // indirect
google.golang.org/protobuf v1.36.9 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
migrations/000001_create_users.down.sql
+1
View File
@@ -0,0 +1 @@
DROP TABLE IF EXISTS users;
migrations/000001_create_users.up.sql
+13
View File
@@ -0,0 +1,13 @@
CREATE TABLE users
(
id BIGSERIAL PRIMARY KEY,
telegram_id BIGINT UNIQUE NOT NULL,
username TEXT,
first_name TEXT NOT NULL,
last_name TEXT,
language_code TEXT,
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
updated_at TIMESTAMP NOT NULL DEFAULT NOW()
);
CREATE INDEX idx_users_telegram_id ON users (telegram_id);
migrations/000002_create_telegram_chats.down.sql
+1
View File
@@ -0,0 +1 @@
DROP TABLE IF EXISTS telegram_chats;
migrations/000002_create_telegram_chats.up.sql
+9
View File
@@ -0,0 +1,9 @@
CREATE TABLE telegram_chats
(
id BIGSERIAL PRIMARY KEY,
telegram_id BIGINT UNIQUE NOT NULL,
title TEXT NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
CREATE INDEX idx_telegram_chats_telegram_id ON telegram_chats (telegram_id);
migrations/000003_add_indexes.down.sql
-2
View File
@@ -1,2 +0,0 @@
DROP INDEX idx_positions_receipt_id;
DROP INDEX idx_receipts_issued_at;
migrations/000003_add_indexes.up.sql
-2
View File
@@ -1,2 +0,0 @@
CREATE INDEX idx_receipts_issued_at ON receipts(issued_at);
CREATE INDEX idx_positions_receipt_id ON positions(receipt_id);
migrations/000003_create_families.down.sql
+1
View File
@@ -0,0 +1 @@
DROP TABLE IF EXISTS families;
migrations/000003_create_families.up.sql
+12
View File
@@ -0,0 +1,12 @@
CREATE TABLE families
(
id BIGSERIAL PRIMARY KEY,
name TEXT NOT NULL,
owner_id BIGINT NOT NULL REFERENCES users (id),
telegram_chat_id BIGINT NOT NULL UNIQUE REFERENCES telegram_chats (id),
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
CREATE INDEX idx_families_owner_id ON families (owner_id);
CREATE UNIQUE INDEX idx_families_chat_id ON families (telegram_chat_id);
migrations/000004_create_family_members.down.sql
+2
View File
@@ -0,0 +1,2 @@
DROP TABLE IF EXISTS family_members;
DROP TYPE IF EXISTS family_role;
migrations/000004_create_family_members.up.sql
+26
View File
@@ -0,0 +1,26 @@
CREATE TYPE family_role AS ENUM (
'owner',
'admin',
'member',
'child'
);
CREATE TABLE family_members
(
id BIGSERIAL PRIMARY KEY,
family_id BIGINT NOT NULL REFERENCES families (id) ON DELETE CASCADE,
user_id BIGINT NOT NULL REFERENCES users (id) ON DELETE CASCADE,
role family_role NOT NULL DEFAULT 'member',
joined_at TIMESTAMP NOT NULL DEFAULT NOW(),
UNIQUE (family_id, user_id)
);
-- быстрый поиск всех членов семьи
CREATE INDEX idx_family_members_family_id ON family_members (family_id);
-- быстрый поиск всех семей пользователя
CREATE INDEX idx_family_members_user_id ON family_members (user_id);
-- composite для частых join’ов
CREATE INDEX idx_family_members_user_family ON family_members (user_id, family_id);
migrations/000005_create_threads.down.sql
+2
View File
@@ -0,0 +1,2 @@
DROP TABLE IF EXISTS threads;
DROP TYPE IF EXISTS thread_type;
migrations/000005_create_threads.up.sql
+27
View File
@@ -0,0 +1,27 @@
CREATE TYPE thread_type AS ENUM (
'expenses',
'movies',
'schedule',
'recipes',
'custom'
);
CREATE TABLE threads
(
id BIGSERIAL PRIMARY KEY,
family_id BIGINT NOT NULL REFERENCES families (id) ON DELETE CASCADE,
type thread_type NOT NULL,
title TEXT NOT NULL,
telegram_topic_id BIGINT NOT NULL,
is_system BOOLEAN NOT NULL DEFAULT FALSE,
created_by BIGINT NOT NULL REFERENCES users (id),
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
UNIQUE (family_id, telegram_topic_id)
);
CREATE UNIQUE INDEX idx_unique_system_threads ON threads (family_id, type) WHERE is_system = TRUE;
CREATE INDEX idx_threads_family_id ON threads (family_id);
CREATE INDEX idx_threads_family_type ON threads(family_id, type);
migrations/000001_create_receipts.down.sql → migrations/000006_create_receipts.down.sql
View File
migrations/000001_create_receipts.up.sql → migrations/000006_create_receipts.up.sql
+4 -21
View File
@@ -1,52 +1,35 @@
CREATE TABLE receipts
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
-- основные поля
id BIGSERIAL PRIMARY KEY,
receipt_number TEXT NOT NULL UNIQUE,
ui TEXT NOT NULL,
status INTEGER NOT NULL,
issued_at TIMESTAMP NOT NULL,
-- суммы
total_amount REAL NOT NULL,
payment_amount REAL NOT NULL,
cash_amount REAL NOT NULL,
another_amount REAL NOT NULL,
clearing_amount REAL NOT NULL,
margin REAL NOT NULL,
currency TEXT NOT NULL,
payment_type INTEGER NOT NULL,
-- касса / продавец
cashbox_number INTEGER NOT NULL,
cashier TEXT,
-- организация / адрес
name_spd TEXT,
name_to TEXT,
name_np TEXT,
type_np TEXT,
street_to TEXT,
house_to TEXT,
-- SOATO (nullable)
kod_soato TEXT,
oblast_soato TEXT,
rayon_soato TEXT,
selsovet_soato TEXT,
-- прочее
doc_num TEXT,
skno_number TEXT,
unp TEXT,
success TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
created_at TIMESTAMP DEFAULT NOW()
);
CREATE INDEX idx_receipts_issued_at ON receipts(issued_at);
migrations/000002_create_positions.down.sql → migrations/000007_create_positions.down.sql
View File
migrations/000002_create_positions.up.sql → migrations/000007_create_positions.up.sql
+5 -11
View File
@@ -1,25 +1,19 @@
CREATE TABLE positions
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
receipt_id INTEGER NOT NULL,
id BIGSERIAL PRIMARY KEY,
receipt_id BIGINT NOT NULL,
section_number TEXT,
gtin_code TEXT,
product_name TEXT NOT NULL,
product_count REAL NOT NULL,
amount REAL NOT NULL,
discount REAL,
surcharge REAL,
tag TEXT,
marking_code TEXT,
ukz_code TEXT,
FOREIGN KEY (receipt_id)
REFERENCES receipts (id)
ON DELETE CASCADE
FOREIGN KEY (receipt_id) REFERENCES receipts (id) ON DELETE CASCADE
);
CREATE INDEX idx_positions_receipt_id ON positions (receipt_id);
response.json
-31
View File
@@ -1,31 +0,0 @@
{
"STATUS": 1,
"another_amount": 0,
"cash_amount": 0,
"cashbox_number": 119066664,
"cashier": "Замена Магазин 3",
"clearing_amount": 13.54,
"currency": "BYN",
"doc_num": "153896",
"house_to": "11, 3 этаж",
"issued_at": "21/01/2026, 21:15:20",
"kod_soato": "5000000000",
"margin": 0,
"name_np": "Минск",
"name_spd": "Общество с ограниченной ответственностью \"СМАРТОН\"",
"name_to": "\"Офистон Маркет\", г.Минск, ул.Петра Мстиславца, 11",
"oblast_soato": null,
"payment_amount": 13.54,
"payment_type": 1,
"positions": "[{\"section_number\": \"0\", \"gtin_code\": \"8801068922011\", \"product_count\": \"1.000\", \"amount\": \"7.60\", \"discount\": \"0.00\", \"surcharge\": \"0.00\", \"tag\": \"0\", \"marking_code\": \"None\", \"ukz_code\": \"None\", \"product_name\": \"\\u041d\\u0430\\u043f\\u0438\\u0442\\u043e\\u043a \\\"Samlip\\\" 230 \\u043c\\u043b., \\u0441\\u043e \\u0432\\u043a\\u0443\\u0441\\u043e\\u043c \\u043b\\u0438\\u0447\\u0438\"}, {\"section_number\": \"0\", \"gtin_code\": \"4606008517920\", \"product_count\": \"1.000\", \"amount\": \"5.94\", \"discount\": \"0.00\", \"surcharge\": \"0.00\", \"tag\": \"0\", \"marking_code\": \"None\", \"ukz_code\": \"None\", \"product_name\": \"\\u0421\\u0442\\u0438\\u043a\\u0435\\u0440\\u044b \\u0434/\\u0437\\u0430\\u043c\\u0435\\u0442\\u043e\\u043a \\u0431\\u0443\\u043c\\u0430\\u0436\\u043d\\u044b\\u0435 \\\"\\u0421\\u0435\\u0440\\u0434\\u0446\\u0435\\\" 80 \\u0448\\u0442., \\u0444\\u0438\\u0433\\u0443\\u0440\\u043d\"}]",
"rayon_soato": null,
"receipt_number": "C0AD964BD53AC59A0718D028",
"selsovet_soato": null,
"skno_number": "AVQ24170087307",
"street_to": "УЛ. ПЕТРА МСТИСЛАВЦА",
"success": "A check is correct",
"total_amount": 13.54,
"type_np": "г.",
"ui": "C0AD964BD53AC59A0718D028",
"unp": "190635842"
}
src/api/handlers/hello.go
-37
View File
@@ -1,37 +0,0 @@
package handlers
import (
"net/http"
"GoFinanceManager/src/api/dto"
"github.com/gin-gonic/gin"
)
// Hello GoDoc
// @Summary Say hello
// @Description Returns greeting
// @Tags hello
// @Accept JSON
// @Produce JSON
// @Param name query string true "User name"
// @Success 200 {object} dto.HelloResponse
// @Failure 400 {object} dto.ErrorResponse
// @Router /hello [get]
func Hello(c *gin.Context) {
var req dto.HelloRequest
// биндинг + валидация
if err := c.ShouldBindQuery(&req); err != nil {
c.JSON(http.StatusBadRequest, dto.ErrorResponse{
Message: err.Error(),
})
return
}
resp := dto.HelloResponse{
Message: "Hello " + req.Name,
}
c.JSON(http.StatusOK, resp)
}
src/api/handlers/receipts.go
+14 -18
View File
@@ -1,9 +1,9 @@
package handlers
import (
"GoFinanceManager/src/api/dto"
"GoFinanceManager/src/integrations/receiptService"
"GoFinanceManager/src/utils"
"FamilyHub/src/api/dto"
"FamilyHub/src/integrations/receiptService"
"FamilyHub/src/utils"
"context"
"log"
"net/http"
@@ -20,30 +20,26 @@ func NewReceiptHandler(s *receiptService.ReceiptService) *ReceiptHandler {
return &ReceiptHandler{service: s}
}
func (h *ReceiptHandler) AddReceipt(c *gin.Context) {
func (handler *ReceiptHandler) AddReceipt(context_ *gin.Context) {
var req dto.AddReceiptRequest
if err := c.ShouldBindJSON(&req); err != nil {
if err := context_.ShouldBindJSON(&req); err != nil {
log.Println("bind error:", err)
c.JSON(http.StatusBadRequest, dto.ErrorResponse{
Message: err.Error(),
})
context_.JSON(http.StatusBadRequest, dto.ErrorResponse{Message: err.Error()})
return
}
isoDate, err := utils.NormalizeDateToISO(req.Date)
if err != nil {
c.JSON(400, gin.H{"error": "invalid date format"})
context_.JSON(400, gin.H{"error": "invalid date format"})
return
}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
receipt, err := h.service.GetReceipt(
ctx,
isoDate,
req.Number,
)
receipt, err := handler.service.GetReceipt(ctx, isoDate, req.Number)
if err != nil {
c.JSON(400, gin.H{"error": "Cant get receipt"})
log.Print(err.Error())
context_.JSON(400, gin.H{"error": err.Error()})
log.Printf("API error, %s", err.Error())
return
}
@@ -52,5 +48,5 @@ func (h *ReceiptHandler) AddReceipt(c *gin.Context) {
Number: receipt.ReceiptNumber,
Date: receipt.IssuedAt,
}
c.JSON(http.StatusOK, resp)
context_.JSON(http.StatusOK, resp)
}
src/api/server.go
+11 -7
View File
@@ -1,11 +1,11 @@
package api
import (
"GoFinanceManager/src/api/handlers"
"GoFinanceManager/src/config"
"GoFinanceManager/src/database"
"GoFinanceManager/src/integrations/receiptService"
"GoFinanceManager/src/repositories"
"FamilyHub/src/api/handlers"
"FamilyHub/src/config"
"FamilyHub/src/database"
"FamilyHub/src/integrations/receiptService"
"FamilyHub/src/repositories"
"context"
"log"
"net/http"
@@ -19,12 +19,16 @@ type Server struct {
func NewServer(cfg config.Config) *Server {
handler := gin.Default()
dbConn, err := database.Connect(cfg.DBConnectionString)
dbManager := &database.Database{
ConnectionString: cfg.DBConnectionString,
MigrationsPath: "file://migrations",
}
dbConn, err := dbManager.Connect()
if err != nil {
log.Fatal(err)
}
if err := database.RunMigrations(dbConn); err != nil {
if err := dbManager.RunMigrations(dbConn); err != nil {
log.Fatal(err)
}
src/bot/bot.go
+3 -3
View File
@@ -1,9 +1,9 @@
package bot
import (
"GoFinanceManager/src/config"
"GoFinanceManager/src/integrations/ocr"
"GoFinanceManager/src/integrations/receiptApi"
"FamilyHub/src/config"
"FamilyHub/src/integrations/ocr"
"FamilyHub/src/integrations/receiptApi"
"context"
"log"
"time"
src/bot/handlers.go
+6 -5
View File
@@ -1,8 +1,8 @@
package bot
import (
"GoFinanceManager/src/integrations/receiptApi"
"GoFinanceManager/src/utils"
"FamilyHub/src/integrations/receiptApi"
"FamilyHub/src/utils"
"context"
"io"
"log"
@@ -13,7 +13,6 @@ import (
)
func (bot *Bot) handleMessage(msg *tgbotapi.Message) {
println(msg.Text)
switch msg.Text {
case "/start":
bot.handleStart(msg)
@@ -26,7 +25,6 @@ func (bot *Bot) handleMessage(msg *tgbotapi.Message) {
}
func (bot *Bot) handlePhoto(msg *tgbotapi.Message) {
// Берём самое большое фото
photo := msg.Photo[len(msg.Photo)-1]
file, err := bot.api.GetFile(tgbotapi.FileConfig{FileID: photo.FileID})
@@ -68,9 +66,12 @@ func (bot *Bot) handlePhoto(msg *tgbotapi.Message) {
Date: receiptMeta.Date,
}
ctx, cancel := context.WithTimeout(context.Background(), 40*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
txt, err := utils.DecodeQR(imageBytes)
println(txt)
err = bot.receiptApi.SendReceipt(ctx, payload)
reply := "📄 *Результат распознавания*\n\n"
src/database/database.go
+101 -6
View File
@@ -2,22 +2,117 @@ package database
import (
"database/sql"
"errors"
"fmt"
"net/url"
"os"
"path/filepath"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/postgres"
"github.com/golang-migrate/migrate/v4/database/sqlite3"
_ "github.com/golang-migrate/migrate/v4/source/file"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
)
func Connect(dsn string) (*sql.DB, error) {
u, err := url.Parse(dsn)
type Database struct {
ConnectionString string
MigrationsPath string
MaxOpenConns int
MaxIdleConns int
}
func (d *Database) Connect() (*sql.DB, error) {
u, _ := url.Parse(d.ConnectionString)
if u == nil {
return nil, errors.New("nil url")
}
switch u.Scheme {
case "sqlite", "sqlite3":
path := filepath.Join(u.Host, u.Path)
if path == "" {
return nil, fmt.Errorf("empty sqlite path")
}
dir := filepath.Dir(path)
if err := os.MkdirAll(dir, 0755); err != nil {
return nil, err
}
db, err := sql.Open("sqlite3", path)
if err != nil {
return nil, err
}
switch u.Scheme {
case "sqlite":
return connectSQLite(u)
if d.MaxOpenConns == 0 {
d.MaxOpenConns = 1
}
db.SetMaxOpenConns(d.MaxOpenConns)
return db, nil
case "postgres", "postgresql":
db, err := sql.Open("postgres", u.String())
if err != nil {
return nil, err
}
if d.MaxOpenConns == 0 {
d.MaxOpenConns = 20
}
if d.MaxIdleConns == 0 {
d.MaxIdleConns = 10
}
db.SetMaxOpenConns(d.MaxOpenConns)
db.SetMaxIdleConns(d.MaxIdleConns)
return db, nil
default:
return nil, fmt.Errorf("unsupported db scheme: %s", u.Scheme)
return nil, fmt.Errorf("unsupported database scheme: %s", u.Scheme)
}
}
func (d *Database) RunMigrations(db *sql.DB) error {
u, _ := url.Parse(d.ConnectionString)
if u == nil {
return errors.New("nil url")
}
if db == nil {
return errors.New("nil db")
}
if d.MigrationsPath == "" {
d.MigrationsPath = "file://migrations"
}
var m *migrate.Migrate
switch u.Scheme {
case "sqlite", "sqlite3":
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
if err != nil {
return err
}
m, err = migrate.NewWithDatabaseInstance(d.MigrationsPath, "sqlite", driver)
case "postgres", "postgresql":
driver, err := postgres.WithInstance(db, &postgres.Config{})
if err != nil {
return err
}
m, err = migrate.NewWithDatabaseInstance(d.MigrationsPath, "postgres", driver)
default:
return fmt.Errorf("unsupported database scheme for migrations: %s", u.Scheme)
}
if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
return fmt.Errorf("migration failed: %w", err)
}
return nil
}
src/database/migrations.go
-32
View File
@@ -1,32 +0,0 @@
package database
import (
"database/sql"
"errors"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/sqlite3"
_ "github.com/golang-migrate/migrate/v4/source/file"
)
func RunMigrations(db *sql.DB) error {
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
if err != nil {
return err
}
m, err := migrate.NewWithDatabaseInstance(
"file://migrations",
"sqlite",
driver,
)
if err != nil {
return err
}
if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
return err
}
return nil
}
src/database/postgresql.go
+65
View File
@@ -0,0 +1,65 @@
package database
import (
"database/sql"
"errors"
"fmt"
"net/url"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/postgres"
_ "github.com/golang-migrate/migrate/v4/source/file"
)
type PostgresDB struct {
MigrationsPath string
MaxOpenConns int
MaxIdleConns int
}
// Connect открывает соединение с Postgres
func (p *PostgresDB) Connect(u *url.URL) (*sql.DB, error) {
db, err := sql.Open("postgres", u.String())
if err != nil {
return nil, err
}
if p.MaxOpenConns == 0 {
p.MaxOpenConns = 20
}
if p.MaxIdleConns == 0 {
p.MaxIdleConns = 10
}
db.SetMaxOpenConns(p.MaxOpenConns)
db.SetMaxIdleConns(p.MaxIdleConns)
return db, nil
}
// RunMigrations запускает миграции PostgreSQL
func (p *PostgresDB) RunMigrations(db *sql.DB) error {
driver, err := postgres.WithInstance(db, &postgres.Config{})
if err != nil {
return fmt.Errorf("failed to create postgres driver: %w", err)
}
if p.MigrationsPath == "" {
p.MigrationsPath = "file://migrations"
}
m, err := migrate.NewWithDatabaseInstance(
p.MigrationsPath,
"postgres",
driver,
)
if err != nil {
return fmt.Errorf("failed to create migrate instance: %w", err)
}
if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
return fmt.Errorf("migration failed: %w", err)
}
return nil
}
src/database/sqlite.go
+41 -2
View File
@@ -2,13 +2,23 @@ package database
import (
"database/sql"
"errors"
"fmt"
"net/url"
"os"
"path/filepath"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/sqlite3"
_ "github.com/golang-migrate/migrate/v4/source/file"
)
func connectSQLite(u *url.URL) (*sql.DB, error) {
type SQLiteDB struct {
MigrationsPath string
MaxOpenConns int
}
func (s *SQLiteDB) Connect(u *url.URL) (*sql.DB, error) {
path := filepath.Join(u.Host, u.Path)
if path == "" {
return nil, fmt.Errorf("empty sqlite path")
@@ -24,6 +34,35 @@ func connectSQLite(u *url.URL) (*sql.DB, error) {
return nil, err
}
db.SetMaxOpenConns(1) // важно для sqlite
if s.MaxOpenConns == 0 {
s.MaxOpenConns = 1
}
db.SetMaxOpenConns(s.MaxOpenConns)
return db, nil
}
func (s *SQLiteDB) RunMigrations(db *sql.DB) error {
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
if err != nil {
return err
}
if s.MigrationsPath == "" {
s.MigrationsPath = "file://migrations"
}
m, err := migrate.NewWithDatabaseInstance(
s.MigrationsPath,
"sqlite",
driver,
)
if err != nil {
return err
}
if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
return err
}
return nil
}
src/domain/models/family.go
+67
View File
@@ -0,0 +1,67 @@
package models
import "time"
type User struct {
ID int64
TelegramID int64
Username *string
FirstName string
LastName *string
LanguageCode *string
CreatedAt time.Time
UpdatedAt time.Time
}
type TelegramChat struct {
ID int64
TelegramID int64
Title string
CreatedAt time.Time
}
type Family struct {
ID int64
Name string
OwnerID int64
TelegramChatID int64
CreatedAt time.Time
}
type FamilyRole string
const (
FamilyRoleOwner FamilyRole = "owner"
FamilyRoleAdmin FamilyRole = "admin"
FamilyRoleMember FamilyRole = "member"
FamilyRoleChild FamilyRole = "child"
)
type FamilyMember struct {
ID int64
FamilyID int64
UserID int64
Role FamilyRole
JoinedAt time.Time
}
type ThreadType string
const (
ThreadExpenses ThreadType = "expenses"
ThreadMovies ThreadType = "movies"
ThreadSchedule ThreadType = "schedule"
ThreadRecipes ThreadType = "recipes"
ThreadCustom ThreadType = "custom"
)
type Thread struct {
ID int64
FamilyID int64
Type ThreadType
Title string
TelegramTopicID int64
IsSystem bool
CreatedBy int64
CreatedAt time.Time
}
src/integrations/receiptApi/http_client.go
+1 -4
View File
@@ -19,7 +19,7 @@ func NewHTTPClient(baseURL string) (*HTTPClient, error) {
return &HTTPClient{
baseURL: baseURL,
client: &http.Client{
Timeout: 30 * time.Second,
Timeout: 60 * time.Second,
},
}, nil
}
@@ -44,9 +44,6 @@ func (c *HTTPClient) SendReceipt(
}
req.Header.Set("Content-Type", "application/json")
//if c.apiKey != "" {
// req.Header.Set("Authorization", "Bearer "+c.apiKey)
//}
resp, err := c.client.Do(req)
if err != nil {
src/integrations/receiptService/receipt_service.go
+11 -10
View File
@@ -1,13 +1,14 @@
package receiptService
import (
"GoFinanceManager/src/domain/models"
"GoFinanceManager/src/repositories"
"GoFinanceManager/src/utils"
"FamilyHub/src/domain/models"
"FamilyHub/src/repositories"
"FamilyHub/src/utils"
"bytes"
"context"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"log"
"mime/multipart"
@@ -23,7 +24,7 @@ type ReceiptService struct {
func NewReceiptService(repo repositories.ReceiptRepository) *ReceiptService {
return &ReceiptService{
client: &http.Client{
Timeout: 30 * time.Second,
Timeout: 60 * time.Second,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
@@ -40,8 +41,8 @@ func (s *ReceiptService) GetReceipt(
number string,
) (*models.Receipt, error) {
url := "https://ch.info-center.by/ajax/check1.php"
var receipt models.Receipt
body, contentType := buildMultipartBody(date, number)
req, err := http.NewRequestWithContext(
ctx,
@@ -71,26 +72,26 @@ func (s *ReceiptService) GetReceipt(
var raw struct {
Message map[string]interface{} `json:"message"`
}
log.Println(raw.Message)
if err := json.NewDecoder(resp.Body).Decode(&raw); err != nil {
log.Printf("external service returned %s\n", err.Error())
return nil, err
}
raw.Message["receipt_number"] = number
bytes_, _ := json.Marshal(raw.Message)
if err := json.Unmarshal(bytes_, &receipt); err != nil {
return nil, err
}
log.Println(receipt)
if receipt.IssuedAtRaw == "" {
return nil, errors.New("receipt not found")
}
positions, err := parsePositions(receipt.PositionsRaw)
if err != nil {
log.Printf("failed to parse positions: %s", err.Error())
return nil, err
}
log.Println(receipt.IssuedAtRaw)
receipt.IssuedAt, err = utils.ParseIssuedAt(receipt.IssuedAtRaw)
if err != nil {
log.Printf("failed to parse issued at: %s", err.Error())
cmd/main.go → src/main.go
+3 -3
View File
@@ -1,9 +1,9 @@
package main
import (
"GoFinanceManager/src/api"
"GoFinanceManager/src/bot"
"GoFinanceManager/src/config"
"FamilyHub/src/api"
"FamilyHub/src/bot"
"FamilyHub/src/config"
"context"
"log"
src/repositories/receipt_repository.go
+1 -1
View File
@@ -3,7 +3,7 @@ package repositories
import (
"context"
"GoFinanceManager/src/domain/models"
"FamilyHub/src/domain/models"
)
type ReceiptRepository interface {
src/repositories/receipt_sql.go
+9 -22
View File
@@ -5,7 +5,7 @@ import (
"database/sql"
"errors"
"GoFinanceManager/src/domain/models"
"FamilyHub/src/domain/models"
)
type ReceiptSQLRepository struct {
@@ -16,17 +16,16 @@ func NewReceiptSQLRepository(db *sql.DB) *ReceiptSQLRepository {
return &ReceiptSQLRepository{db: db}
}
func (r *ReceiptSQLRepository) Create(
ctx context.Context,
receipt *models.Receipt,
) (int64, error) {
func (r *ReceiptSQLRepository) Create(ctx context.Context, receipt *models.Receipt) (int64, error) {
tx, err := r.db.BeginTx(ctx, nil)
if err != nil {
return 0, err
}
defer tx.Rollback()
if receipt.ReceiptNumber != receipt.UI {
receipt.ReceiptNumber = receipt.UI
}
res, err := tx.ExecContext(ctx, `
INSERT INTO receipts (
receipt_number, ui, status, issued_at,
@@ -130,10 +129,7 @@ func (r *ReceiptSQLRepository) Create(
return receiptID, tx.Commit()
}
func (r *ReceiptSQLRepository) GetByID(
ctx context.Context,
id int64,
) (*models.Receipt, error) {
func (r *ReceiptSQLRepository) GetByID(ctx context.Context, id int64) (*models.Receipt, error) {
var receipt models.Receipt
@@ -234,10 +230,7 @@ func (r *ReceiptSQLRepository) GetByID(
return &receipt, nil
}
func (r *ReceiptSQLRepository) GetAll(
ctx context.Context,
limit, offset int,
) ([]*models.Receipt, error) {
func (r *ReceiptSQLRepository) GetAll(ctx context.Context, limit, offset int) ([]*models.Receipt, error) {
rows, err := r.db.QueryContext(ctx, `
SELECT id, receipt_number, issued_at, total_amount, currency
@@ -269,10 +262,7 @@ func (r *ReceiptSQLRepository) GetAll(
return receipts, nil
}
func (r *ReceiptSQLRepository) Update(
ctx context.Context,
receipt *models.Receipt,
) error {
func (r *ReceiptSQLRepository) Update(ctx context.Context, receipt *models.Receipt) error {
tx, err := r.db.BeginTx(ctx, nil)
if err != nil {
@@ -315,10 +305,7 @@ func (r *ReceiptSQLRepository) Update(
return tx.Commit()
}
func (r *ReceiptSQLRepository) Delete(
ctx context.Context,
id int64,
) error {
func (r *ReceiptSQLRepository) Delete(ctx context.Context, id int64) error {
_, err := r.db.ExecContext(ctx,
`DELETE FROM receipts WHERE id = ?`,
id,
cmd/runtime.go → src/runtime.go
View File
src/utils/date.go
-2
View File
@@ -2,7 +2,6 @@ package utils
import (
"errors"
"log"
"strings"
"time"
)
@@ -21,7 +20,6 @@ var knownDateFormats = []string{
func NormalizeDateToISO(input string) (string, error) {
input = strings.TrimSpace(input)
log.Println(input)
for _, layout := range knownDateFormats {
if t, err := time.Parse(layout, input); err == nil {
return t.Format("2006-01-02"), nil
src/utils/qr_parser.go
+30
View File
@@ -0,0 +1,30 @@
package utils
import (
"bytes"
"image"
_ "image/jpeg"
_ "image/png"
"github.com/liyue201/goqr"
)
func DecodeQR(imageBytes []byte) ([]string, error) {
img, _, err := image.Decode(bytes.NewReader(imageBytes))
if err != nil {
return nil, err
}
codes, err := goqr.Recognize(img)
if err != nil {
return nil, err
}
println(codes)
var result []string
for _, code := range codes {
result = append(result, string(code.Payload))
}
return result, nil
}