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

Feature/si 2427 apiv2 consolidate analytics endpoint for dinc service in api #304

Closed
wants to merge 7 commits into from
Closed

Feature/si 2427 apiv2 consolidate analytics endpoint for dinc service in api #304

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a197d3
WIP: Vehicles etsimated range v2 api
0xdev22 Apr 8, 2024
2d2aa7f
Implement v2 vehicle range endpoint and add deprecation warning for o…
0xdev22 Apr 10, 2024
9d4f090
fix PR review issues
0xdev22 Apr 10, 2024
29946f2
Rename vehicle privilege v2 route
0xdev22 Apr 22, 2024
7b95f76
Fix merge conflict
0xdev22 Apr 22, 2024
88a6be8
Generate new swagger docs
0xdev22 Apr 22, 2024
5702d8e
Fix merge conflict
0xdev22 Apr 23, 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
34 changes: 20 additions & 14 deletions cmd/devices-api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ import (

"github.com/DIMO-Network/devices-api/internal/rpc"

"github.com/DIMO-Network/devices-api/internal/middleware/metrics"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"

"github.com/DIMO-Network/devices-api/internal/middleware/metrics"
0xdev22 marked this conversation as resolved.
Show resolved Hide resolved

"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"

"github.com/DIMO-Network/shared/redis"
Expand All @@ -34,15 +35,6 @@ import (
"github.com/DIMO-Network/devices-api/internal/controllers/helpers"
"github.com/DIMO-Network/devices-api/internal/middleware/owner"

"github.com/DIMO-Network/devices-api/internal/config"
"github.com/DIMO-Network/devices-api/internal/constants"
"github.com/DIMO-Network/devices-api/internal/controllers"
"github.com/DIMO-Network/devices-api/internal/services"
"github.com/DIMO-Network/devices-api/internal/services/autopi"
"github.com/DIMO-Network/devices-api/internal/services/issuer"
"github.com/DIMO-Network/devices-api/internal/services/macaron"
"github.com/DIMO-Network/devices-api/internal/services/registry"
pb "github.com/DIMO-Network/devices-api/pkg/grpc"
"github.com/DIMO-Network/shared"
pbuser "github.com/DIMO-Network/shared/api/users"
"github.com/DIMO-Network/shared/middleware/privilegetoken"
Expand All @@ -58,6 +50,16 @@ import (
"github.com/rs/zerolog"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/DIMO-Network/devices-api/internal/config"
"github.com/DIMO-Network/devices-api/internal/constants"
"github.com/DIMO-Network/devices-api/internal/controllers"
"github.com/DIMO-Network/devices-api/internal/services"
"github.com/DIMO-Network/devices-api/internal/services/autopi"
"github.com/DIMO-Network/devices-api/internal/services/issuer"
"github.com/DIMO-Network/devices-api/internal/services/macaron"
"github.com/DIMO-Network/devices-api/internal/services/registry"
pb "github.com/DIMO-Network/devices-api/pkg/grpc"
)

func startWebAPI(logger zerolog.Logger, settings *config.Settings, pdb db.Store, eventService services.EventService, producer sarama.SyncProducer, s3ServiceClient *s3.Client, s3NFTServiceClient *s3.Client) {
Expand Down Expand Up @@ -149,22 +151,23 @@ func startWebAPI(logger zerolog.Logger, settings *config.Settings, pdb db.Store,
documentsController := controllers.NewDocumentsController(settings, &logger, s3ServiceClient, pdb.DBS)
countriesController := controllers.NewCountriesController()
userIntegrationAuthController := controllers.NewUserIntegrationAuthController(settings, pdb.DBS, &logger, ddSvc, teslaFleetAPISvc, redisCache, cipher, usersClient)
userDeviceControllerV2 := controllers.NewUserDevicesControllerV2(settings, pdb.DBS, &logger, ddSvc)

// commenting this out b/c the library includes the path in the metrics which saturates prometheus queries - need to fork / make our own
//prometheus := fiberprometheus.New("devices-api")
//app.Use(prometheus.Middleware)
// prometheus := fiberprometheus.New("devices-api")
// app.Use(prometheus.Middleware)
app.Use(metrics.HTTPMetricsMiddleware)

app.Use(fiberrecover.New(fiberrecover.Config{
Next: nil,
EnableStackTrace: true,
StackTraceHandler: nil,
}))
//cors
// cors
app.Use(cors.New())
// request logging
app.Use(zflogger.New(logger, nil))
//cache
// cache
cacheHandler := cache.New(cache.Config{
Next: func(c *fiber.Ctx) bool {
return c.Query("refresh") == "true"
Expand Down Expand Up @@ -206,6 +209,7 @@ func startWebAPI(logger zerolog.Logger, settings *config.Settings, pdb db.Store,
})

vPriv := app.Group("/v1/vehicle/:tokenID", privilegeAuth)
vehiclePrivilegeV2Routes := app.Group("/v2/vehicles/:tokenID", privilegeAuth)
0xdev22 marked this conversation as resolved.
Show resolved Hide resolved

privTokenWare := privilegetoken.New(privilegetoken.Config{Log: &logger})

Expand Down Expand Up @@ -347,6 +351,8 @@ func startWebAPI(logger zerolog.Logger, settings *config.Settings, pdb db.Store,
udOwner.Post("/autopi/commands/cloud-repair", userDeviceController.CloudRepairAutoPi)
udOwner.Post("/aftermarket/commands/cloud-repair", userDeviceController.CloudRepairAutoPi)

vehiclePrivilegeV2Routes.Get("/analytics/range", privTokenWare.OneOf(vehicleAddr, []privileges.Privilege{privileges.VehicleNonLocationData}), userDeviceControllerV2.GetRange)

logger.Info().Msg("Server started on port " + settings.Port)
// Start Server from a different go routine
go func() {
Expand Down
Loading
Loading