feat: usage endpoints, allow appName (#2303)

extensions/metering/controllers/UsageController.ts

@@ -1,15 +1,20 @@
-import { MeteringService } from '@heyputer/backend/src/services/MeteringService/MeteringService.js';
+import type { BaseDatabaseAccessService } from '@heyputer/backend/src/services/database/BaseDatabaseAccessService.js';
+import type { MeteringService } from '@heyputer/backend/src/services/MeteringService/MeteringService.js';
 
 const { Controller, Get, ExtensionController } = extension.import('extensionController');
 
 @Controller('/metering')
 export class UsageController extends ExtensionController {
-
     #meteringService: MeteringService;
+    #sqlClient: BaseDatabaseAccessService;
 
-    constructor (meteringService: MeteringService) {
+    constructor (
+        meteringService: MeteringService,
+        sqlClient: BaseDatabaseAccessService,
+    ) {
         super();
         this.#meteringService = meteringService;
+        this.#sqlClient = sqlClient;
     }
 
     @Get('usage', { subdomain: 'api' })
@@ -29,19 +34,37 @@ export class UsageController extends ExtensionController {
         return;
     }
 
-    @Get('usage/:appId', { subdomain: 'api' })
+    @Get('usage/:appIdOrName', { subdomain: 'api' })
     async getUsageByApp (req, res) {
         const actor = req.actor;
         if ( ! actor ) {
             throw Error('actor not found in context');
         }
-        const appId = req.params.appId;
-        if ( ! appId ) {
+        const appIdOrName = req.params.appIdOrName;
+        if ( ! appIdOrName ) {
             res.status(400).json({ error: 'appId parameter is required' });
             return;
         }
 
-        const appUsage = await this.#meteringService.getActorCurrentMonthAppUsageDetails(actor, appId);
+        let appId = appIdOrName;
+        if ( !appIdOrName.startsWith('app-') || !/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(appIdOrName.split('app-')[1]) ) {
+            // Check if the part after 'app-' is a valid UUID (v4)
+            const appRows = await this.#sqlClient.read('SELECT `uid` FROM `apps` WHERE `name` = ? LIMIT 1',
+                            [appIdOrName]);
+            if ( appRows.length > 0 ) {
+                appId = appRows[0].uid;
+            } else {
+                res.status(404).json({ error: 'App not found' });
+                return;
+            }
+        } else {
+            appId = appIdOrName;
+        }
+
+        const appUsage =
+            await this.#meteringService.getActorCurrentMonthAppUsageDetails(actor,
+                            appId);
+
         res.status(200).json(appUsage);
         return;
     }
@@ -58,9 +81,3 @@ export class UsageController extends ExtensionController {
         return;
     }
 }
-
-export const registerUsageController = () => {
-    const controller = new UsageController(extension.import('service:meteringService'));
-    controller.registerRoutes();
-    console.debug('Loaded /metering/usage routes');
-};

extensions/metering/main.ts

@@ -1,4 +1,8 @@
+import { UsageController } from './controllers/UsageController.js';
 import './eventListeners/subscriptionEvents.js';
-import { registerUsageController } from './controllers/UsageController.js';
 
-registerUsageController();
+const meteringService = extension.import('service:meteringService');
+const sqlClient = extension.import('service:database');
+
+const controller = new UsageController(meteringService, sqlClient);
+controller.registerRoutes();