api: derive multicast subscriber/publisher counts from live users #653
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package handlers_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/go-chi/chi/v5" | ||
| "github.com/malbeclabs/lake/api/handlers" | ||
| apitesting "github.com/malbeclabs/lake/api/testing" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // insertContributorMulticastData inserts a contributor with one device whose | ||
| // on-chain multicast counts are left at 0, plus activated multicast users that | ||
| // subscribe to / publish to groups. The contributor detail must report the live | ||
| // per-device counts, not the stale on-chain zeros (#650). | ||
| func insertContributorMulticastData(t *testing.T, api *handlers.API) { | ||
| ctx := t.Context() | ||
|
|
||
| err := api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_contributors_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, code, name) VALUES | ||
| ('c-mc', now(), now(), generateUUIDv4(), 0, 1, 'c-mc', 'CMC', 'Multicast Contributor') | ||
| `) | ||
| require.NoError(t, err) | ||
|
|
||
| err = api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_devices_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, code, status, device_type, contributor_pk, metro_pk, public_ip, max_users) VALUES | ||
| ('cdev-1', now(), now(), generateUUIDv4(), 0, 1, 'cdev-1', 'C-DEV-01', 'up', 'switch', 'c-mc', '', '10.8.0.1', 100) | ||
| `) | ||
| require.NoError(t, err) | ||
|
|
||
| // 3 subscriber-only, 2 publisher-only, 1 both-roles, 1 pending (excluded). | ||
| // Live totals: subscribers 4, publishers 3. | ||
| err = api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_users_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, status, device_pk, kind, owner_pubkey, client_ip, dz_ip, tunnel_id, publishers, subscribers) VALUES | ||
| ('c-s1', now(), now(), generateUUIDv4(), 0, 1, 'c-s1', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]'), | ||
| ('c-s2', now(), now(), generateUUIDv4(), 0, 2, 'c-s2', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]'), | ||
| ('c-s3', now(), now(), generateUUIDv4(), 0, 3, 'c-s3', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '[]', '["g2"]'), | ||
| ('c-p1', now(), now(), generateUUIDv4(), 0, 4, 'c-p1', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '["g1"]', '[]'), | ||
| ('c-p2', now(), now(), generateUUIDv4(), 0, 5, 'c-p2', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '["g1"]', '[]'), | ||
| ('c-b1', now(), now(), generateUUIDv4(), 0, 6, 'c-b1', 'activated', 'cdev-1', 'multicast', 'p', '', '', 0, '["g2"]', '["g2"]'), | ||
| ('c-pend', now(), now(), generateUUIDv4(), 0, 7, 'c-pend', 'pending', 'cdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]') | ||
| `) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| func TestGetContributor_MulticastCountsFromLiveUsers(t *testing.T) { | ||
| t.Parallel() | ||
| api := apitesting.NewTestAPI(t, testChDB) | ||
|
|
||
| insertContributorMulticastData(t, api) | ||
|
|
||
| req := httptest.NewRequest(http.MethodGet, "/api/dz/contributors/c-mc", nil) | ||
| rctx := chi.NewRouteContext() | ||
| rctx.URLParams.Add("pk", "c-mc") | ||
| req = req.WithContext(context.WithValue(req.Context(), chi.RouteCtxKey, rctx)) | ||
|
|
||
| rr := httptest.NewRecorder() | ||
| api.GetContributor(rr, req) | ||
| require.Equal(t, http.StatusOK, rr.Code) | ||
|
|
||
| var contributor handlers.ContributorDetail | ||
| require.NoError(t, json.NewDecoder(rr.Body).Decode(&contributor)) | ||
| assert.Equal(t, uint64(4), contributor.MulticastSubscribersCount) | ||
| assert.Equal(t, uint64(3), contributor.MulticastPublishersCount) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package handlers_test | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/malbeclabs/lake/api/handlers" | ||
| apitesting "github.com/malbeclabs/lake/api/testing" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // insertFacilityMulticastData inserts a facility with one device (via location_pk) | ||
| // whose on-chain multicast counts are left at 0, plus activated multicast users | ||
| // that subscribe to / publish to groups. The facility aggregate must report the | ||
| // live per-device counts, not the stale on-chain zeros (#650). | ||
| func insertFacilityMulticastData(t *testing.T, api *handlers.API) { | ||
| ctx := t.Context() | ||
|
|
||
| err := api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_facilities_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, owner, lat, lng, loc_id, status, code, name, country, reference_count) VALUES | ||
| ('fac-mc', now(), now(), generateUUIDv4(), 0, 1, 'fac-mc', '', 40.0, -74.0, 1, 'activated', 'FAC-MC', 'Multicast Facility', 'US', 1) | ||
| `) | ||
| require.NoError(t, err) | ||
|
|
||
| err = api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_devices_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, code, status, device_type, contributor_pk, metro_pk, location_pk, public_ip, max_users) VALUES | ||
| ('fdev-1', now(), now(), generateUUIDv4(), 0, 1, 'fdev-1', 'F-DEV-01', 'up', 'switch', '', '', 'fac-mc', '10.7.0.1', 100) | ||
| `) | ||
| require.NoError(t, err) | ||
|
|
||
| // 3 subscriber-only, 2 publisher-only, 1 both-roles, 1 pending (excluded). | ||
| // Live totals: subscribers 4, publishers 3. | ||
| err = api.DB.Exec(ctx, ` | ||
| INSERT INTO dim_dz_users_history | ||
| (entity_id, snapshot_ts, ingested_at, op_id, is_deleted, attrs_hash, pk, status, device_pk, kind, owner_pubkey, client_ip, dz_ip, tunnel_id, publishers, subscribers) VALUES | ||
| ('f-s1', now(), now(), generateUUIDv4(), 0, 1, 'f-s1', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]'), | ||
| ('f-s2', now(), now(), generateUUIDv4(), 0, 2, 'f-s2', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]'), | ||
| ('f-s3', now(), now(), generateUUIDv4(), 0, 3, 'f-s3', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '[]', '["g2"]'), | ||
| ('f-p1', now(), now(), generateUUIDv4(), 0, 4, 'f-p1', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '["g1"]', '[]'), | ||
| ('f-p2', now(), now(), generateUUIDv4(), 0, 5, 'f-p2', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '["g1"]', '[]'), | ||
| ('f-b1', now(), now(), generateUUIDv4(), 0, 6, 'f-b1', 'activated', 'fdev-1', 'multicast', 'p', '', '', 0, '["g2"]', '["g2"]'), | ||
| ('f-pend', now(), now(), generateUUIDv4(), 0, 7, 'f-pend', 'pending', 'fdev-1', 'multicast', 'p', '', '', 0, '[]', '["g1"]') | ||
| `) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| func TestGetFacilities_MulticastCountsFromLiveUsers(t *testing.T) { | ||
| t.Parallel() | ||
| api := apitesting.NewTestAPI(t, testChDB) | ||
|
|
||
| insertFacilityMulticastData(t, api) | ||
|
|
||
| req := httptest.NewRequest(http.MethodGet, "/api/dz/facilities", nil) | ||
| rr := httptest.NewRecorder() | ||
| api.GetFacilities(rr, req) | ||
| require.Equal(t, http.StatusOK, rr.Code) | ||
|
|
||
| var response handlers.PaginatedResponse[handlers.FacilityListItem] | ||
| require.NoError(t, json.NewDecoder(rr.Body).Decode(&response)) | ||
|
|
||
| var f *handlers.FacilityListItem | ||
| for i := range response.Items { | ||
| if response.Items[i].PK == "fac-mc" { | ||
| f = &response.Items[i] | ||
| break | ||
| } | ||
| } | ||
| require.NotNil(t, f) | ||
| assert.Equal(t, uint64(4), f.MulticastSubscribersCount) | ||
| assert.Equal(t, uint64(3), f.MulticastPublishersCount) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
eff_max_subs/eff_max_pubs(lines 323-324) are not floored at the live count, unlike metros (metros.go:121-122,416-417wrap the same expression ingreatest(..., toUInt64(COALESCE(dml.live_subscribers, 0)))) and devices (devices.go:187-188). With a now-live used-count and an on-chain-derived cap, a contributor whose devices havemax_multicast_subscribers = 0and exhaustedmax_userscan returnmulticast_subscribers_count > max_multicast_subscribersin the JSON. The web clamps viaMath.max(contributor-detail-page.tsx:232), but the agent/MCP see an oversubscribed contributor. Wrap both ingreatest(if(...), toUInt64(COALESCE(dml.live_subscribers, 0)))/live_publishers.