fix types

dm3-org · Sep 10, 2024 · d04361b · d04361b
1 parent d1c7edf
commit d04361b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packages/delivery-service/src/persistence/getDatabase.ts b/packages/delivery-service/src/persistence/getDatabase.ts
@@ -15,7 +15,7 @@ import Account from './account';
 import { getIdEnsName } from './getIdEnsName';
 import Messages from './messages';
 import { syncAcknowledge } from './messages/syncAcknowledge';
-import type { MetricsObject } from './metrics';
+import type { IntervalMetric } from './metrics';
 import Metrics from './metrics';
 import Notification from './notification';
 import Otp from './otp';
@@ -168,7 +168,7 @@ export interface IDatabase extends IAccountDatabase {
     ) => Promise<void>;
     getMetrics: (
         deliveryServiceProperties: DeliveryServiceProperties,
-    ) => Promise<MetricsObject>;
+    ) => Promise<IntervalMetric[]>;
     countMessage: (
         messageSizeBytes: number,
         deliveryServiceProperties: DeliveryServiceProperties,

diff --git a/packages/delivery-service/src/persistence/metrics/getMetrics.ts b/packages/delivery-service/src/persistence/metrics/getMetrics.ts
@@ -1,6 +1,7 @@
 import { DeliveryServiceProperties } from '@dm3-org/dm3-lib-delivery';
 import { Redis, RedisPrefix } from '../getDatabase';
 import { getCurrentIntervalTimestamp } from './getCurrentIntervalTimestamp';
+import { IntervalMetric } from './metricTypes';
 
 /**
  * Get the metrics from the database, excluding the current interval.

diff --git a/packages/delivery-service/src/persistence/metrics/index.ts b/packages/delivery-service/src/persistence/metrics/index.ts
@@ -1,5 +1,5 @@
 import { getMetrics } from './getMetrics';
-import type { IntervalMetric, MetricsMap, MetricsObject } from './metricTypes';
+import type { IntervalMetric } from './metricTypes';
 import { countMessage, countNotification } from './setMetrics';
 
 export default {
@@ -8,4 +8,4 @@ export default {
     countNotification,
 };
 
-export type { IntervalMetric, MetricsMap, MetricsObject };
+export type { IntervalMetric };
diff --git a/packages/delivery-service/src/persistence/metrics/metricTypes.ts b/packages/delivery-service/src/persistence/metrics/metricTypes.ts
@@ -1,4 +1,4 @@
-type IntervalMetric = {
+export type IntervalMetric = {
     timestamp_start: number;
     duration_seconds: number;
     messageCount: number;