Davidgu/analyticsroutes premerge

packages/analytics-service/src/bog-analytics.service.ts

@@ -1,5 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { AnalyticsLogger as BogAnalyticsLogger } from 'bog-analytics';
+import {
+  AnalyticsViewer,
+  AnalyticsLogger as BogAnalyticsLogger,
+} from 'bog-analytics';
 
 @Injectable()
 export class BogAnalyticsService extends BogAnalyticsLogger {}
+
+@Injectable()
+export class AnalyticsViewerService extends AnalyticsViewer {}

packages/analytics-service/src/modules/analytics/analytics.controller.ts

@@ -32,4 +32,64 @@ export class AnalyticsController
   ): Promise<AnalyticsProto.CustomEventResponse> {
     return await this.analyticsService.logCustomEvent(request);
   }
+
+  async getCustomEventTypes(
+    request: AnalyticsProto.CustomEventTypeRequest,
+  ): Promise<AnalyticsProto.CustomEventTypeResponse> {
+    return await this.analyticsService.getCustomEventTypes(request);
+  }
+
+  async getCustomGraphTypesById(
+    request: AnalyticsProto.CustomGraphTypeRequest,
+  ): Promise<AnalyticsProto.CustomGraphTypeResponse> {
+    return await this.analyticsService.getCustomGraphTypesById(request);
+  }
+
+  async getClickEventsPaginated(
+    request: AnalyticsProto.GetClickEventsRequest,
+  ): Promise<AnalyticsProto.GetClickEventsResponse> {
+    return await this.analyticsService.getClickEventsPaginated(request);
+  }
+
+  async getAllClickEvents(
+    request: AnalyticsProto.GetAllClickEventsRequest,
+  ): Promise<AnalyticsProto.GetAllClickEventsResponse> {
+    return await this.analyticsService.getAllClickEvents(request);
+  }
+
+  async getVisitEventsPaginated(
+    request: AnalyticsProto.GetVisitEventsRequest,
+  ): Promise<AnalyticsProto.GetVisitEventsResponse> {
+    return await this.analyticsService.getVisitEventsPaginated(request);
+  }
+
+  async getAllVisitEvents(
+    request: AnalyticsProto.GetAllVisitEventsRequest,
+  ): Promise<AnalyticsProto.GetAllVisitEventsResponse> {
+    return await this.analyticsService.getAllVisitEvents(request);
+  }
+
+  async getInputEventsPaginated(
+    request: AnalyticsProto.GetInputEventsRequest,
+  ): Promise<AnalyticsProto.GetInputEventsResponse> {
+    return await this.analyticsService.getInputEventsPaginated(request);
+  }
+
+  async getAllInputEvents(
+    request: AnalyticsProto.GetAllInputEventsRequest,
+  ): Promise<AnalyticsProto.GetAllInputEventsResponse> {
+    return await this.analyticsService.getAllInputEvents(request);
+  }
+
+  async getCustomEventsPaginated(
+    request: AnalyticsProto.GetCustomEventsRequest,
+  ): Promise<AnalyticsProto.GetCustomEventsResponse> {
+    return await this.analyticsService.getCustomEventsPaginated(request);
+  }
+
+  async getAllCustomEvents(
+    request: AnalyticsProto.GetAllCustomEventsRequest,
+  ): Promise<AnalyticsProto.GetAllCustomEventsResponse> {
+    return await this.analyticsService.getAllCustomEvents(request);
+  }
 }

packages/analytics-service/src/modules/analytics/analytics.module.ts

@@ -1,46 +1,27 @@
 import { Module } from '@nestjs/common';
 import { ClientsModule, Transport } from '@nestjs/microservices';
-import { AnalyticsProto, AnalyticsProtoFile } from 'juno-proto';
+import { AnalyticsConfigProto, AnalyticsConfigProtoFile } from 'juno-proto';
 import { AnalyticsController } from './analytics.controller';
 import { AnalyticsService } from './analytics.service';
 import { AnalyticsConfigModule } from '../analytics_config/analytics_config.module';
 
-const {
-  ANALYTICS_SERVICE_NAME,
-  JUNO_ANALYTICS_SERVICE_ANALYTICS_PACKAGE_NAME,
-} = AnalyticsProto;
-
 @Module({
   imports: [
     ClientsModule.register([
       {
-        name: ANALYTICS_SERVICE_NAME,
+        name: AnalyticsConfigProto.ANALYTICS_CONFIG_DB_SERVICE_NAME,
         transport: Transport.GRPC,
         options: {
-          package: JUNO_ANALYTICS_SERVICE_ANALYTICS_PACKAGE_NAME,
-          protoPath: AnalyticsProtoFile,
+          url: process.env.DB_SERVICE_ADDR,
+          package:
+            AnalyticsConfigProto.JUNO_ANALYTICS_SERVICE_ANALYTICS_CONFIG_PACKAGE_NAME,
+          protoPath: AnalyticsConfigProtoFile,
         },
       },
     ]),
     AnalyticsConfigModule,
   ],
   controllers: [AnalyticsController],
-  providers: [
-    AnalyticsService,
-    {
-      provide: 'BOG_ANALYTICS',
-      useFactory: async () => {
-        // bog-analytics is absolutely cursed and outdated, have to do some shenanigans
-        // to get around ESM import
-        const loadModule = eval('(specifier) => import(specifier)');
-        const { AnalyticsLogger, EventEnvironment } =
-          await loadModule('bog-analytics');
-
-        return new AnalyticsLogger({
-          environment: EventEnvironment.DEVELOPMENT,
-        });
-      },
-    },
-  ],
+  providers: [AnalyticsService],
 })
 export class AnalyticsModule {}