check for jp vin before insert

Author: JamesReate

internal/core/queries/decode_vin.go

@@ -433,18 +433,24 @@ func (dc DecodeVINQueryHandler) processDeviceStyle(ctx context.Context, vinInfo
 }
 
 func (dc DecodeVINQueryHandler) saveVinDecodeNumber(ctx context.Context, vin shared.VIN, vinInfo *coremodels.VINDecodingInfoData, resp *p_grpc.DecodeVinResponse) error {
+	jpVIN := false
+	if len(vin.String()) < 17 {
+		jpVIN = true
+	}
 	vinDecodeNumber := &models.VinNumber{
 		Vin:              vin.String(),
 		ManufacturerName: resp.Manufacturer,
 		Wmi:              null.StringFrom(vin.Wmi()),
-		VDS:              null.StringFrom(vin.VDS()),
-		Vis:              null.StringFrom(vin.VIS()),
-		CheckDigit:       null.StringFrom(vin.CheckDigit()),
-		SerialNumber:     vin.SerialNumber(),
 		DecodeProvider:   null.StringFrom(string(vinInfo.Source)),
 		Year:             int(resp.Year),
 		DefinitionID:     resp.DefinitionId,
 	}
+	if !jpVIN {
+		vinDecodeNumber.VDS = null.StringFrom(vin.VDS())
+		vinDecodeNumber.Vis = null.StringFrom(vin.VIS())
+		vinDecodeNumber.SerialNumber = vin.SerialNumber()
+		vinDecodeNumber.CheckDigit = null.StringFrom(vin.CheckDigit())
+	}
 
 	// Optional fields based on response and VIN info
 	if len(resp.DeviceStyleId) > 0 {
@@ -468,6 +474,10 @@ func (dc DecodeVINQueryHandler) saveVinDecodeNumber(ctx context.Context, vin sha
 		if len(vinInfo.Raw) > 0 {
 			vinDecodeNumber.DatgroupData = null.JSONFrom(vinInfo.Raw)
 		}
+	case coremodels.Japan17VIN:
+		if len(vinInfo.Raw) > 0 {
+			vinDecodeNumber.Vin17Data = null.JSONFrom(vinInfo.Raw)
+		}
 	}
 
 	// Insert VIN decode number into the database