Skip to content

Commit 8e81dc5

Browse files
JamesReateJamesReate
committed
get manufactuer by slug with change in identity-api
1 parent bb83889 commit 8e81dc5

18 files changed

Lines changed: 52 additions & 56 deletions

‎cmd/device-definitions-api/add_vin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
117117
return subcommands.ExitFailure
118118
}
119119

120-
manufacturer, err := onChainSvc.GetManufacturer(ctx, stringutils.SlugString(wmi.ManufacturerName), pdb.DBS().Reader)
120+
manufacturer, err := onChainSvc.GetManufacturer(stringutils.SlugString(wmi.ManufacturerName))
121121
if err != nil {
122122
fmt.Println(err.Error())
123123
return subcommands.ExitFailure

‎cmd/device-definitions-api/delete_dd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (p *deleteDefinition) Execute(ctx context.Context, _ *flag.FlagSet, _ ...in
8888
fmt.Println("Transaction status: ", trxFinished)
8989
if loops > 10 {
9090
// get device definition from on chain to see if maybe got created but trx still showing false
91-
onchainDD, _, err := deviceDefinitionOnChainService.GetDefinitionByID(ctx, id, pdb.DBS().Reader)
91+
onchainDD, _, err := deviceDefinitionOnChainService.GetDefinitionByID(ctx, id)
9292
fmt.Println("onchainDD: ", onchainDD, err)
9393
if onchainDD != nil {
9494
break

‎cmd/device-definitions-api/sync_device_definition_search.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (p *syncDeviceDefinitionSearchCmd) Execute(ctx context.Context, _ *flag.Fla
160160
var documents []SearchEntryItem
161161
// iterate over all makes, then query tableland
162162
for _, dm := range makes {
163-
manufacturer, err := onChainSvc.GetManufacturer(ctx, dm.NameSlug, pdb.DBS().Reader)
163+
manufacturer, err := onChainSvc.GetManufacturer(dm.NameSlug)
164164
if err != nil {
165165
p.logger.Fatal().Err(err).Send()
166166
}

‎internal/core/queries/decode_vin.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (dc DecodeVINQueryHandler) Handle(ctx context.Context, query mediator.Messa
120120
// If DefinitionID passed in, override VIN decoding
121121
localLog.Info().Msgf("Start Decode VIN for vin %s and device definition %s", vin.String(), qry.DefinitionID)
122122
if len(qry.DefinitionID) > 0 {
123-
tblDef, _, err := dc.deviceDefinitionOnChainService.GetDefinitionByID(ctx, qry.DefinitionID, dc.dbs().Reader)
123+
tblDef, _, err := dc.deviceDefinitionOnChainService.GetDefinitionByID(ctx, qry.DefinitionID)
124124
if err != nil {
125125
return nil, errors.Wrapf(err, "failed to get device definition id: %s", qry.DefinitionID)
126126
}
@@ -247,7 +247,7 @@ func (dc DecodeVINQueryHandler) Handle(ctx context.Context, query mediator.Messa
247247
tid := common.DeviceDefinitionSlug(stringutils.SlugString(vinInfo.Make), modelSlug, int16(vinInfo.Year))
248248
resp.DefinitionId = tid
249249

250-
tblDef, _, errTbl := dc.deviceDefinitionOnChainService.GetDefinitionByID(ctx, tid, dc.dbs().Reader)
250+
tblDef, _, errTbl := dc.deviceDefinitionOnChainService.GetDefinitionByID(ctx, tid)
251251
if errTbl != nil {
252252
dc.logger.Warn().Err(errTbl).Msgf("failed to get definition from tableland for vin: %s, id: %s", vin.String(), tid)
253253
} else if tblDef == nil {
@@ -356,7 +356,7 @@ func (dc DecodeVINQueryHandler) hydrateResponseFromVinNumber(vn *models.VinNumbe
356356
// call on-chain svc to get the DD and pull out the powertrain
357357
pt := ""
358358
trx := ""
359-
tblDef, manufID, err := dc.deviceDefinitionOnChainService.GetDefinitionByID(context.Background(), vn.DefinitionID, dc.dbs().Reader)
359+
tblDef, manufID, err := dc.deviceDefinitionOnChainService.GetDefinitionByID(context.Background(), vn.DefinitionID)
360360
if err == nil && tblDef != nil {
361361
for _, attribute := range tblDef.Metadata.DeviceAttributes {
362362
if attribute.Name == common.PowerTrainType {

‎internal/core/queries/decode_vin_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_WithExistingDD_UpdatesAt
146146
definitionID := dd.ID
147147
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
148148
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return("ICE")
149-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
149+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
150150
buildTestTblDD(definitionID, dd.Model, int(dd.Year)), nil, nil)
151151
wmiDb := &models.Wmi{
152152
Wmi: vin[:3],
@@ -255,7 +255,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_CreatesDD_WithMismatchWM
255255
vinDecodingInfoData.MetaData = null.JSONFrom(metaData)
256256

257257
styleLevelPT := "PHEV"
258-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
258+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
259259
nil, nil, nil) // should return nil b/c doesn't exist
260260
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
261261
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return(styleLevelPT)
@@ -324,7 +324,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_JapanChassisNumber_exist
324324
err := vinNumb.Insert(s.ctx, s.pdb.DBS().Writer, boil.Infer())
325325
s.Require().NoError(err)
326326
// mock setup for powertrain lookup, which is in the vin decode response
327-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), dd.ID, gomock.Any()).Return(
327+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), dd.ID).Return(
328328
&coremodels.DeviceDefinitionTablelandModel{
329329
ID: dd.ID,
330330
Model: dd.Model,
@@ -409,7 +409,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_CreatesDD() {
409409
vinDecodingInfoData.MetaData = null.JSONFrom(metaData)
410410

411411
styleLevelPT := "PHEV"
412-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
412+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
413413
nil, nil, nil) // should return nil b/c doesn't exist
414414
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
415415
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return(styleLevelPT)
@@ -527,7 +527,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_WithExistingDD_AndStyleA
527527

528528
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
529529
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return("HEV")
530-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
530+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
531531
buildTestTblDD(definitionID, dd.Model, int(dd.Year)), nil, nil)
532532
// db setup
533533
ds := dbtesthelper.SetupCreateStyle(s.T(), definitionID, buildStyleName(vinInfoResp), "drivly", vinInfoResp.SubModel, s.pdb)
@@ -621,7 +621,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_WithExistingWMI() {
621621

622622
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
623623
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return("HEV")
624-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
624+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
625625
buildTestTblDD(definitionID, dd.Model, int(dd.Year)), nil, nil)
626626

627627
image := gateways.FuelImage{
@@ -674,7 +674,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_TeslaDecode() {
674674

675675
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.TeslaProvider, "USA").Times(1).Return(vinDecodingInfoData, nil)
676676
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo(vinDecodingInfoData.StyleName, vinDecodingInfoData.FuelType).Return("BEV")
677-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
677+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
678678
buildTestTblDD(definitionID, dd.Model, dd.Year), nil, nil)
679679

680680
image := gateways.FuelImage{
@@ -732,7 +732,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_WithExistingVINNumber()
732732
err = vinNumb.Insert(s.ctx, s.pdb.DBS().Writer, boil.Infer())
733733
s.Require().NoError(err)
734734
// mock needed for powertrain lookup
735-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), dd.ID, gomock.Any()).Return(
735+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), dd.ID).Return(
736736
&coremodels.DeviceDefinitionTablelandModel{
737737
ID: dd.ID,
738738
Model: dd.Model,
@@ -772,7 +772,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_InvalidVINYear_AutoIso()
772772
definitionID := "ford_escape_2017"
773773
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
774774
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo("", "").Return("ICE") // normally this would return ""
775-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
775+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
776776
buildTestTblDD(definitionID, "Escape", 2021), nil, nil)
777777
wmiDb := &models.Wmi{
778778
Wmi: vin[:3],
@@ -814,7 +814,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_InvalidStyleName_AutoIso
814814
definitionID := "ford_escape_2017"
815815
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(vinDecodingInfoData, nil)
816816
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo("1", "").Return("ICE")
817-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
817+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
818818
buildTestTblDD(definitionID, "Escape", 2017), nil, nil)
819819
wmiDb := &models.Wmi{
820820
Wmi: vin[:3],
@@ -871,7 +871,7 @@ func (s *DecodeVINQueryHandlerSuite) TestHandle_Success_DecodeKnownFallback() {
871871
s.mockVINService.EXPECT().GetVIN(ctx, vin, gomock.Any(), coremodels.AllProviders, "USA").Times(1).Return(nil, fmt.Errorf("unable to decode"))
872872
s.mockPowerTrainTypeService.EXPECT().ResolvePowerTrainFromVinInfo("", "").Return("ICE")
873873

874-
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID, gomock.Any()).Return(
874+
s.mockDeviceDefinitionOnChainService.EXPECT().GetDefinitionByID(gomock.Any(), definitionID).Return(
875875
buildTestTblDD(definitionID, "Bronco", 20222), nil, nil)
876876

877877
image := gateways.FuelImage{

‎internal/core/queries/get_dd_all_by_make_year_range.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewGetAllDeviceDefinitionByMakeYearRangeQueryHandler(onChainSvc gateways.De
4040
func (ch GetAllDeviceDefinitionByMakeYearRangeQueryHandler) Handle(ctx context.Context, query mediator.Message) (interface{}, error) {
4141
qry := query.(*GetAllDeviceDefinitionByMakeYearRangeQuery)
4242
makeSlug := stringutils.SlugString(qry.Make)
43-
manufacturer, err := ch.onChainSvc.GetManufacturer(ctx, makeSlug, ch.dbs().Reader)
43+
manufacturer, err := ch.onChainSvc.GetManufacturer(makeSlug)
4444
if err != nil {
4545
return nil, err
4646
}

‎internal/core/queries/get_dd_by_id.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (ch GetDeviceDefinitionByIDQueryHandler) Handle(ctx context.Context, query
3333

3434
qry := query.(*GetDeviceDefinitionByIDQuery)
3535

36-
dd, _, err := ch.onChainSvc.GetDefinitionByID(ctx, qry.DeviceDefinitionID, ch.dbs().Reader)
36+
dd, _, err := ch.onChainSvc.GetDefinitionByID(ctx, qry.DeviceDefinitionID)
3737

3838
if err != nil {
3939
return nil, err

‎internal/core/queries/get_dd_by_id_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (ch GetDeviceDefinitionByIDQueryV2Handler) Handle(ctx context.Context, quer
3333

3434
qry := query.(*GetDeviceDefinitionByIDQueryV2)
3535

36-
dd, _, err := ch.ddOnChainSvc.GetDefinitionByID(ctx, qry.DefinitionID, ch.dbs().Reader)
36+
dd, _, err := ch.ddOnChainSvc.GetDefinitionByID(ctx, qry.DefinitionID)
3737

3838
if err != nil {
3939
return nil, err

‎internal/core/queries/get_dd_by_ids.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (ch GetDeviceDefinitionByIDsQueryHandler) Handle(ctx context.Context, query
5353
}
5454

5555
for _, ddid := range qry.DeviceDefinitionID {
56-
dd, manufID, err := ch.onChainSvc.GetDefinitionByID(ctx, ddid, ch.dbs().Reader)
56+
dd, manufID, err := ch.onChainSvc.GetDefinitionByID(ctx, ddid)
5757
if err != nil {
5858
return nil, err
5959
}

‎internal/core/queries/get_dd_by_make_model_year.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (ch GetDeviceDefinitionByMakeModelYearQueryHandler) Handle(ctx context.Cont
4242

4343
qry := query.(*GetDeviceDefinitionByMakeModelYearQuery)
4444
makeSlug := stringutils.SlugString(qry.Make)
45-
manufacturer, err := ch.onChainSvc.GetManufacturer(ctx, makeSlug, ch.dbs().Reader)
45+
manufacturer, err := ch.onChainSvc.GetManufacturer(makeSlug)
4646
if err != nil {
4747
return nil, err
4848
}

0 commit comments

Comments
 (0)