Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add region to TeslaCredentials published to kafka #273

Merged
merged 6 commits into from
Mar 11, 2024
Merged

Add region to TeslaCredentials published to kafka #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccba2f2
Add region to TeslaCredentials published to kafka
0xdev22 Mar 4, 2024
d3734b2
Fix failing tests
0xdev22 Mar 4, 2024
29f9abd
fix get device by unit id err handling 404
JamesReate Mar 4, 2024
9594a07
Fix failing tests
0xdev22 Mar 6, 2024
7b488d2
Merge branch 'feature/si-2470-add-fleet-api-support-to-the-oem-poller…
0xdev22 Mar 6, 2024
c9dfa22
Fix failing tests
0xdev22 Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/controllers/user_integrations_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,8 +1940,7 @@ func (udc *UserDevicesController) registerDeviceTesla(c *fiber.Ctx, logger *zero
udc.requestValuation(v.VIN, userDeviceID, tokenID)
udc.requestInstantOffer(userDeviceID, tokenID)
}

0xdev22 marked this conversation as resolved.
Show resolved Hide resolved
if err := udc.teslaTaskService.StartPoll(v, &integration, apiVersion); err != nil {
if err := udc.teslaTaskService.StartPoll(v, &integration, apiVersion, region); err != nil {
return err
}

Expand Down
8 changes: 4 additions & 4 deletions internal/controllers/user_integrations_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,8 @@ func (s *UserIntegrationsControllerTestSuite) TestPostTesla() {
Region: "Americas",
}).Return(nil)

s.teslaTaskService.EXPECT().StartPoll(gomock.AssignableToTypeOf(oV), gomock.AssignableToTypeOf(oUdai), 1).DoAndReturn(
func(v *services.TeslaVehicle, udai *models.UserDeviceAPIIntegration, _ int) error {
s.teslaTaskService.EXPECT().StartPoll(gomock.AssignableToTypeOf(oV), gomock.AssignableToTypeOf(oUdai), 1, "").DoAndReturn(
func(v *services.TeslaVehicle, udai *models.UserDeviceAPIIntegration, _ int, _ string) error {
oV = v
oUdai = udai
return nil
Expand Down Expand Up @@ -941,8 +941,8 @@ func (s *UserIntegrationsControllerTestSuite) TestPostTesla_V2() {
Region: "Americas",
}).Return(nil)

s.teslaTaskService.EXPECT().StartPoll(gomock.AssignableToTypeOf(oV), gomock.AssignableToTypeOf(oUdai), 2).DoAndReturn(
func(v *services.TeslaVehicle, udai *models.UserDeviceAPIIntegration, _ int) error {
s.teslaTaskService.EXPECT().StartPoll(gomock.AssignableToTypeOf(oV), gomock.AssignableToTypeOf(oUdai), 2, "na").DoAndReturn(
func(v *services.TeslaVehicle, udai *models.UserDeviceAPIIntegration, _ int, _ string) error {
oV = v
oUdai = udai
return nil
Expand Down
11 changes: 5 additions & 6 deletions internal/services/autopi_api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,15 @@ func (a *autoPiAPIService) GetUserDeviceIntegrationByUnitID(ctx context.Context,
func (a *autoPiAPIService) GetDeviceByUnitID(unitID string) (*AutoPiDongleDevice, error) {
res, err := a.httpClient.ExecuteRequest(fmt.Sprintf("/dongle/devices/by_unit_id/%s/", unitID), "GET", nil)
if err != nil {
var htppResponseError shared.HTTPResponseError
if !errors.As(err, &htppResponseError) {
return nil, errors.Wrapf(err, "http resp error calling autopi api to get unit with ID %s", unitID)
var responseError shared.HTTPResponseError
if errors.As(err, &responseError) {
if responseError.StatusCode == 404 {
return nil, ErrNotFound
}
}
return nil, errors.Wrapf(err, "error calling autopi api to get unit with ID %s", unitID)
}
defer res.Body.Close() // nolint
if res.StatusCode == 404 {
return nil, ErrNotFound
}

u := new(AutoPiDongleDevice)
err = json.NewDecoder(res.Body).Decode(u)
Expand Down
8 changes: 4 additions & 4 deletions internal/services/mocks/tesla_task_service_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions internal/services/tesla_task_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
//go:generate mockgen -source tesla_task_service.go -destination mocks/tesla_task_service_mock.go

type TeslaTaskService interface {
StartPoll(vehicle *TeslaVehicle, udai *models.UserDeviceAPIIntegration, apiVersion int) error
StartPoll(vehicle *TeslaVehicle, udai *models.UserDeviceAPIIntegration, apiVersion int, region string) error
StopPoll(udai *models.UserDeviceAPIIntegration) error
UnlockDoors(udai *models.UserDeviceAPIIntegration) (string, error)
LockDoors(udai *models.UserDeviceAPIIntegration) (string, error)
Expand Down Expand Up @@ -52,6 +52,7 @@ type TeslaCredentialsV2 struct {
Expiry time.Time `json:"expiry"`
RefreshToken string `json:"refreshToken"`
Version int `json:"version"`
Region string `json:"region"`
}

type TeslaTask struct {
Expand Down Expand Up @@ -82,7 +83,7 @@ type TeslaCredentialsCloudEventV2 struct {
Data TeslaCredentialsV2 `json:"data"`
}

func (t *teslaTaskService) StartPoll(vehicle *TeslaVehicle, udai *models.UserDeviceAPIIntegration, version int) error {
func (t *teslaTaskService) StartPoll(vehicle *TeslaVehicle, udai *models.UserDeviceAPIIntegration, version int, region string) error {
tt := TeslaTaskCloudEvent{
CloudEventHeaders: CloudEventHeaders{
ID: ksuid.New().String(),
Expand Down Expand Up @@ -121,6 +122,7 @@ func (t *teslaTaskService) StartPoll(vehicle *TeslaVehicle, udai *models.UserDev
Expiry: udai.AccessExpiresAt.Time,
RefreshToken: udai.RefreshToken.String,
Version: version,
Region: region,
},
}

Expand Down
Loading