fix(billing): replace dot separator with underscore in counter keys

requireQuota middleware and getUsage controller built counter keys with
dots (resource.action) which are rejected by SAFE_KEY_RE in the usage
repository, causing 422 errors on quota-checked endpoints. Switch to
underscore separator to match the allowed pattern.

Closes #3350

Author: PierreBrisorgueil

modules/billing/README.md

@@ -41,7 +41,7 @@ Increment counters after successful operations:
 import BillingUsageService from '../billing/services/billing.usage.service.js';
 
 // After creating a document
-await BillingUsageService.increment(organizationId, 'documents.create', 1);
+await BillingUsageService.increment(organizationId, 'documents_create', 1);
 ```
 
 ### Usage Endpoint

modules/billing/controllers/billing.controller.js

@@ -82,7 +82,7 @@ const getUsage = async (req, res) => {
       for (const resource of Object.keys(planQuotas)) {
         for (const action of Object.keys(planQuotas[resource])) {
           const rawLimit = planQuotas[resource][action];
-          limits[`${resource}.${action}`] = Number.isFinite(rawLimit) ? rawLimit : null;
+          limits[`${resource}_${action}`] = Number.isFinite(rawLimit) ? rawLimit : null;
         }
       }
     }

modules/billing/middlewares/billing.requireQuota.js

@@ -54,7 +54,7 @@ function requireQuota(resource, action) {
 
       // Check current usage
       const usage = await BillingUsageService.get(req.organization._id.toString());
-      const counterKey = `${resource}.${action}`;
+      const counterKey = `${resource}_${action}`;
       const current = usage.counters[counterKey] || 0;
 
       if (current >= limit) {

modules/billing/tests/billing.quota.unit.tests.js

@@ -69,7 +69,7 @@ describe('requireQuota middleware:', () => {
 
   test('should allow request when under quota', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'free', status: 'active' });
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 1 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 1 } });
 
     await requireQuota('scraps', 'create')(req, res, next);
 
@@ -79,7 +79,7 @@ describe('requireQuota middleware:', () => {
 
   test('should return 429 when at quota limit', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'free', status: 'active' });
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 3 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 3 } });
 
     await requireQuota('scraps', 'create')(req, res, next);
 
@@ -95,7 +95,7 @@ describe('requireQuota middleware:', () => {
 
   test('should return 429 when over quota limit', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'free', status: 'active' });
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 5 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 5 } });
 
     await requireQuota('scraps', 'create')(req, res, next);
 
@@ -105,7 +105,7 @@ describe('requireQuota middleware:', () => {
 
   test('should treat missing subscription as free plan', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue(null);
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 3 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 3 } });
 
     await requireQuota('scraps', 'create')(req, res, next);
 
@@ -121,7 +121,7 @@ describe('requireQuota middleware:', () => {
     'should treat %s subscription as free plan',
     async (status) => {
       mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'starter', status });
-      mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 3 } });
+      mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 3 } });
 
       await requireQuota('scraps', 'create')(req, res, next);
 
@@ -145,7 +145,7 @@ describe('requireQuota middleware:', () => {
 
   test('should return correct error payload with upgradeUrl', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'free', status: 'active' });
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.execute': 100 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_execute': 100 } });
 
     await requireQuota('scraps', 'execute')(req, res, next);
 
@@ -178,7 +178,7 @@ describe('requireQuota middleware:', () => {
 
   test('should use subscription plan when status is trialing', async () => {
     mockSubscriptionRepository.findByOrganization.mockResolvedValue({ plan: 'starter', status: 'trialing' });
-    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps.create': 15 } });
+    mockBillingUsageService.get.mockResolvedValue({ counters: { 'scraps_create': 15 } });
 
     await requireQuota('scraps', 'create')(req, res, next);
 

modules/billing/tests/billing.usage.endpoint.unit.tests.js

@@ -63,7 +63,7 @@ describe('Billing usage endpoint unit tests:', () => {
 
   test('should return usage and limits for active subscription', async () => {
     mockBillingService.getSubscription.mockResolvedValue({ plan: 'starter', status: 'active' });
-    mockBillingUsageService.get.mockResolvedValue({ month: '2026-03', counters: { 'documents.create': 5, 'requests.execute': 42 } });
+    mockBillingUsageService.get.mockResolvedValue({ month: '2026-03', counters: { 'documents_create': 5, 'requests_execute': 42 } });
 
     const req = { organization: { _id: orgId } };
     await billingController.getUsage(req, res);
@@ -74,8 +74,8 @@ describe('Billing usage endpoint unit tests:', () => {
       message: 'billing usage',
       data: expect.objectContaining({
         plan: 'starter',
-        usage: { 'documents.create': 5, 'requests.execute': 42 },
-        limits: { 'documents.create': 20, 'requests.execute': 2000 },
+        usage: { 'documents_create': 5, 'requests_execute': 42 },
+        limits: { 'documents_create': 20, 'requests_execute': 2000 },
       }),
     }));
   });
@@ -92,7 +92,7 @@ describe('Billing usage endpoint unit tests:', () => {
       type: 'success',
       data: expect.objectContaining({
         plan: 'free',
-        limits: { 'documents.create': 5, 'requests.execute': 100 },
+        limits: { 'documents_create': 5, 'requests_execute': 100 },
       }),
     }));
   });
@@ -106,7 +106,7 @@ describe('Billing usage endpoint unit tests:', () => {
     'paused',
   ])('should return free plan when subscription status is %s', async (status) => {
     mockBillingService.getSubscription.mockResolvedValue({ plan: 'starter', status });
-    mockBillingUsageService.get.mockResolvedValue({ month: '2026-03', counters: { 'documents.create': 2 } });
+    mockBillingUsageService.get.mockResolvedValue({ month: '2026-03', counters: { 'documents_create': 2 } });
 
     const req = { organization: { _id: orgId } };
     await billingController.getUsage(req, res);
@@ -115,7 +115,7 @@ describe('Billing usage endpoint unit tests:', () => {
     expect(res.json).toHaveBeenCalledWith(expect.objectContaining({
       data: expect.objectContaining({
         plan: 'free',
-        limits: { 'documents.create': 5, 'requests.execute': 100 },
+        limits: { 'documents_create': 5, 'requests_execute': 100 },
       }),
     }));
   });
@@ -131,7 +131,7 @@ describe('Billing usage endpoint unit tests:', () => {
     expect(res.json).toHaveBeenCalledWith(expect.objectContaining({
       data: expect.objectContaining({
         plan: 'starter',
-        limits: { 'documents.create': 20, 'requests.execute': 2000 },
+        limits: { 'documents_create': 20, 'requests_execute': 2000 },
       }),
     }));
   });
@@ -163,7 +163,7 @@ describe('Billing usage endpoint unit tests:', () => {
     expect(res.json).toHaveBeenCalledWith(expect.objectContaining({
       data: expect.objectContaining({
         plan: 'pro',
-        limits: { 'documents.create': null, 'requests.execute': null },
+        limits: { 'documents_create': null, 'requests_execute': null },
       }),
     }));
   });