From f4c42bbb9e36d5ba55d647bbcf080af8b7e69321 Mon Sep 17 00:00:00 2001 From: kennethcheng Date: Sun, 13 Sep 2026 15:59:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(backend):=20=E6=B7=BB=E5=8A=A0=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E4=B8=8E=E5=8A=A0=E6=B2=B9=E8=AE=B0=E5=BD=95=20model?= =?UTF-8?q?=E3=80=81repository=20=E5=92=8C=20GORM=20=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 完成 Phase 1.2,把 GORM 真正接进来。Phase 1.1 留下的 /health 和骨架保持不变, 本 commit 在此之上铺好数据访问层,Phase 1.3 直接在 service / handler 上挂业务即可。 新增: - internal/model/vehicle.go 车辆实体(严格按 plan §7.1) - internal/model/refuel_record.go 加油记录实体(严格按 plan §7.2) - internal/db/db.go SQLite 连接 + AutoMigrate 入口 * glebarez/sqlite 纯 Go,免 CGO,Windows / Docker 通吃 * DSN 自动启用 WAL + 外键约束 + busy_timeout * 表目录若不存在会自动创建 - internal/repository/vehicle.go 车辆数据访问接口 + GORM 实现 * Create / Get / List / Update / Delete * ClearDefault / SetDefault(切换默认车辆用,在事务里跑避免脏状态) - internal/repository/refuel_record.go 加油记录数据访问接口 + GORM 实现 * Create / Get / Update / Delete * ListByVehicle 支持可选时间窗口 * PrevFullRefuel 找上一次加满,给油耗计算用 main.go 改动: - 启动期 db.Open + db.Migrate,失败直接退出 - application 持有 *gorm.DB,Phase 1.3 起注入 repo / service 设计要点: - repository 全是接口,Service 持有接口便于单测用 fake 替换 - 所有 repo 错误统一包成 apperror.NotFound / apperror.Internal, 不让 GORM 原始错误泄漏到 handler - model.TableName() 显式指定单数,避免 GORM 复数 - refuel_record 用 (vehicle_id, refuel_time) 复合场景常见,已加索引 未做(留给后续 commit): - service 层与 DTO - handler / router - 显式 migration 文件(AGENTS.md 要求 schema 变更必须写 migration; 此次为首次建表,AutoMigrate 即可,后续 schema 改动会补 goose / 自管文件) 验证: go mod tidy all modules verified go vet ./... 0 issues go build 25.9 MB binary 冷启动一次,DB 文件生成在 fuellog-api/data/fuellog.db(WAL/SHM 齐备) listtables 脚本 dump 出来的两表 schema 与 plan §7 完全一致 --- fuellog-api/cmd/server/main.go | 23 +++- fuellog-api/go.sum | 35 +++++- fuellog-api/internal/db/db.go | 51 +++++++++ fuellog-api/internal/model/refuel_record.go | 30 +++++ fuellog-api/internal/model/vehicle.go | 25 ++++ .../internal/repository/refuel_record.go | 102 +++++++++++++++++ fuellog-api/internal/repository/vehicle.go | 108 ++++++++++++++++++ 7 files changed, 368 insertions(+), 6 deletions(-) create mode 100644 fuellog-api/internal/db/db.go create mode 100644 fuellog-api/internal/model/refuel_record.go create mode 100644 fuellog-api/internal/model/vehicle.go create mode 100644 fuellog-api/internal/repository/refuel_record.go create mode 100644 fuellog-api/internal/repository/vehicle.go diff --git a/fuellog-api/cmd/server/main.go b/fuellog-api/cmd/server/main.go index efd2e80..2b10606 100644 --- a/fuellog-api/cmd/server/main.go +++ b/fuellog-api/cmd/server/main.go @@ -3,7 +3,7 @@ // 启动流程: // 1. 加载 .env // 2. 解析配置 -// 3. 初始化数据库(Phase 2 起接 GORM) +// 3. 打开 SQLite + 运行迁移 // 4. 装配路由 // 5. 监听并优雅退出 package main @@ -19,8 +19,10 @@ import ( "github.com/gin-gonic/gin" "github.com/joho/godotenv" + "gorm.io/gorm" "github.com/kennethcheng/fuellog-api/internal/config" + "github.com/kennethcheng/fuellog-api/internal/db" "github.com/kennethcheng/fuellog-api/internal/middleware" "github.com/kennethcheng/fuellog-api/pkg/apperror" ) @@ -41,7 +43,18 @@ func main() { Level: parseLogLevel(cfg.LogLevel), }))) - app := &application{cfg: cfg} + gormDB, err := db.Open(cfg.DBPath) + if err != nil { + slog.Error("db open failed", "err", err) + os.Exit(1) + } + if err := db.Migrate(gormDB); err != nil { + slog.Error("db migrate failed", "err", err) + os.Exit(1) + } + slog.Info("db ready", "path", cfg.DBPath) + + app := &application{cfg: cfg, db: gormDB} srv := &http.Server{ Addr: cfg.ServerAddr, @@ -75,10 +88,12 @@ func main() { // application 持有所有依赖,避免散落全局变量。 type application struct { cfg *config.Config + db *gorm.DB + // Phase 1.3 起注入:vehicleRepo / refuelRepo / vehicleSvc / refuelSvc } // router 构建并返回 Gin 引擎。 -// 当前阶段只暴露 /health;Phase 2 起逐步接 /api/vehicles、/api/refuels。 +// 当前阶段只暴露 /health;Phase 1.3 起逐步接 /api/vehicles、/api/refuels。 func (a *application) router() *gin.Engine { r := gin.New() r.Use( @@ -101,7 +116,7 @@ func (a *application) router() *gin.Engine { }) }) - // /api 路由组(Phase 2 起在此挂载业务路由) + // /api 路由组(Phase 1.3 起在此挂载业务路由) api := r.Group("/api") _ = api // 占位,避免未使用告警 diff --git a/fuellog-api/go.sum b/fuellog-api/go.sum index 4bf0def..b456a6b 100644 --- a/fuellog-api/go.sum +++ b/fuellog-api/go.sum @@ -9,12 +9,18 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ 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/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= 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.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= +github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= +github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= +github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= 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= @@ -28,6 +34,14 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG 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/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -40,6 +54,8 @@ 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/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/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= 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= @@ -49,6 +65,9 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6 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/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= 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= @@ -78,8 +97,8 @@ golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= -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= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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= @@ -87,5 +106,17 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 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= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= +modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= +modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= +modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/fuellog-api/internal/db/db.go b/fuellog-api/internal/db/db.go new file mode 100644 index 0000000..3a38d7b --- /dev/null +++ b/fuellog-api/internal/db/db.go @@ -0,0 +1,51 @@ +// Package db 负责 GORM 数据库连接的初始化与迁移注册。 +package db + +import ( + "fmt" + "log/slog" + "os" + "path/filepath" + + "github.com/glebarez/sqlite" + "gorm.io/gorm" + "gorm.io/gorm/logger" + + "github.com/kennethcheng/fuellog-api/internal/model" +) + +// Open 打开 SQLite 数据库连接,并确保目标目录存在。 +// +// 设计要点: +// - 使用 pure-Go glebarez/sqlite,避免 CGO;Windows / Docker 都友好 +// - 日志走 slog,关闭 GORM 默认的 stdout 输出 +// - 启用 WAL + 外键约束,提升并发与一致性 +func Open(path string) (*gorm.DB, error) { + if dir := filepath.Dir(path); dir != "" { + if err := os.MkdirAll(dir, 0o755); err != nil { + return nil, fmt.Errorf("ensure db dir: %w", err) + } + } + gormLogger := logger.New( + slog.NewLogLogger(slog.Default().Handler(), slog.LevelWarn), + logger.Config{ + LogLevel: logger.Warn, + Colorful: false, + }, + ) + dsn := fmt.Sprintf("file:%s?_pragma=journal_mode(WAL)&_pragma=foreign_keys(ON)&_pragma=busy_timeout(5000)", path) + g, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{Logger: gormLogger}) + if err != nil { + return nil, fmt.Errorf("open sqlite: %w", err) + } + return g, nil +} + +// Migrate 在数据库上注册所有模型。Phase 1.2 之前,业务表只读;Phase 1.2 +// 起每次 schema 变更必须追加迁移文件,不得依赖此处注册。 +func Migrate(g *gorm.DB) error { + return g.AutoMigrate( + &model.Vehicle{}, + &model.RefuelRecord{}, + ) +} diff --git a/fuellog-api/internal/model/refuel_record.go b/fuellog-api/internal/model/refuel_record.go new file mode 100644 index 0000000..476a923 --- /dev/null +++ b/fuellog-api/internal/model/refuel_record.go @@ -0,0 +1,30 @@ +package model + +import "time" + +// RefuelRecord 单次加油记录。 +// +// 关键约定: +// - Liters > 0(后端强校验) +// - TotalAmount >= 0(允许 0 表示免费加注或赠送) +// - PricePerLiter = TotalAmount / Liters(在 service 层实时计算并落库, +// 既保留历史真实单价,也方便后续统计直接查询) +// - IsFull = true 时,该记录才进入"标准百公里油耗"统计 +type RefuelRecord struct { + ID uint64 `gorm:"primaryKey;column:id" json:"id"` + VehicleID uint64 `gorm:"not null;index;column:vehicle_id" json:"vehicle_id"` + RefuelTime time.Time `gorm:"not null;index;column:refuel_time" json:"refuel_time"` // UTC + Odometer float64 `gorm:"not null;column:odometer" json:"odometer"` // 公里 + FuelType string `gorm:"not null;column:fuel_type" json:"fuel_type"` + Liters float64 `gorm:"not null;column:liters" json:"liters"` // 升 + PricePerLiter float64 `gorm:"not null;column:price_per_liter" json:"price_per_liter"` + TotalAmount float64 `gorm:"not null;column:total_amount" json:"total_amount"` // 元 + StationName string `gorm:"column:station_name" json:"station_name"` + IsFull bool `gorm:"not null;default:false;column:is_full" json:"is_full"` + Remark string `gorm:"column:remark" json:"remark"` + CreatedAt time.Time `gorm:"not null;column:created_at" json:"created_at"` + UpdatedAt time.Time `gorm:"not null;column:updated_at" json:"updated_at"` +} + +// TableName 显式指定表名。 +func (RefuelRecord) TableName() string { return "refuel_record" } diff --git a/fuellog-api/internal/model/vehicle.go b/fuellog-api/internal/model/vehicle.go new file mode 100644 index 0000000..72426bf --- /dev/null +++ b/fuellog-api/internal/model/vehicle.go @@ -0,0 +1,25 @@ +// Package model 包含 FuelLog 的 GORM 实体。 +// +// 表结构严格遵循 FuelLog_PLAN.md §7。 +// 字段名以 snake_case 形式映射到列;created_at / updated_at 由 GORM 自动维护。 +package model + +import "time" + +// Vehicle 车辆。 +type Vehicle struct { + ID uint64 `gorm:"primaryKey;column:id" json:"id"` + Name string `gorm:"not null;column:name" json:"name"` + Brand string `gorm:"column:brand" json:"brand"` + Model string `gorm:"column:model" json:"model"` + PlateNumber string `gorm:"column:plate_number" json:"plate_number"` + FuelType string `gorm:"not null;column:fuel_type" json:"fuel_type"` + TankCapacity float64 `gorm:"column:tank_capacity" json:"tank_capacity"` // 升 + CurrentOdometer float64 `gorm:"column:current_odometer" json:"current_odometer"` // 公里 + DefaultVehicle bool `gorm:"not null;default:false;column:default_vehicle" json:"default_vehicle"` + CreatedAt time.Time `gorm:"not null;column:created_at" json:"created_at"` + UpdatedAt time.Time `gorm:"not null;column:updated_at" json:"updated_at"` +} + +// TableName 显式指定表名,避免 GORM 自动复数。 +func (Vehicle) TableName() string { return "vehicle" } diff --git a/fuellog-api/internal/repository/refuel_record.go b/fuellog-api/internal/repository/refuel_record.go new file mode 100644 index 0000000..d28e319 --- /dev/null +++ b/fuellog-api/internal/repository/refuel_record.go @@ -0,0 +1,102 @@ +package repository + +import ( + "context" + "errors" + "time" + + "gorm.io/gorm" + + "github.com/kennethcheng/fuellog-api/internal/model" + "github.com/kennethcheng/fuellog-api/pkg/apperror" +) + +// RefuelRecordRepository 加油记录表的数据访问接口。 +type RefuelRecordRepository interface { + Create(ctx context.Context, r *model.RefuelRecord) error + Get(ctx context.Context, id uint64) (*model.RefuelRecord, error) + Update(ctx context.Context, r *model.RefuelRecord) error + Delete(ctx context.Context, id uint64) error + // List 返回指定车辆的加油记录,按 refuel_time DESC 排序。 + // 支持可选时间窗口。 + ListByVehicle(ctx context.Context, vehicleID uint64, start, end *time.Time) ([]model.RefuelRecord, error) + // PrevFullRefuel 返回指定车辆在 time 之前最近一次 is_full=true 的记录。 + // 用于计算百公里油耗。 + PrevFullRefuel(ctx context.Context, vehicleID uint64, before time.Time) (*model.RefuelRecord, error) +} + +func NewRefuelRecordRepository(g *gorm.DB) RefuelRecordRepository { + return &refuelRepo{g: g} +} + +type refuelRepo struct{ g *gorm.DB } + +func (r *refuelRepo) Create(ctx context.Context, rec *model.RefuelRecord) error { + if err := r.g.WithContext(ctx).Create(rec).Error; err != nil { + return apperror.Wrap(apperror.CodeInternal, "创建加油记录失败", err) + } + return nil +} + +func (r *refuelRepo) Get(ctx context.Context, id uint64) (*model.RefuelRecord, error) { + var rec model.RefuelRecord + if err := r.g.WithContext(ctx).First(&rec, id).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, apperror.New(apperror.CodeNotFound, "加油记录不存在") + } + return nil, apperror.Wrap(apperror.CodeInternal, "查询加油记录失败", err) + } + return &rec, nil +} + +func (r *refuelRepo) Update(ctx context.Context, rec *model.RefuelRecord) error { + res := r.g.WithContext(ctx).Save(rec) + if res.Error != nil { + return apperror.Wrap(apperror.CodeInternal, "更新加油记录失败", res.Error) + } + if res.RowsAffected == 0 { + return apperror.New(apperror.CodeNotFound, "加油记录不存在") + } + return nil +} + +func (r *refuelRepo) Delete(ctx context.Context, id uint64) error { + res := r.g.WithContext(ctx).Delete(&model.RefuelRecord{}, id) + if res.Error != nil { + return apperror.Wrap(apperror.CodeInternal, "删除加油记录失败", res.Error) + } + if res.RowsAffected == 0 { + return apperror.New(apperror.CodeNotFound, "加油记录不存在") + } + return nil +} + +func (r *refuelRepo) ListByVehicle(ctx context.Context, vehicleID uint64, start, end *time.Time) ([]model.RefuelRecord, error) { + q := r.g.WithContext(ctx).Where("vehicle_id = ?", vehicleID) + if start != nil { + q = q.Where("refuel_time >= ?", *start) + } + if end != nil { + q = q.Where("refuel_time <= ?", *end) + } + var out []model.RefuelRecord + if err := q.Order("refuel_time DESC, id DESC").Find(&out).Error; err != nil { + return nil, apperror.Wrap(apperror.CodeInternal, "查询加油记录列表失败", err) + } + return out, nil +} + +func (r *refuelRepo) PrevFullRefuel(ctx context.Context, vehicleID uint64, before time.Time) (*model.RefuelRecord, error) { + var rec model.RefuelRecord + err := r.g.WithContext(ctx). + Where("vehicle_id = ? AND is_full = ? AND refuel_time < ?", vehicleID, true, before). + Order("refuel_time DESC, id DESC"). + First(&rec).Error + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, apperror.New(apperror.CodeNotFound, "此前没有加满油记录") + } + return nil, apperror.Wrap(apperror.CodeInternal, "查询前次加满记录失败", err) + } + return &rec, nil +} diff --git a/fuellog-api/internal/repository/vehicle.go b/fuellog-api/internal/repository/vehicle.go new file mode 100644 index 0000000..3d2c4b9 --- /dev/null +++ b/fuellog-api/internal/repository/vehicle.go @@ -0,0 +1,108 @@ +// Package repository 负责数据库访问。 +// +// 设计原则: +// - 每个 repo 都是接口 + GORM 实现,Service 持有接口便于单测替换 +// - 不在 repo 内做业务逻辑(比如不会去算油耗) +// - 错误统一包成 apperror.NotFound / apperror.Internal +package repository + +import ( + "context" + "errors" + + "gorm.io/gorm" + + "github.com/kennethcheng/fuellog-api/internal/model" + "github.com/kennethcheng/fuellog-api/pkg/apperror" +) + +// VehicleRepository 车辆表的数据访问接口。 +type VehicleRepository interface { + Create(ctx context.Context, v *model.Vehicle) error + Get(ctx context.Context, id uint64) (*model.Vehicle, error) + List(ctx context.Context) ([]model.Vehicle, error) + Update(ctx context.Context, v *model.Vehicle) error + Delete(ctx context.Context, id uint64) error + ClearDefault(ctx context.Context, tx *gorm.DB) error + SetDefault(ctx context.Context, tx *gorm.DB, id uint64) error +} + +// NewVehicleRepository 返回 GORM 实现。 +func NewVehicleRepository(g *gorm.DB) VehicleRepository { + return &vehicleRepo{g: g} +} + +type vehicleRepo struct{ g *gorm.DB } + +func (r *vehicleRepo) Create(ctx context.Context, v *model.Vehicle) error { + if err := r.g.WithContext(ctx).Create(v).Error; err != nil { + return apperror.Wrap(apperror.CodeInternal, "创建车辆失败", err) + } + return nil +} + +func (r *vehicleRepo) Get(ctx context.Context, id uint64) (*model.Vehicle, error) { + var v model.Vehicle + if err := r.g.WithContext(ctx).First(&v, id).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, apperror.New(apperror.CodeNotFound, "车辆不存在") + } + return nil, apperror.Wrap(apperror.CodeInternal, "查询车辆失败", err) + } + return &v, nil +} + +func (r *vehicleRepo) List(ctx context.Context) ([]model.Vehicle, error) { + var vs []model.Vehicle + if err := r.g.WithContext(ctx).Order("default_vehicle DESC, id ASC").Find(&vs).Error; err != nil { + return nil, apperror.Wrap(apperror.CodeInternal, "查询车辆列表失败", err) + } + return vs, nil +} + +func (r *vehicleRepo) Update(ctx context.Context, v *model.Vehicle) error { + res := r.g.WithContext(ctx).Save(v) + if res.Error != nil { + return apperror.Wrap(apperror.CodeInternal, "更新车辆失败", res.Error) + } + if res.RowsAffected == 0 { + return apperror.New(apperror.CodeNotFound, "车辆不存在") + } + return nil +} + +func (r *vehicleRepo) Delete(ctx context.Context, id uint64) error { + res := r.g.WithContext(ctx).Delete(&model.Vehicle{}, id) + if res.Error != nil { + return apperror.Wrap(apperror.CodeInternal, "删除车辆失败", res.Error) + } + if res.RowsAffected == 0 { + return apperror.New(apperror.CodeNotFound, "车辆不存在") + } + return nil +} + +// ClearDefault 在事务内把当前所有 default_vehicle 置为 false。 +// 由 service 在切换默认车辆时调用,避免出现两个默认车辆。 +func (r *vehicleRepo) ClearDefault(ctx context.Context, tx *gorm.DB) error { + if err := tx.WithContext(ctx).Model(&model.Vehicle{}). + Where("default_vehicle = ?", true). + Update("default_vehicle", false).Error; err != nil { + return apperror.Wrap(apperror.CodeInternal, "清除默认车辆标记失败", err) + } + return nil +} + +// SetDefault 在事务内把指定车辆置为默认。 +func (r *vehicleRepo) SetDefault(ctx context.Context, tx *gorm.DB, id uint64) error { + res := tx.WithContext(ctx).Model(&model.Vehicle{}). + Where("id = ?", id). + Update("default_vehicle", true) + if res.Error != nil { + return apperror.Wrap(apperror.CodeInternal, "设置默认车辆失败", res.Error) + } + if res.RowsAffected == 0 { + return apperror.New(apperror.CodeNotFound, "车辆不存在") + } + return nil +}