Return manuf and model on decode, cleanup code from before (#281)

* return manuf and model on decode, cleanup code from before

* add manufacturer, some more comments, change to use legacy ksuid

* fixes and comments for later

* add styles definitionid, db changes

* continue removing old ksuid and change fkeys

* deprecate stuff, fix compilation, pending fix tests

* fix name changes, add definition_trxs

* store transactions

* delete more integration features code, update tests, lint errors

* track all on-chain trxs

* remove unused routes

* remove more

* swagger updates

* drop device definitions, consequences look do-able

* decode VIN refactored & re-worked

* remove unused grpc calls, migrate more calls to use tableland for dd

* remove more unused stuff

* delete more old code, migrate stuff

* more

* keep resolinvg issues

* change get device style to use on chain dd

* refactor and move over more funcs to use on-chain stuff

* implement custom tableland query

* query by make year and range impl

* continue changing dependencies to use on chain

* re-implement sync search with tbland

* re implement add_vin

* move presentation objects to avoid import cycles

* move more stuff around for iport cycles

* fix import cylce, refactor

* linter and swag

* fixes to get tests passing, db index

* fix remaining tests

* lint, tests, refactor

Author: JamesReate

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           only-new-issues: false

.golangci.yml

@@ -1,61 +1,52 @@
-run:
-  timeout: 5m
+version: "2"
 linters:
   enable:
     - prealloc
     - revive
-    - goimports
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    - zerologlint
     - tagliatelle
-
+    - zerologlint
+  settings:
+    tagliatelle:
+      case:
+        rules:
+          json: camel
+          yaml: upperSnake
+        use-field-name: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - revive
+          - tagliatelle
+        path: internal/infrastructure/gateways/datgroup_api_service.go
+    paths:
+      - pkg/grpc
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   fix: true
-  exclude-dirs:
-    - pkg/grpc
-  exclude-rules:
-    - path: 'internal/infrastructure/gateways/datgroup_api_service.go'
-      linters:
-        - tagliatelle
-        - revive
-
-output:
-  print-issued-lines: true
-
-linters-settings:
-  gci:
-    # Section configuration to compare against.
-    # Section names are case-insensitive and may contain parameters in ().
-    # The default order of sections is `standard > default > custom > blank > dot`,
-    # If `custom-order` is `true`, it follows the order of `sections` option.
-    # Default: ["standard", "default"]
-    sections:
-      - standard # Standard section: captures all standard packages.
-      - default # Default section: contains all imports that could not be matched to another section type.
-      - prefix(github.com/DIMO-Network/device-definitions-api) # Custom section: groups all imports with the specified Prefix.
-      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
-      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
-    # Skip generated files.
-    # Default: true
-    skip-generated: true
-    # Enable custom order of sections.
-    # If `true`, make the section order the same as the order of `sections`.
-    # Default: false
-    custom-order: false
-  tagliatelle:
-    # Check the struck tag name case.
-    case:
-      # Use the struct field name to check the name of the struct tag.
-      # Default: false
-      use-field-name: true
-      rules:
-        # Any struct tag type can be used.
-        # Support string case: `camel`, `pascal`, `kebab`, `snake`, `upperSnake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`.
-        json: camel
-        yaml: upperSnake
+formatters:
+  enable:
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/DIMO-Network/device-definitions-api)
+        - blank
+        - dot
+      custom-order: false
+  exclusions:
+    generated: lax
+    paths:
+      - pkg/grpc
+      - third_party$
+      - builtin$
+      - examples$

cmd/device-definitions-api/add_vin.go

