Skip to content

refactor: update device model #31

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

Merged
ngovinh2k2 merged 1 commit into from
Feb 27, 2026
Merged

refactor: update device model #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion device-service
Open in desktop
Submodule device-service updated 27 files
+0 −2 apps/device/handlers.py
+2 −7 apps/device/migrations/0001_initial.py
+35 −0 apps/device/migrations/0013_alter_device_model_to_charfield.py
+1 −4 apps/device/models.py
+17 −6 apps/device/serializers.py
+2 −1 apps/device/services/filter_processor.py
+1 −1 apps/device/services/trip_analyzer.py
+4 −4 apps/device/views.py
+0 −0 apps/device_model/__init__.py
+0 −6 apps/device_model/apps.py
+0 −6 apps/device_model/constants.py
+0 −83 apps/device_model/migrations/0001_initial.py
+0 −16 apps/device_model/migrations/0002_remove_devicemodel_device_type.py
+0 −19 apps/device_model/migrations/0003_devicemodel_device_type.py
+0 −36 apps/device_model/migrations/0004_remove_devicemodel_device_mode_alias_ed37e0_idx_and_more.py
+0 −29 apps/device_model/migrations/0005_devicemodel_key_feature.py
+0 −26 apps/device_model/migrations/0006_alter_devicemodel_key_feature.py
+0 −0 apps/device_model/migrations/__init__.py
+0 −46 apps/device_model/models.py
+0 −19 apps/device_model/serializers.py
+0 −42 apps/device_model/services.py
+0 −14 apps/device_model/urls.py
+0 −28 apps/device_model/views.py
+0 −24 apps/utils/haversine_distance.py
+5 −1 device_service/settings.py
+0 −1 device_service/urls.py
+0 −1 device_service/urls_public.py
2 changes: 1 addition & 1 deletion django-common-utils
Open in desktop
Submodule django-common-utils updated 2 files
+24 −0 common/utils/haversine_distance.py
+49 −0 common/utils/tranformer_client.py
4 changes: 4 additions & 0 deletions haproxy/haproxy.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ backend device_backend
mode http
server local device:80

backend transformer_backend
mode http
server local transformer:8080

backend telemetry_backend
mode http
server local telemetry:8080
Expand Down
104 changes: 0 additions & 104 deletions haproxy/routes/device.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,6 @@ routes = {
-- --------------
-- Device
-- --------------
["^/api/device%-models/?$"] = {
POST = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
GET = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
},
["^/api/device%-models/[0-9a-f-]+/?$"] = {
PUT = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
GET = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
PATCH = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
DELETE = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
},
["^/api/device%-spaces/?$"] = {
POST = {
service = "device",
Expand Down Expand Up @@ -178,58 +126,6 @@ routes = {
is_root_user_api = false,
},
},
["^/api/manufacturers/?$"] = {
POST = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
GET = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
},
["^/api/manufacturers/[0-9a-f-]+/?$"] = {
PUT = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
GET = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
PATCH = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
DELETE = {
service = "device",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
},
["^/api/network%-server/?$"] = {
POST = {
service = "device",
Expand Down
2 changes: 2 additions & 0 deletions haproxy/routes/routes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ device_routes = require("routes.device")
mpa_routes = require("routes.mpa")
telemetry_routes = require("routes.telemetry")
bootstrap_routes = require("routes.bootstrap")
transformer_routes = require("routes.transformer")

routes = {}
for k, v in pairs(docs_routes) do routes[k] = v end
Expand All @@ -14,5 +15,6 @@ for k, v in pairs(device_routes) do routes[k] = v end
for k, v in pairs(mpa_routes) do routes[k] = v end
for k, v in pairs(telemetry_routes) do routes[k] = v end
for k, v in pairs(bootstrap_routes) do routes[k] = v end
for k, v in pairs(transformer_routes) do routes[k] = v end

return routes
17 changes: 17 additions & 0 deletions haproxy/routes/transformer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
routes = {
-- --------------
-- Transformer
-- --------------
["^/api/device%-models/?$"] = {
GET = {
service = "transformer",
auth_required = true,
role_required = nil,
space_required = false,
organization_required = true,
is_root_user_api = true,
},
},
}

return routes
2 changes: 1 addition & 1 deletion transformer-service
Open in desktop
Submodule transformer-service updated 13 files
+28 −10 cmd/transformer/cmd/serve.go
+30 −0 configs/device_model/device_profile.yaml
+10 −0 configs/device_model/manufacturers.yaml
+11 −3 go.mod
+21 −7 go.sum
+90 −0 internal/api/common/pagination.go
+52 −0 internal/api/device_models/handler.go
+11 −0 internal/api/device_models/router.go
+11 −0 internal/api/router.go
+5 −18 internal/models/device.go
+45 −0 internal/models/device_model.go
+168 −22 internal/services/device_profile.go
+ − transformer