use identity for definition check

Author: JamesReate

cmd/device-definitions-api/add_vins_csv.go

@@ -16,6 +16,7 @@ import (
 	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/gateways"
 	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/sender"
 	"github.com/DIMO-Network/shared/pkg/db"
+	"github.com/DIMO-Network/shared/pkg/logfields"
 	stringutils "github.com/DIMO-Network/shared/pkg/strings"
 	vinutils "github.com/DIMO-Network/shared/pkg/vin"
 	"github.com/aarondl/null/v8"
@@ -30,7 +31,8 @@ type addVINsCSVCmd struct {
 	logger   zerolog.Logger
 	settings config.Settings
 
-	sender sender.Sender
+	sender   sender.Sender
+	identity gateways.IdentityAPI
 }
 
 func (*addVINsCSVCmd) Name() string { return "addvinscsv" }
@@ -156,29 +158,18 @@ func (p *addVINsCSVCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...inter
 			errorCount++
 			continue
 		}
+
 		// Verify the device definition exists
-		manufacturer, err := onChainSvc.GetManufacturer(stringutils.SlugString(wmi.ManufacturerName))
-		if err != nil {
-			p.logger.Error().Err(err).Str("vin", vin).Str("manufacturer", wmi.ManufacturerName).Msg("Could not find manufacturer")
+		deviceDefinition, err := p.identity.GetDeviceDefinitionByID(definitionID)
+		if err != nil || deviceDefinition == nil {
+			if err != nil {
+				p.logger.Error().Err(err).Str(logfields.DefinitionID, definitionID).Msg("Could not find definition")
+			}
 			fmt.Printf("Error: Could not find manufacturer '%s' for VIN '%s': %v\n", wmi.ManufacturerName, vin, err)
 			errorCount++
 			continue
 		}
 
-		deviceDefinition, err := onChainSvc.GetDefinitionTableland(ctx, big.NewInt(int64(manufacturer.TokenID)), definitionID)
-		if err != nil {
-			p.logger.Error().Err(err).Str("vin", vin).Str("definitionID", definitionID).Msg("Could not find device definition")
-			fmt.Printf("Error: Could not find device definition '%s' for VIN '%s': %v\n", definitionID, vin, err)
-			errorCount++
-			continue
-		}
-		if deviceDefinition == nil {
-			p.logger.Error().Str("vin", vin).Str("definitionID", definitionID).Msg("Device definition not found")
-			fmt.Printf("Error: Device definition '%s' not found for VIN '%s'\n", definitionID, vin)
-			errorCount++
-			continue
-		}
-
 		vinNumber := models.VinNumber{
 			Vin:              vin,
 			Wmi:              null.StringFrom(processedVIN.Wmi()),

cmd/device-definitions-api/main.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 
+	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/gateways"
 	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/sender"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/kms"
@@ -43,13 +44,14 @@ func main() {
 		Str("git-sha1", gitSha1).
 		Logger()
 	sigSender, err := createSender(ctx, &settings, &logger)
+	identity := gateways.NewIdentityAPIService(&logger, &settings)
 
 	subcommands.Register(subcommands.HelpCommand(), "")
 	subcommands.Register(subcommands.FlagsCommand(), "")
 	subcommands.Register(subcommands.CommandsCommand(), "")
 	subcommands.Register(&migrateDBCmd{logger: logger, settings: settings}, "")
 	subcommands.Register(&addVINCmd{logger: logger, settings: settings}, "")
-	subcommands.Register(&addVINsCSVCmd{logger: logger, settings: settings, sender: sigSender}, "")
+	subcommands.Register(&addVINsCSVCmd{logger: logger, settings: settings, sender: sigSender, identity: identity}, "")
 	subcommands.Register(&decodeVINCmd{logger: &logger, settings: &settings}, "")
 	subcommands.Register(&syncDeviceDefinitionSearchCmd{logger: logger, settings: settings, sender: sigSender}, "")
 	subcommands.Register(&deleteDefinition{logger: logger, settings: settings}, "")

internal/core/models/manufacturer.go

@@ -6,3 +6,10 @@ type Manufacturer struct {
 	TableID int    `json:"tableId"`
 	Owner   string `json:"owner"`
 }
+
+type DeviceDefinition struct {
+	DeviceDefinitionID string       `json:"deviceDefinitionId"`
+	Manufacturer       Manufacturer `json:"manufacturer"`
+	Model              string       `json:"model"`
+	Year               int          `json:"year"`
+}

internal/infrastructure/gateways/identity_api.go

@@ -1,11 +1,11 @@
 package gateways
 
 import (
+	"fmt"
 	"time"
 
-	coremodels "github.com/DIMO-Network/device-definitions-api/internal/core/models"
-
 	"github.com/DIMO-Network/device-definitions-api/internal/config"
+	coremodels "github.com/DIMO-Network/device-definitions-api/internal/core/models"
 	"github.com/DIMO-Network/shared/pkg/http"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
@@ -24,6 +24,7 @@ type identityAPIService struct {
 type IdentityAPI interface {
 	GetManufacturer(slug string) (*coremodels.Manufacturer, error)
 	GetManufacturers() ([]coremodels.Manufacturer, error)
+	GetDeviceDefinitionByID(id string) (*coremodels.DeviceDefinition, error)
 }
 
 // NewIdentityAPIService creates a new instance of IdentityAPI, initializing it with the provided logger, settings, and HTTP client.
@@ -92,6 +93,34 @@ func (i *identityAPIService) GetManufacturers() ([]coremodels.Manufacturer, erro
 	return wrapper.Data.Manufacturers.Nodes, nil
 }
 
+func (i *identityAPIService) GetDeviceDefinitionByID(id string) (*coremodels.DeviceDefinition, error) {
+	graphqlQuery := fmt.Sprintf(DeviceDefinitionByIDQuery, id)
+
+	var wrapper struct {
+		Data struct {
+			DeviceDefinition coremodels.DeviceDefinition `json:"deviceDefinition"`
+		} `json:"data"`
+	}
+
+	err := i.httpClient.GraphQLQuery("", graphqlQuery, &wrapper)
+	if err != nil {
+		return nil, err
+	}
+	return &wrapper.Data.DeviceDefinition, nil
+}
+
 type GraphQLRequest struct {
 	Query string `json:"query"`
 }
+
+const DeviceDefinitionByIDQuery = `{
+	deviceDefinition(by: {id: "%s"}) {
+    	deviceDefinitionId
+    	manufacturer {
+      		name
+      		tokenId
+    	}
+    	model
+    	year
+  	}
+}`