@kumori/aurora-backend-handler 1.1.16 → 1.1.17

package/helpers/revision-helper.ts

@@ -262,7 +262,7 @@ const updateEnvironmentConsumption = (
 
   servicesMap.forEach((service, svcId) => {
     if (service.environment === serviceEnvironmentId) {
-      const currentRevisionKey = `${svcId}_${service.currentRevision}`;
+      const currentRevisionKey = `/tenant/${svcId.split('/')[0]}/service/${svcId.split('/')[1]}/revision/${service.currentRevision}`;
       const currentRevision = revisionsMap.get(currentRevisionKey);
       if (currentRevision) {
         totalEnvCpu += currentRevision.usage.limit.cpu.max || 0;
@@ -300,7 +300,7 @@ const updateAccountConsumption = (
 
   servicesMap.forEach((service, svcId) => {
     if (service.account === serviceAccountId) {
-      const currentRevisionKey = `${svcId}_${service.currentRevision}`;
+      const currentRevisionKey = `/tenant/${svcId.split('/')[0]}/service/${svcId.split('/')[1]}/revision/${service.currentRevision}`;
       const currentRevision = revisionsMap.get(currentRevisionKey);
       if (currentRevision) {
         totalAccountCpu += currentRevision.usage.limit.cpu.max || 0;
@@ -338,7 +338,7 @@ export const handleRevisionEvent = ({
   accountsMap,
 }: HandleRevisionEventParams): HandleRevisionEventResult => {
   const serviceId = `${parentParts.tenant}/${parentParts.service}`;
-  const revisionKey = `${serviceId}_${entityId}`;
+  const revisionKey = `${eventData.id.parent.name}/revision/${entityId}`;
   const { roles, instances, usedCpu, usedMemory } = processRolesAndInstances(
     eventData,
     serviceId,

package/helpers/service-helper.ts

@@ -180,7 +180,7 @@ export const handleServiceEvent = ({
 }: HandleServiceEventParams): HandleServiceEventResult => {
   const serviceFullKey = `${parentParts.tenant}/${entityId}`;
   const serviceTenantId = parentParts.tenant;
-  const currentRevisionKey = `${serviceFullKey}_${eventData.status.revision}`;
+  const currentRevisionKey = `${eventData.id.parent.name}/service/${entityId}/revision/${eventData.status.revision}`;
   const currentRevision = revisionsMap.get(currentRevisionKey);
 
   const projectLabel = eventData.meta?.labels?.project;
@@ -189,7 +189,7 @@ export const handleServiceEvent = ({
 
   const serviceRevisions: Revision[] = [];
   revisionsMap.forEach((revision, key) => {
-    if (key.startsWith(`${serviceFullKey}_`)) {
+    if (key.startsWith(`${eventData.id.parent.name}/service/${entityId}/revision/`)) {
       serviceRevisions.push(revision);
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -1996,7 +1996,7 @@ const resolveServiceStatus = (service: Service): Service => {
     return service;
   }
 
-  const revisionKey = `${service.tenant}/${service.name}_${service.currentRevision}`;
+  const revisionKey = `/tenant/${service.tenant}/service/${service.name}/revision/${service.currentRevision}`;
   const currentRevision = revisionsMap.get(revisionKey);
 
   if (!currentRevision) {