Fixed analytics tests in api gateway and analytics services

README.md

@@ -123,7 +123,7 @@ With [OpenAPI](https://docs.nestjs.com/openapi/introduction), much of the intern
 
 We use [Prisma](https://www.prisma.io/) in `db-service` as an ORM to define all database schemas/relationships. After a change has been made to the Prisma schema, a migration must be made. There are two options:
 
-1. While Juno is running, run `DATABASE_URL=postgresql://user:password@localhost:<port> pnpm prisma migrate` to generate the migration
+1. While Juno is running, run `DATABASE_URL=postgresql://user:password@localhost:<port> pnpm prisma migrate dev --schema=<path to schema.prisma>` to generate the migration
 2. Verify a new migration has been created under the `migrations` folder
 
 ### Force rebuilding docker containers

package.json

@@ -14,6 +14,7 @@
     "start:dev:live-packages": "concurrently -k \"pnpm start:dev:watch-packages\" \"pnpm start:dev:up-packages\"",
     "start:dev:live-proto": "concurrently -k \"pnpm start:dev:watch-proto\" \"pnpm start:dev:up-proto\"",
     "start:dev:live-all": "concurrently -k -P --success=\"last\" \"pnpm start:dev:watch-all\" \"pnpm start:dev:up-all {@}\" -- ",
+    "dev": "pnpm start:dev:live-all",
     "format:check": "pnpm prettier --check .",
     "format:write": "pnpm prettier --write .",
     "format": "pnpm prettier --write .",

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

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+
 import {
   AnalyticsViewer,
   AnalyticsLogger as BogAnalyticsLogger,

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

@@ -145,7 +145,7 @@ export class AnalyticsService implements OnModuleInit {
     const logger = await this.getAnalyticsLogger(
       this.EventEnvironment.DEVELOPMENT,
       event.configId,
-      event.environment,
+      event.configEnvironment,
     );
 
     if (
@@ -194,7 +194,7 @@ export class AnalyticsService implements OnModuleInit {
     const logger = await this.getAnalyticsLogger(
       this.EventEnvironment.DEVELOPMENT,
       event.configId,
-      event.environment,
+      event.configEnvironment,
     );
 
     if (
@@ -239,7 +239,7 @@ export class AnalyticsService implements OnModuleInit {
     const logger = await this.getAnalyticsLogger(
       this.EventEnvironment.DEVELOPMENT,
       event.configId,
-      event.environment,
+      event.configEnvironment,
     );
 
     if (
@@ -376,7 +376,7 @@ export class AnalyticsService implements OnModuleInit {
     const viewer = await this.getAnalyticsViewer(
       this.EventEnvironment.DEVELOPMENT,
       request.configId,
-      request.environment,
+      request.configEnvironment,
     );
 
     if (!request.projectName || request.projectName.length === 0) {
@@ -427,7 +427,6 @@ export class AnalyticsService implements OnModuleInit {
   async getAllClickEvents(
     request: AnalyticsProto.GetAllClickEventsRequest,
   ): Promise<AnalyticsProto.GetAllClickEventsResponse> {
-    console.log('requesting new viewer ');
     const viewer = await this.getAnalyticsViewer(
       this.EventEnvironment.DEVELOPMENT,
       request.configId,
@@ -452,10 +451,7 @@ export class AnalyticsService implements OnModuleInit {
       limit,
     );
 
-    console.log(response);
-
     if (!response) {
-      console.log('null,');
       return { events: [] };
     }
 
@@ -507,7 +503,6 @@ export class AnalyticsService implements OnModuleInit {
     };
 
     const response = await viewer.getVisitEventsPaginated(queryParams);
-
     if (!response) {
       return { events: [], afterId: '' };
     }