remove unneeded dependencies

Signed-off-by: david <david@umaproject.org>

packages/webhooks/package.json

@@ -25,8 +25,7 @@
     "express": "^4.19.2",
     "express-bearer-token": "^3.0.0",
     "redis": "^4.7.0",
-    "superstruct": "2.0.3-1",
-    "typeorm": "^0.3.20"
+    "superstruct": "2.0.3-1"
   },
   "exports": {
     ".": "./dist/index.js"

packages/webhooks/src/database/webhookClientRepository.ts

@@ -1,5 +1,4 @@
-import { DataSource } from "typeorm";
-import { entities } from "@repo/indexer-database";
+import { entities, DataSource } from "@repo/indexer-database";
 
 // This class is intended to store integration clients allowed to use the webhook service.
 export class WebhookClientRepository {

packages/webhooks/src/database/webhookRequestRepository.ts

@@ -1,6 +1,4 @@
-import { DataSource } from "typeorm";
-import { WebhookRequest } from "../types";
-import { entities } from "@repo/indexer-database";
+import { entities, DataSource } from "@repo/indexer-database";
 
 export class WebhookRequestRepository {
   private repository;
@@ -9,7 +7,7 @@ export class WebhookRequestRepository {
     this.repository = this.dataSource.getRepository(entities.WebhookRequest);
   }
 
-  public async register(webhook: WebhookRequest): Promise<void> {
+  public async register(webhook: entities.WebhookRequest): Promise<void> {
     const existingWebhook = await this.repository.findOne({
       where: { id: webhook.id },
     });
@@ -31,17 +29,19 @@ export class WebhookRequestRepository {
 
   public async getWebhook(
     webhookId: string,
-  ): Promise<WebhookRequest | undefined> {
+  ): Promise<entities.WebhookRequest | undefined> {
     return (
       (await this.repository.findOne({ where: { id: webhookId } })) ?? undefined
     );
   }
 
-  public async listWebhooks(): Promise<WebhookRequest[]> {
+  public async listWebhooks(): Promise<entities.WebhookRequest[]> {
     return this.repository.find();
   }
 
-  public async filterWebhooks(filter: string): Promise<WebhookRequest[]> {
+  public async filterWebhooks(
+    filter: string,
+  ): Promise<entities.WebhookRequest[]> {
     return this.repository.find({ where: { filter } });
   }
 

packages/webhooks/src/eventProcessors/depositStatus.ts

@@ -31,7 +31,7 @@ export class DepositStatusProcessor implements IEventProcessor {
   private postgres: DataSource;
   // Type shoudl be uniqe across all event processors, this is to avoid colliding with multiple
   // processors writing to the same tables
-  public type = "DepositStatus";
+  static type = "DepositStatus";
 
   constructor(deps: Dependencies) {
     this.webhookRequests = new WebhookRequestRepository(deps.postgres);
@@ -40,7 +40,7 @@ export class DepositStatusProcessor implements IEventProcessor {
   }
   private async _write(event: DepositStatusEvent): Promise<void> {
     const filter = customId(
-      this.type,
+      DepositStatusProcessor.type,
       event.originChainId,
       event.depositTxHash,
     );
@@ -65,13 +65,13 @@ export class DepositStatusProcessor implements IEventProcessor {
     params: DepositStatusFilter,
   ): Promise<string> {
     const id = customId(
-      this.type,
+      DepositStatusProcessor.type,
       url,
       params.originChainId,
       params.depositTxHash,
     );
     const filter = customId(
-      this.type,
+      DepositStatusProcessor.type,
       params.originChainId,
       params.depositTxHash,
     );

packages/webhooks/src/factory.ts

@@ -4,9 +4,7 @@ import { DataSource } from "@repo/indexer-database";
 import { Logger } from "winston";
 import { WebhookNotifier } from "./notifier";
 import { DepositStatusProcessor } from "./eventProcessors";
-import { WebhookRequestRepository } from "./database/webhookRequestRepository";
 import { WebhookRouter } from "./router";
-import { entities } from "@repo/indexer-database";
 
 export enum WebhookTypes {
   DepositStatus = "DepositStatus",

packages/webhooks/src/types.ts

@@ -1,11 +1,5 @@
 import * as ss from "superstruct";
 
-export interface WebhookRequest {
-  id: string;
-  url: string;
-  filter: string;
-}
-
 export interface IEventProcessor {
   write(event: JSONValue): void;
   register(url: string, params: JSONValue): Promise<string>;