Revert ":recycle: Change contactsChangd to integrationEntitiesChanged"

This reverts commit fa2e432.

Author: MalteSehmer

src/models/adapter.model.ts

@@ -14,7 +14,7 @@ import {
   LoggedIntegrationEntity,
 } from '.';
 import { IntegrationEntityType } from './integration-entity.model';
-import { IntegrationEntitiesChangedData } from './integration-entities-changed.model';
+import { ContactsChangedData } from './contacts-changed.model';
 
 export interface Adapter {
   getToken?: (config: Config) => Promise<{ apiKey: string }>;
@@ -83,5 +83,5 @@ export interface Adapter {
     req: Request,
     res?: Response,
   ) => Promise<{ apiKey: string; apiUrl: string }>;
-  handleWebhook?: (body: unknown) => Promise<IntegrationEntitiesChangedData>;
+  handleWebhook?: (body: unknown) => Promise<ContactsChangedData>;
 }

src/models/integration-entities-changed.model.ts renamed to src/models/contacts-changed.model.ts

@@ -1,6 +1,6 @@
 import { IntegrationEntityType } from './integration-entity.model';
 
-export type IntegrationEntitiesChangedData = {
+export type ContactsChangedData = {
   integrationName: string;
   data: {
     integrationAccountId: string;

src/models/controller.model.ts

@@ -12,7 +12,7 @@ import {
   ContactDelta,
   ContactTemplate,
   ContactUpdate,
-  IntegrationEntitiesChangedData,
+  ContactsChangedData,
   ServerError,
 } from '.';
 import { calendarEventsSchema, contactsSchema } from '../schemas';
@@ -35,7 +35,7 @@ import {
   PubSubContactsMessage,
   PubSubContactsState,
 } from './pubsub-contacts-message.model';
-import { PubSubIntegrationEntitiesChangedClient } from './pubsub-integration-entities-changed-client.model';
+import { PubSubContactsChangedClient } from './pubsub-contacts-changed-client.model';
 
 const CONTACT_FETCH_TIMEOUT = 5000;
 
@@ -54,7 +54,7 @@ export class Controller {
   private contactCache: ContactCache | null;
   private ajv: Ajv;
   private pubSubClient: PubSubClient | null = null;
-  private pubSubIntegrationEntitiesChangedClient: PubSubIntegrationEntitiesChangedClient | null =
+  private pubSubContactsChangedClient: PubSubContactsChangedClient | null =
     null;
   private integrationName: string = 'UNKNOWN';
   private streamingPromises = new Map<string, Promise<void>>();
@@ -67,19 +67,16 @@ export class Controller {
     if (this.adapter.streamContacts) {
       const {
         PUBSUB_TOPIC_NAME: topicName,
-        PUBSUB_INTEGRATION_ENTITIES_CHANGED_TOPIC_NAME:
-          integrationEntitiesChangedTopicName,
+        PUBSUB_CONTACTS_CHANGED_TOPIC_NAME: contactsChangedTopicName,
         INTEGRATION_NAME: integrationName,
       } = process.env;
 
       if (!topicName) {
         throw new Error('No PUBSUB_TOPIC_NAME provided.');
       }
 
-      if (!integrationEntitiesChangedTopicName) {
-        throw new Error(
-          'No PUBSUB_INTEGRATION_ENTITIES_CHANGED_TOPIC_NAME provided.',
-        );
+      if (!contactsChangedTopicName) {
+        throw new Error('No PUBSUB_CONTACTS_CHANGED_TOPIC_NAME provided.');
       }
 
       if (!integrationName) {
@@ -93,13 +90,12 @@ export class Controller {
         `Initialized PubSub client with topic ${topicName}`,
       );
 
-      this.pubSubIntegrationEntitiesChangedClient =
-        new PubSubIntegrationEntitiesChangedClient(
-          integrationEntitiesChangedTopicName,
-        );
+      this.pubSubContactsChangedClient = new PubSubContactsChangedClient(
+        contactsChangedTopicName,
+      );
       infoLogger(
         'Controller',
-        `Initialized PubSub client with topic ${integrationEntitiesChangedTopicName}`,
+        `Initialized PubSub client with topic ${contactsChangedTopicName}`,
       );
     }
   }
@@ -1313,11 +1309,11 @@ export class Controller {
         throw new ServerError(501, 'Webhook handling not implemented');
       }
 
-      const changedData: IntegrationEntitiesChangedData =
+      const contactsChangedData: ContactsChangedData =
         await this.adapter.handleWebhook(req.body);
 
-      console.log('sending webhook to pubsub', changedData);
-      this.pubSubIntegrationEntitiesChangedClient?.publishMessage(changedData);
+      console.log('sending webhook to pubsub', contactsChangedData);
+      this.pubSubContactsChangedClient?.publishMessage(contactsChangedData);
 
       res.sendStatus(200);
     } catch (error) {

src/models/index.ts

@@ -7,7 +7,7 @@ export * from './call-event.model';
 export * from './config.model';
 export * from './contact-cache.model';
 export * from './contact.model';
-export * from './integration-entities-changed.model';
+export * from './contacts-changed.model';
 export * from './controller.model';
 export * from './custom-router.model';
 export * from './server-error.model';

src/models/pubsub-integration-entities-changed-client.model.ts renamed to src/models/pubsub-contacts-changed-client.model.ts

@@ -1,10 +1,10 @@
 import { PubSub } from '@google-cloud/pubsub';
 import { timeout } from '../util/timeout';
-import { PubSubIntegrationEntitiesChangedMessage } from './pubsub-integration-entities-changed-message.model';
+import { PubSubContactsChangedMessage } from './pubsub-contacts-changed-message.model';
 
 const PUBLISH_TIMEOUT = 10_000;
 
-export class PubSubIntegrationEntitiesChangedClient {
+export class PubSubContactsChangedClient {
   private client: PubSub;
   private topicName: string;
 
@@ -13,7 +13,7 @@ export class PubSubIntegrationEntitiesChangedClient {
     this.topicName = topicName;
   }
 
-  async publishMessage(message: PubSubIntegrationEntitiesChangedMessage) {
+  async publishMessage(message: PubSubContactsChangedMessage) {
     if (!this.topicName) {
       throw new Error('No pubsub topic name provided.');
     }

src/models/pubsub-contacts-changed-message.model.ts

@@ -0,0 +1,3 @@
+import { ContactsChangedData } from './contacts-changed.model';
+
+export type PubSubContactsChangedMessage = ContactsChangedData;