SM-374 AutoPi user device metadata setting for Country and Region

cmd/devices-api/update_autopi_state.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/DIMO-Network/devices-api/internal/constants"
+
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 
 	"github.com/DIMO-Network/devices-api/internal/config"
@@ -56,7 +58,7 @@ func updateState(ctx context.Context, pdb db.Store, logger *zerolog.Logger, auto
 	const (
 		autopiInteg = "27qftVRWQYpVDcO5DltO5Ojbjxk"
 	)
-
+	// get all autopi paired devices
 	apiInts, err := models.UserDeviceAPIIntegrations(
 		models.UserDeviceAPIIntegrationWhere.IntegrationID.EQ(autopiInteg),
 		models.UserDeviceAPIIntegrationWhere.ExternalID.IsNotNull(),
@@ -68,14 +70,19 @@ func updateState(ctx context.Context, pdb db.Store, logger *zerolog.Logger, auto
 	logger.Info().Msgf("found %d connected autopis to update status for", len(apiInts))
 
 	for _, apiInt := range apiInts {
-		err := autoPiSvc.UpdateState(apiInt.ExternalID.String, apiInt.Status)
+		reg := ""
+		ci := constants.FindCountry(apiInt.R.UserDevice.CountryCode.String)
+		if ci != nil {
+			reg = ci.Region
+		}
+		err := autoPiSvc.UpdateState(apiInt.ExternalID.String, apiInt.Status, apiInt.R.UserDevice.CountryCode.String, reg)
 		if err != nil {
 			logger.Err(err).Msgf("failed to update status when calling autopi api for deviceId: %s", apiInt.ExternalID.String)
 		} else {
 			logger.Info().Msgf("successfully updated state for %s", apiInt.ExternalID.String)
 		}
 		time.Sleep(500)
-
+		// also update the AP vehicle Call Name to make it easier to find in AP dashboard
 		autoPiDevice, err := autoPiSvc.GetDeviceByUnitID(apiInt.Serial.String)
 		if err == nil {
 			dd, _ := deviceDefSvc.GetDeviceDefinitionByID(ctx, apiInt.R.UserDevice.DeviceDefinitionID)

internal/controllers/webhooks_controller.go

@@ -89,6 +89,7 @@ func (wc *WebhooksController) ProcessCommand(c *fiber.Ctx) error {
 		apiIntegration, err := models.UserDeviceAPIIntegrations(models.UserDeviceAPIIntegrationWhere.IntegrationID.EQ(autoPiInteg.Id),
 			models.UserDeviceAPIIntegrationWhere.ExternalID.EQ(null.StringFrom(apwDeviceID.String())),
 			models.UserDeviceAPIIntegrationWhere.UserDeviceID.EQ(autopiJob.UserDeviceID.String),
+			qm.Load(models.UserDeviceAPIIntegrationRels.UserDevice),
 			qm.OrderBy("updated_at desc"), qm.Limit(1)).One(c.Context(), wc.dbs().Reader)
 		if err != nil {
 			logger.Err(err).Msg("could not get user device api integrations")
@@ -121,7 +122,12 @@ func (wc *WebhooksController) ProcessCommand(c *fiber.Ctx) error {
 				return c.SendStatus(fiber.StatusNoContent)
 			}
 
-			err = wc.autoPiSvc.UpdateState(apiIntegration.ExternalID.String, apiIntegration.Status)
+			reg := ""
+			ci := constants.FindCountry(apiIntegration.R.UserDevice.CountryCode.String)
+			if ci != nil {
+				reg = ci.Region
+			}
+			err = wc.autoPiSvc.UpdateState(apiIntegration.ExternalID.String, apiIntegration.Status, apiIntegration.R.UserDevice.CountryCode.String, reg)
 			if err != nil {
 				logger.Err(err).Msgf("failed to update status when calling autopi api for deviceId: %s", apiIntegration.ExternalID.String)
 				return c.SendStatus(fiber.StatusNoContent)

internal/controllers/webhooks_controller_test.go

@@ -123,7 +123,8 @@ func (s *WebHooksControllerTestSuite) TestPostWebhookSyncCommand() {
 	ddDefIntSvc.EXPECT().GetAutoPiIntegration(gomock.Any()).Return(integ, nil)
 
 	autoAPISvc.EXPECT().UpdateJob(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(autopiJob, nil)
-	autoAPISvc.EXPECT().UpdateState(gomock.Any(), gomock.Any()).Return(nil)
+	ci := constants.FindCountry(ud.CountryCode.String)
+	autoAPISvc.EXPECT().UpdateState(gomock.Any(), gomock.Any(), ud.CountryCode.String, ci.Region).Return(nil)
 
 	udiai := models.UserDeviceAPIIntegration{
 		// create user device api integration

internal/services/autopi_api_service.go

@@ -46,7 +46,7 @@ type AutoPiAPIService interface {
 	GetCommandStatus(ctx context.Context, jobID string) (*AutoPiCommandJob, *models.AutopiJob, error)
 	GetCommandStatusFromAutoPi(deviceID string, jobID string) ([]byte, error)
 	UpdateJob(ctx context.Context, jobID, newState string, result *AutoPiCommandResult) (*models.AutopiJob, error)
-	UpdateState(deviceID string, state string) error
+	UpdateState(deviceID string, state, country, region string) error
 }
 
 type autoPiAPIService struct {
@@ -400,9 +400,16 @@ func (a *autoPiAPIService) GetCommandStatus(ctx context.Context, jobID string) (
 }
 
 // UpdateState calls https://api.dimo.autopi.io/dongle/devices/{DEVICE_ID}/ Note that the deviceID is the autoPi one.
-func (a *autoPiAPIService) UpdateState(deviceID string, state string) error {
+// state is the device pairing state from our end for AP's troubleshooting usage, country and region to be used by AP for region balancing traffic
+func (a *autoPiAPIService) UpdateState(deviceID string, state, country, region string) error {
 	userMetaDataStateInfo := make(map[string]interface{})
 	userMetaDataStateInfo["state"] = state
+	if country != "" {
+		userMetaDataStateInfo["country_code_iso3"] = country
+	}
+	if region != "" {
+		userMetaDataStateInfo["region"] = region
+	}
 
 	userMetaDataInfo := make(map[string]interface{})
 	userMetaDataInfo["user_metadata"] = userMetaDataStateInfo