@@ -6,11 +6,19 @@ import (
 	"database/sql"
 	"flag"
 	"fmt"
+	"math/big"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/DIMO-Network/device-definitions-api/internal/core/common"
+	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/gateways"
+	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/sender"
+	"github.com/ethereum/go-ethereum/ethclient"
+
+	"github.com/volatiletech/sqlboiler/v4/queries/qm"
+
 	"github.com/DIMO-Network/device-definitions-api/internal/config"
 	"github.com/DIMO-Network/device-definitions-api/internal/infrastructure/db/models"
 	"github.com/DIMO-Network/shared"
@@ -25,6 +33,8 @@ import (
 type addVINCmd struct {
 	logger   zerolog.Logger
 	settings config.Settings
+
+	sender sender.Sender
 }
 
 func (*addVINCmd) Name() string     { return "addvin" }
@@ -52,6 +62,17 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
 	pdb := db.NewDbConnectionFromSettings(ctx, &p.settings.DB, true)
 	pdb.WaitForDB(p.logger)
 
+	ethClient, err := ethclient.Dial(p.settings.EthereumRPCURL.String())
+	if err != nil {
+		p.logger.Fatal().Err(err).Msg("Failed to create Ethereum client.")
+	}
+
+	chainID, err := ethClient.ChainID(ctx)
+	if err != nil {
+		p.logger.Fatal().Err(err).Msg("Couldn't retrieve chain id.")
+	}
+	onChainSvc := gateways.NewDeviceDefinitionOnChainService(&p.settings, &p.logger, ethClient, chainID, p.sender, pdb.DBS)
+
 	vinDecodeNumber, err := models.FindVinNumber(ctx, pdb.DBS().Reader, vin)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		p.logger.Fatal().Err(err).Send()
@@ -62,21 +83,21 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
 		return subcommands.ExitSuccess
 	}
 	processedVIN := shared.VIN(vin)
-	wmi, err := models.Wmis(models.WmiWhere.Wmi.EQ(processedVIN.Wmi())).One(ctx, pdb.DBS().Reader)
+	wmi, err := models.Wmis(models.WmiWhere.Wmi.EQ(processedVIN.Wmi()), qm.Load(models.WmiRels.DeviceMake)).One(ctx, pdb.DBS().Reader)
 	if err != nil {
 		fmt.Println("could not find WMI for vin")
 		return subcommands.ExitFailure
 	}
 	vinNumber := models.VinNumber{
-		Vin:            vin,
-		Wmi:            processedVIN.Wmi(),
-		VDS:            processedVIN.VDS(),
-		CheckDigit:     processedVIN.CheckDigit(),
-		SerialNumber:   processedVIN.SerialNumber(),
-		Vis:            processedVIN.VIS(),
-		DeviceMakeID:   wmi.DeviceMakeID,
-		DecodeProvider: null.StringFrom("manual"),
-		Year:           processedVIN.Year(),
+		Vin:              vin,
+		Wmi:              processedVIN.Wmi(),
+		VDS:              processedVIN.VDS(),
+		CheckDigit:       processedVIN.CheckDigit(),
+		SerialNumber:     processedVIN.SerialNumber(),
+		Vis:              processedVIN.VIS(),
+		ManufacturerName: wmi.R.DeviceMake.Name,
+		DecodeProvider:   null.StringFrom("manual"),
+		Year:             processedVIN.Year(),
 	}
 	if vinNumber.Year == 0 || vinNumber.Year < 2008 || vinNumber.Year > time.Now().Year() {
 		year, err := cmdLineInput("enter model year")
@@ -97,14 +118,19 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
 		return subcommands.ExitFailure
 	}
 
-	deviceDefinition, err := models.DeviceDefinitions(models.DeviceDefinitionWhere.Model.EQ(model),
-		models.DeviceDefinitionWhere.DeviceMakeID.EQ(vinNumber.DeviceMakeID),
-		models.DeviceDefinitionWhere.Year.EQ(int16(vinNumber.Year))).One(ctx, pdb.DBS().Reader)
+	manufacturer, err := onChainSvc.GetManufacturer(ctx, wmi.R.DeviceMake.NameSlug, pdb.DBS().Reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return subcommands.ExitFailure
+	}
+	definitionID := common.DeviceDefinitionSlug(wmi.R.DeviceMake.NameSlug, shared.SlugString(model), int16(vinNumber.Year))
+	deviceDefinition, err := onChainSvc.GetDefinitionTableland(ctx, big.NewInt(int64(manufacturer.TokenID)), definitionID)
+
 	if err != nil {
 		fmt.Println(err.Error() + " " + model + " " + strconv.Itoa(vinNumber.Year))
 		return subcommands.ExitFailure
 	}
-	vinNumber.DefinitionID = deviceDefinition.NameSlug
+	vinNumber.DefinitionID = deviceDefinition.ID
 
 	err = vinNumber.Insert(ctx, pdb.DBS().Writer, boil.Infer())
 	if err != nil {