Prefer fetch-api device definition documents over DB fields

charts/identity-api/values-prod.yaml

@@ -25,6 +25,7 @@ env:
   SACD_ADDRESS: '0x3c152B5d96769661008Ff404224d6530FCAC766d'
   DEV_LICENSE_ADDR: '0x9A9D2E717bB005B240094ba761Ff074d392C7C85'
   STAKING_ADDR: '0xB4538A8D6AFab2849Ef78D08D49Dc1cc5AC2eD83'
+  FETCH_API_GRPC_ADDR: 'fetch-api-prod:8086'
 ingress:
   enabled: true
   className: nginx

charts/identity-api/values.yaml

@@ -52,6 +52,7 @@ env:
   CONNECTION_ADDR: '0x41799E9Dc893722844E771a1C1cAf3BBc2876132'
   STORAGE_NODE_ADDR: '0xf76eEBa34B19aDb7eEa9E4Eea05243D7E5a30123'
   TEMPLATE_ADDR: '0x0000000000000000000000000000000000000000'
+  FETCH_API_GRPC_ADDR: 'fetch-api-dev:8086'
 service:
   type: ClusterIP
   ports:

cmd/identity-api/main.go

@@ -74,7 +74,7 @@ func main() {
 
 	s := newDefaultServer(graph.NewExecutableSchema(cfg))
 
-	srv := loader.Middleware(dbs, s, settings)
+	srv := loader.Middleware(dbs, s, settings, &repoLogger)
 
 	http.Handle("/", playground.Handler("GraphQL playground", "/query"))
 	http.Handle("/query", srv)

go.mod

@@ -69,7 +69,7 @@ require (
 	github.com/ethereum/go-verkle v0.2.2 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
@@ -135,11 +135,11 @@ require (
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/volatiletech/sqlboiler v3.7.1+incompatible
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
@@ -151,8 +151,9 @@ require (
 	golang.org/x/time v0.9.0 // indirect
 	golang.org/x/tools v0.40.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
+	google.golang.org/grpc v1.78.0
+	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
@@ -162,6 +163,7 @@ require (
 	github.com/urfave/cli/v3 v3.6.1 // indirect
 	github.com/volatiletech/inflect v0.0.1 // indirect
 	github.com/volatiletech/null v8.0.0+incompatible // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
 )
 
 tool github.com/DIMO-Network/eventgen

go.sum

@@ -165,6 +165,8 @@ github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -459,20 +461,28 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
 go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
 go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
 go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
 go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
 go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
 go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
 go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
@@ -562,10 +572,15 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6f
 google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e h1:Ao9GzfUMPH3zjVfzXG5rlWlk+Q8MXWKwWpwVQE1MXfw=
 google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
 google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
 google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
+google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

graph/dcn_test.go

@@ -88,7 +88,7 @@ func TestDCNQuery(t *testing.T) {
 
 	require.NoError(err)
 	cfg := Config{Resolvers: resolver}
-	c := client.New(loader.Middleware(pdb, NewDefaultServer(NewExecutableSchema(cfg)), settings))
+	c := client.New(loader.Middleware(pdb, NewDefaultServer(NewExecutableSchema(cfg)), settings, &logger))
 
 	type response struct {
 		DCN struct {

graph/resolver.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/DIMO-Network/identity-api/graph/model"
+	"github.com/DIMO-Network/identity-api/internal/loader"
 	"github.com/DIMO-Network/identity-api/internal/repositories/accountsacd"
 	"github.com/DIMO-Network/identity-api/internal/repositories/aftermarket"
 	"github.com/DIMO-Network/identity-api/internal/repositories/base"
@@ -21,6 +22,7 @@ import (
 	"github.com/DIMO-Network/identity-api/internal/repositories/vehiclesacd"
 	"github.com/DIMO-Network/identity-api/internal/services"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/rs/zerolog"
 )
 
 //go:generate go run github.com/99designs/gqlgen generate
@@ -134,6 +136,8 @@ type Resolver struct {
 	connection       ConnectionRepository
 	template         TemplateRepository
 	accountsacd      AccountSacdRepository
+	vehicleDefFetch  loader.VehicleDefinitionFetcher
+	log              *zerolog.Logger
 }
 
 // NewResolver creates a new Resolver with allocated repositories.
@@ -155,5 +159,7 @@ func NewResolver(baseRepo *base.Repository) *Resolver {
 		connection:       connection.New(baseRepo),
 		template:         template.New(baseRepo),
 		accountsacd:      &accountsacd.Repository{Repository: baseRepo},
+		vehicleDefFetch:  loader.NewVehicleDefinitionFetcher(baseRepo.Settings, baseRepo.Log),
+		log:              baseRepo.Log,
 	}
 }

graph/resolver_test.go

@@ -114,7 +114,7 @@ func TestResolver(t *testing.T) {
 	logger := zerolog.Nop()
 	repo := base.NewRepository(pdb, settings, &logger)
 	resolver := NewResolver(repo)
-	c := client.New(loader.Middleware(pdb, NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolver})), settings))
+	c := client.New(loader.Middleware(pdb, NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolver})), settings, &logger))
 
 	t.Run("ownedAftermarketDevices, return only one response", func(t *testing.T) {
 		var resp interface{}

graph/rewards_test.go

@@ -215,7 +215,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate() {
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -391,7 +391,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_FwdPaginate_Firs
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -596,7 +596,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -801,7 +801,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetEarningsByVehicle_BackPaginate_Las
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -964,7 +964,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetAftermarketDeviceEarnings_FwdPagin
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -1115,7 +1115,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_FwdPaginate() {
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -1288,7 +1288,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_BackPaginate_LastBefor
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)
 
@@ -1418,7 +1418,7 @@ func (r *RewardsQueryTestSuite) Test_Query_GetUserRewards_NullEarnings() {
 	c := client.New(
 		loader.Middleware(
 			r.pdb,
-			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings,
+			NewDefaultServer(NewExecutableSchema(Config{Resolvers: r.resolver})), r.settings, r.repo.Log,
 		),
 	)