Mtx failed

internal/controllers/user_devices_controller.go

@@ -1394,7 +1394,7 @@ func (udc *UserDevicesController) PostMintDevice(c *fiber.Ctx) error {
 	userDevice, err := models.UserDevices(
 		models.UserDeviceWhere.ID.EQ(userDeviceID),
 		qm.Load(qm.Rels(models.UserDeviceRels.VehicleNFT, models.VehicleNFTRels.MintRequest)),
-		qm.Load(qm.Rels(models.UserDeviceRels.UserDeviceAPIIntegrations)),
+		qm.Load(models.UserDeviceRels.UserDeviceAPIIntegrations),
 	).One(c.Context(), udc.DBS().Reader.DB)
 	if err != nil {
 		if err == sql.ErrNoRows {
@@ -1405,27 +1405,34 @@ func (udc *UserDevicesController) PostMintDevice(c *fiber.Ctx) error {
 
 	if vnft := userDevice.R.VehicleNFT; vnft != nil {
 		switch vnft.R.MintRequest.Status {
-		case "Confirmed":
+		case models.MetaTransactionRequestStatusConfirmed:
 			return fiber.NewError(fiber.StatusConflict, "Vehicle already minted.")
-		default:
+		case models.MetaTransactionRequestStatusUnsubmitted,
+			models.MetaTransactionRequestStatusSubmitted,
+			models.MetaTransactionRequestStatusMined:
 			return fiber.NewError(fiber.StatusConflict, "Minting in process.")
+		case models.MetaTransactionRequestStatusFailed:
+			_, err := vnft.Delete(c.Context(), udc.DBS().Writer)
+			if err != nil {
+				return fmt.Errorf("couldn't delete old, failed mint request: %w", err)
+			}
 		}
 	}
 
 	if !userDevice.VinConfirmed {
 		return fiber.NewError(fiber.StatusConflict, "VIN not confirmed.")
 	}
 
-	dd, err2 := udc.DeviceDefSvc.GetDeviceDefinitionByID(c.Context(), userDevice.DeviceDefinitionID)
-	if err2 != nil {
-		return shared.GrpcErrorToFiber(err2, fmt.Sprintf("error querying for device definition id: %s ", userDevice.DeviceDefinitionID))
+	dd, err := udc.DeviceDefSvc.GetDeviceDefinitionByID(c.Context(), userDevice.DeviceDefinitionID)
+	if err != nil {
+		return shared.GrpcErrorToFiber(err, fmt.Sprintf("error querying for device definition id: %s", userDevice.DeviceDefinitionID))
 	}
 
 	if dd.Make.TokenId == 0 {
 		return fiber.NewError(fiber.StatusConflict, "Device make not yet minted.")
 	}
 
-	makeTokenID := big.NewInt(int64(dd.Make.TokenId))
+	makeTokenID := new(big.Int).SetUint64(dd.Make.TokenId)
 
 	user, err := udc.usersClient.GetUser(c.Context(), &pb.GetUserRequest{Id: userID})
 	if err != nil {
@@ -1458,8 +1465,8 @@ func (udc *UserDevicesController) PostMintDevice(c *fiber.Ctx) error {
 		Infos:            []string{deviceMake, deviceModel, deviceYear},
 	}
 
-	mr := new(MintRequest)
-	if err := c.BodyParser(mr); err != nil {
+	var mr MintRequest
+	if err := c.BodyParser(&mr); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, "Couldn't parse request body.")
 	}
 

internal/controllers/user_integrations_controller.go

@@ -961,10 +961,14 @@ func (udc *UserDevicesController) checkPairable(ctx context.Context, exec boil.C
 	}
 
 	if ad.R.PairRequest != nil {
-		if ad.R.PairRequest.Status == models.MetaTransactionRequestStatusConfirmed {
+		switch ad.R.PairRequest.Status {
+		case models.MetaTransactionRequestStatusConfirmed:
 			return nil, nil, fiber.NewError(fiber.StatusConflict, "Aftermarket device already paired.")
+		case models.MetaTransactionRequestStatusUnsubmitted, models.MetaTransactionRequestStatusSubmitted, models.MetaTransactionRequestStatusMined:
+			return nil, nil, fiber.NewError(fiber.StatusConflict, "Aftermarket device already in the pairing process.")
+		case models.DeviceCommandRequestStatusFailed:
+			// Good to continue.
 		}
-		return nil, nil, fiber.NewError(fiber.StatusConflict, "Aftermarket device already in the pairing process.")
 	}
 
 	return vnft, ad, nil
@@ -973,7 +977,7 @@ func (udc *UserDevicesController) checkPairable(ctx context.Context, exec boil.C
 func (udc *UserDevicesController) checkUnpairable(ctx context.Context, exec boil.ContextExecutor, userDeviceID string) (*models.VehicleNFT, *models.AftermarketDevice, error) {
 	ud, err := models.UserDevices(
 		models.UserDeviceWhere.ID.EQ(userDeviceID),
-		qm.Load(qm.Rels(models.UserDeviceRels.VehicleNFT, models.VehicleNFTRels.VehicleTokenAftermarketDevice)),
+		qm.Load(qm.Rels(models.UserDeviceRels.VehicleNFT, models.VehicleNFTRels.VehicleTokenAftermarketDevice, models.AftermarketDeviceRels.UnpairRequest)),
 	).One(ctx, exec)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
@@ -994,8 +998,13 @@ func (udc *UserDevicesController) checkUnpairable(ctx context.Context, exec boil
 
 	ad := vnft.R.VehicleTokenAftermarketDevice
 
-	if ad.UnpairRequestID.Valid {
-		return nil, nil, fiber.NewError(fiber.StatusConflict, "Unpairing already in progress.")
+	if ad.R.UnpairRequest != nil {
+		switch ad.R.UnpairRequest.Status {
+		case models.MetaTransactionRequestStatusUnsubmitted, models.MetaTransactionRequestStatusSubmitted, models.MetaTransactionRequestStatusMined:
+			return nil, nil, fiber.NewError(fiber.StatusConflict, "Aftermarket device already in the pairing process.")
+		case models.DeviceCommandRequestStatusFailed:
+			// Good to continue.
+		}
 	}
 
 	return vnft, ad, nil

migrations/20240426184713_add_mtx_failed_enum.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TYPE meta_transaction_request_status ADD VALUE 'Failed';
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+-- No great way to subtract from an enum.
+-- +goose StatementEnd