From 8a6ce607f1ab9c2115b64632394c1a75fad76d23 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Thu, 20 Jul 2023 15:52:25 +0200
Subject: [PATCH 01/42] Automation refactoring

---
 .../automation/components/automation-form.vue |  6 ++
 .../config/automation-types/hubspot.ts        | 16 ++++
 .../config/automation-types/index.ts          | 27 +++++++
 .../config/automation-types/slack.ts          | 35 +++++++++
 .../config/automation-types/webhook.ts        | 12 +++
 .../automation/pages/automation-list-page.vue | 76 ++++++++-----------
 6 files changed, 127 insertions(+), 45 deletions(-)
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/index.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/slack.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/webhook.ts

diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 41ed5d35ac..7e03d3ccaa 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -18,6 +18,12 @@
             Slack notification
           </p>
         </div>
+        <div v-else-if="type === 'hubspot'" class="flex items-center">
+          <img alt="HubSpot" src="/images/integrations/hubspot.png" class="w-4 max-w-4">
+          <p class="pl-2 text-xs text-gray-900">
+            HubSpot
+          </p>
+        </div>
         <h4 class="text-lg font-medium mt-1 text-gray-900">
           Add automation
         </h4>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot.ts b/frontend/src/modules/automation/config/automation-types/hubspot.ts
new file mode 100644
index 0000000000..4590cc2690
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot.ts
@@ -0,0 +1,16 @@
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
+import { CrowdIntegrations } from '@/integrations/integrations-config';
+
+export const hubspot: AutomationTypeConfig = {
+  name: 'HubSpot',
+  description: 'Send members or organizations to HubSpot',
+  icon: '/images/integrations/hubspot.png',
+  canCreate(store) {
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    return hubspot.status === 'done';
+  },
+  disabled(store) {
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    return hubspot.status !== 'done';
+  },
+};
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
new file mode 100644
index 0000000000..d34fa70e93
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -0,0 +1,27 @@
+import { webhook } from './webhook';
+import { slack } from './slack';
+import { hubspot } from './hubspot';
+
+interface AutomationTypeAction {
+  label: string;
+  action: () => void;
+}
+
+export interface AutomationTypeConfig {
+  name: string;
+  description: string;
+  icon: string;
+  canCreate: (store: any) => boolean;
+  actionButton?: (store: any) => AutomationTypeAction | null;
+  disabled?: (store: any) => boolean;
+  emptyScreen?: {
+    title: string;
+    body: string;
+  }
+}
+
+export const automationTypes: Record<string, AutomationTypeConfig> = {
+  hubspot,
+  slack,
+  webhook,
+};
diff --git a/frontend/src/modules/automation/config/automation-types/slack.ts b/frontend/src/modules/automation/config/automation-types/slack.ts
new file mode 100644
index 0000000000..bc48bb36b7
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/slack.ts
@@ -0,0 +1,35 @@
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
+import config from '@/config';
+import { AuthToken } from '@/modules/auth/auth-token';
+
+export const slack: AutomationTypeConfig = {
+  name: 'Slack notification',
+  description: 'Send notifications to your Slack workspace',
+  icon: 'https://cdn-icons-png.flaticon.com/512/3800/3800024.png',
+  emptyScreen: {
+    title: 'No Slack notifications yet',
+    body: 'Send Slack notifications when a new activity happens, or a new member joins your community',
+  },
+  canCreate(store) {
+    const tenant = store.getters['auth/currentTenant'];
+    return !!tenant.settings[0].slackWebHook;
+  },
+  actionButton(store) {
+    const tenant = store.getters['auth/currentTenant'];
+    const slackConnected = !!tenant.settings[0].slackWebHook;
+    if (slackConnected) {
+      return null;
+    }
+    return {
+      label: 'Install app',
+      action: () => {
+        const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?activeTab=automations&success=true`;
+        const slackConnectUrl = `${config.backendUrl}/tenant/${
+          tenant.id
+        }/automation/slack?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
+
+        window.open(slackConnectUrl, '_self');
+      },
+    };
+  },
+};
diff --git a/frontend/src/modules/automation/config/automation-types/webhook.ts b/frontend/src/modules/automation/config/automation-types/webhook.ts
new file mode 100644
index 0000000000..1078b3e87f
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/webhook.ts
@@ -0,0 +1,12 @@
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
+
+export const webhook: AutomationTypeConfig = {
+  name: 'Webhook',
+  description: 'Send webhook payloads to automate workflows',
+  icon: '/images/automation/webhook.png',
+  emptyScreen: {
+    title: 'No Webhooks yet',
+    body: 'Create webhook actions when a new activity happens, or a new member joins your community',
+  },
+  canCreate: () => true,
+};
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index c0ba3a6064..ab207ae838 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -31,43 +31,34 @@
               <span class="ri-arrow-down-s-line text-base ml-2 flex items-center h-4" />
             </el-button>
           </template>
-          <div class="popover-item h-auto mb-1 py-2 px-2.5" @click="createAutomation('webhook')">
-            <div class="flex">
-              <div class="mt-0.5">
-                <img alt="Webhook" src="/images/automation/webhook.png" class="w-4 max-w-4">
-              </div>
-              <div class="pl-2">
-                <h6 class="text-xs leading-5 font-medium mb-0.5 text-gray-900">
-                  Webhook
-                </h6>
-                <p class="text-2xs leading-4.5 text-gray-500 text-left break-normal">
-                  Send webhook payloads to automate workflows
-                </p>
-              </div>
-            </div>
-          </div>
+
           <div
-            class="popover-item  h-auto py-2 px-2.5"
-            :class="{ 'hover:bg-white !cursor-default': !slackConnected }"
-            @click="createSlackAutomation"
+            v-for="(automationType, key) of automationTypes"
+            :key="key"
+            class="popover-item h-auto mb-1 py-2 px-2.5"
+            :class="{
+              'hover:bg-white !cursor-default': !automationType.canCreate(store),
+              'opacity-50': automationType.disabled && automationType.disabled(store),
+            }"
+            @click="createAutomation(key)"
           >
             <div class="flex">
               <div class="mt-0.5">
-                <img alt="Slack" src="https://cdn-icons-png.flaticon.com/512/3800/3800024.png" class="w-4 max-w-4">
+                <img :alt="automationType.name" :src="automationType.icon" class="w-4 max-w-4">
               </div>
               <div class="pl-2">
                 <h6 class="text-xs leading-5 font-medium mb-0.5 text-gray-900">
-                  Slack notification
+                  {{ automationType.name }}
                 </h6>
                 <p class="text-2xs leading-4.5 text-gray-500 text-left break-normal">
-                  Send notifications to your Slack workspace
+                  {{ automationType.description }}
                 </p>
                 <el-button
-                  v-if="!slackConnected"
+                  v-if="automationType.actionButton && automationType.actionButton(store)"
                   class="btn btn--primary btn--sm !h-8 mt-3"
-                  @click="authenticateSlack"
+                  @click="automationType.actionButton(store).action()"
                 >
-                  Install app
+                  {{ automationType.actionButton(store).label }}
                 </el-button>
               </div>
             </div>
@@ -89,16 +80,10 @@
 
     <!-- Empty state for no automations configured -->
     <app-empty-state-cta
-      v-else-if="filter.type === 'slack'"
+      v-else-if="automationTypes[filter.type]?.emptyScreen"
       icon="ri-flow-chart"
-      title="No Slack notifications yet"
-      description="Send Slack notifications when a new activity happens, or a new member joins your community"
-    />
-    <app-empty-state-cta
-      v-else-if="filter.type === 'webhook'"
-      icon="ri-flow-chart"
-      title="No Webhooks yet"
-      description="Create webhook actions when a new activity happens, or a new member joins your community"
+      :title="automationTypes[filter.type]?.emptyScreen.title"
+      :description="automationTypes[filter.type]?.emptyScreen.body"
     />
     <app-empty-state-cta
       v-else
@@ -135,19 +120,18 @@ import AppAutomationExecutions from '@/modules/automation/components/automation-
 import { FeatureFlag } from '@/featureFlag';
 import { getWorkflowMax, showWorkflowLimitDialog } from '@/modules/automation/automation-limit';
 
+import { useStore } from 'vuex';
+import { automationTypes } from '../config/automation-types';
+
 const options = ref([
   {
     label: 'All',
     value: 'all',
   },
-  {
-    label: 'Slack notifications',
-    value: 'slack',
-  },
-  {
-    label: 'Webhooks',
-    value: 'webhook',
-  },
+  ...(Object.entries(automationTypes).map(([key, config]) => ({
+    label: config.name,
+    value: key,
+  }))),
 ]);
 const openAutomationForm = ref(false);
 const automationFormType = ref(null);
@@ -162,6 +146,8 @@ const { getAutomations, changeAutomationFilter } = automationStore;
 
 const { currentTenant } = mapGetters('auth');
 
+const store = useStore();
+
 /**
  * Check if tenant has feature flag enabled
  */
@@ -183,6 +169,10 @@ const canAddAutomation = () => {
 
 // Executions drawer
 const createAutomation = (type) => {
+  if (!automationTypes[type].canCreate(store)) {
+    return;
+  }
+
   if (!canAddAutomation()) {
     return;
   }
@@ -215,10 +205,6 @@ const authenticateSlack = () => {
 
 const createSlackAutomation = () => {
   if (slackConnected.value) {
-    if (!canAddAutomation()) {
-      return;
-    }
-
     createAutomation('slack');
   }
 };

From 9d1333a054807b2210afb8c68fbb7464949a0376 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Fri, 21 Jul 2023 11:02:29 +0200
Subject: [PATCH 02/42] Split to configuration

---
 frontend/public/icons/crowd-icons.svg         |  2 +-
 .../components/discourse-connect-drawer.vue   |  2 +-
 .../slack/components/slack-connect.vue        |  2 +-
 .../automation/components/automation-form.vue | 90 ++++--------------
 .../executions/automation-execution.vue       |  2 +-
 .../config/automation-types/hubspot.ts        | 16 ----
 .../config/automation-types/hubspot/config.ts | 24 +++++
 .../hubspot/hubspot-action.vue                | 73 +++++++++++++++
 .../hubspot/hubspot-trigger.vue               | 91 +++++++++++++++++++
 .../config/automation-types/index.ts          | 36 +++++---
 .../new-activity-filter-options.vue           |  0
 .../new-member-filter-options.vue             |  0
 .../shared/trigger-member-activity.vue        | 53 +++++++++++
 .../{slack.ts => slack/config.ts}             |  9 +-
 .../automation-types/slack}/slack-action.vue  |  0
 .../config/automation-types/webhook.ts        | 12 ---
 .../config/automation-types/webhook/config.ts | 19 ++++
 .../webhook}/webhook-action.vue               |  0
 .../automation/pages/automation-list-page.vue |  4 +-
 19 files changed, 315 insertions(+), 120 deletions(-)
 delete mode 100644 frontend/src/modules/automation/config/automation-types/hubspot.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/config.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
 rename frontend/src/modules/automation/{components => config/automation-types/shared}/filter-options/new-activity-filter-options.vue (100%)
 rename frontend/src/modules/automation/{components => config/automation-types/shared}/filter-options/new-member-filter-options.vue (100%)
 create mode 100644 frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
 rename frontend/src/modules/automation/config/automation-types/{slack.ts => slack/config.ts} (72%)
 rename frontend/src/modules/automation/{components/action => config/automation-types/slack}/slack-action.vue (100%)
 delete mode 100644 frontend/src/modules/automation/config/automation-types/webhook.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/webhook/config.ts
 rename frontend/src/modules/automation/{components/action => config/automation-types/webhook}/webhook-action.vue (100%)

diff --git a/frontend/public/icons/crowd-icons.svg b/frontend/public/icons/crowd-icons.svg
index 9c3fd0b8ee..20954faa40 100644
--- a/frontend/public/icons/crowd-icons.svg
+++ b/frontend/public/icons/crowd-icons.svg
@@ -30,7 +30,7 @@
             <path d="M4.29 6.29607C4.15143 6.1925 4.0125 6.14071 3.87393 6.14071H3.25107V9.87179H3.87429C4.01286 9.87179 4.15179 9.82 4.29036 9.71643C4.42893 9.61286 4.49821 9.4575 4.49821 9.25V6.7625C4.49786 6.55536 4.42821 6.39964 4.29 6.29607ZM14.4321 0H1.56786C0.703571 0 0.00214286 0.699643 0 1.56429V14.4357C0.00214286 15.3004 0.703571 16 1.56786 16H14.4321C15.2968 16 15.9979 15.3004 16 14.4357V1.56429C15.9979 0.699643 15.2964 0 14.4321 0ZM5.50714 9.25679C5.50714 9.92857 5.0925 10.9464 3.78 10.9443H2.12286V5.035H3.815C5.08071 5.035 5.50643 6.05143 5.50679 6.72357L5.50714 9.25679ZM9.10286 6.09036H7.2V7.4625H8.36321V8.51857H7.2V9.89036H9.10321V10.9464H6.8825C6.48393 10.9568 6.1525 10.6418 6.1425 10.2432V5.775C6.13286 5.37679 6.44821 5.04607 6.84643 5.03607H9.10321L9.10286 6.09036ZM12.8043 10.2079C12.3329 11.3061 11.4882 11.0875 11.11 10.2079L9.73393 5.03643H10.8971L11.9582 9.09786L13.0143 5.03643H14.1779L12.8043 10.2079Z"/>
         </svg>
     </symbol>
-    <symbol id="slack">
+    <symbol id="config">
         <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
             <path d="M3.36156 10.111C3.36156 11.036 2.60586 11.7917 1.68078 11.7917C0.755701 11.7917 0 11.036 0 10.111C0 9.18588 0.755701 8.43018 1.68078 8.43018H3.36156V10.111Z"/>
             <path d="M4.20847 10.111C4.20847 9.18588 4.96417 8.43018 5.88926 8.43018C6.81434 8.43018 7.57004 9.18588 7.57004 10.111V14.3194C7.57004 15.2445 6.81434 16.0002 5.88926 16.0002C4.96417 16.0002 4.20847 15.2445 4.20847 14.3194V10.111Z"/>
diff --git a/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue b/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
index 56536ba330..9cb1222560 100644
--- a/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
+++ b/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
@@ -144,7 +144,7 @@
       <el-card v-if="isAPIConnectionValid && props.integration?.settings?.forumHostname" shadow="never" class="rounded-[6px]">
         <div class="mb-3 flex flex-row w-full justify-between">
           <el-button :disabled="isWebhookVerifying" class="btn btn--bordered" @click="verifyWebhook()">
-            Verify webhook
+            Verify config
           </el-button>
           <div v-if="isWebhookVerifying == null" />
           <div v-else-if="isWebhookVerifying">
diff --git a/frontend/src/integrations/slack/components/slack-connect.vue b/frontend/src/integrations/slack/components/slack-connect.vue
index bc13d4fe2c..48bc712bdf 100644
--- a/frontend/src/integrations/slack/components/slack-connect.vue
+++ b/frontend/src/integrations/slack/components/slack-connect.vue
@@ -19,7 +19,7 @@ defineProps({
 const connectUrl = computed(() => {
   const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?success=true`;
 
-  return `${config.backendUrl}/slack/${
+  return `${config.backendUrl}/config/${
     store.getters['auth/currentTenant'].id
   }/connect?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
 });
diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 7e03d3ccaa..518ccf7b4d 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -1,27 +1,16 @@
 <template>
   <app-drawer
+    v-if="typeData"
     v-model="isDrawerOpen"
     title=""
     :size="600"
   >
     <template #header>
       <div>
-        <div v-if="type === 'webhook'" class="flex items-center">
-          <img alt="Webhook" src="/images/automation/webhook.png" class="w-4 max-w-4">
-          <p class="pl-2 text-xs text-gray-900">
-            Webhook
-          </p>
-        </div>
-        <div v-else-if="type === 'slack'" class="flex items-center">
-          <img alt="Slack" src="https://cdn-icons-png.flaticon.com/512/3800/3800024.png" class="w-4 max-w-4">
-          <p class="pl-2 text-xs text-gray-900">
-            Slack notification
-          </p>
-        </div>
-        <div v-else-if="type === 'hubspot'" class="flex items-center">
-          <img alt="HubSpot" src="/images/integrations/hubspot.png" class="w-4 max-w-4">
+        <div class="flex items-center">
+          <img :alt="typeData.name" :src="typeData.icon" class="w-4 max-w-4">
           <p class="pl-2 text-xs text-gray-900">
-            HubSpot
+            {{ typeData.name }}
           </p>
         </div>
         <h4 class="text-lg font-medium mt-1 text-gray-900">
@@ -44,63 +33,25 @@
           <h5 class="text-base leading-5 text-brand-500 font-semibold mb-1">
             Trigger
           </h5>
-          <p v-if="type === 'webhook'" class="text-2xs text-gray-500">
-            Define the event that triggers your webhook
-          </p>
-          <p v-else-if="type === 'slack'" class="text-2xs text-gray-500">
-            Define the event that triggers your Slack notification.
+          <p class="text-2xs text-gray-500">
+            {{ typeData.triggerText }}
           </p>
         </div>
-        <app-form-item
-          class="mb-4"
-          label="Choose trigger"
-          :required="true"
-          :validation="$v.trigger"
-          :error-messages="{
-            required: 'This field is required',
-          }"
-        >
-          <el-select
-            v-model="form.trigger"
-            placeholder="Select option"
-            class="w-full"
-            @change="collapseOpen = 'filterOptions'"
-            @blur="$v.trigger.$touch"
-          >
-            <el-option
-              v-for="{ value, label } of triggerOptions"
-              :key="value"
-              :value="value"
-              :label="label"
-            />
-          </el-select>
-        </app-form-item>
-        <div class="filter-options pb-8">
-          <el-collapse v-if="form.trigger" v-model="collapseOpen">
-            <el-collapse-item
-              title="Filter options"
-              name="filterOptions"
-            >
-              <app-new-activity-filter-options v-if="form.trigger === 'new_activity'" v-model="form.settings" />
-              <app-new-member-filter-options v-if="form.trigger === 'new_member'" v-model="form.settings" />
-            </el-collapse-item>
-          </el-collapse>
-        </div>
+        <section class="pb-8">
+          <component :is="typeData.triggerComponent" v-model:settings="form.settings" v-model:trigger="form.trigger" />
+        </section>
+
         <hr>
         <div class="py-6">
           <h5 class="text-base leading-5 text-brand-500 font-semibold mb-1">
             Action
           </h5>
-          <p v-if="type === 'webhook'" class="text-2xs text-gray-500">
-            Define the endpoint where the webhook payload should be sent to
-          </p>
-          <p v-else-if="type === 'slack'" class="text-2xs text-gray-500">
-            Receive a notification in your Slack workspace every time the event is triggered.
+          <p class="text-2xs text-gray-500">
+            {{ typeData.triggerText }}
           </p>
         </div>
         <div>
-          <app-automation-webhook-action v-if="type === 'webhook'" v-model="form.settings" />
-          <app-automation-slack-action v-else-if="type === 'slack'" v-model="form.settings" />
+          <component :is="typeData.actionComponent" v-model="form.settings" />
         </div>
       </div>
     </template>
@@ -133,8 +84,9 @@
             @click="doSubmit"
           >
             <span v-if="isEdit">Update</span>
-            <span v-else-if="type === 'webhook'">Add webhook</span>
-            <span v-else-if="type === 'slack'">Add Slack notification</span>
+            <span v-else-if="typeData && typeData.createButtonText">
+              {{ typeData.createButtonText }}
+            </span>
             <span v-else>Add automation</span>
           </el-button>
         </div>
@@ -148,19 +100,15 @@ import {
   computed, defineProps, defineEmits, reactive, ref, watch, onMounted,
 } from 'vue';
 import AppDrawer from '@/shared/drawer/drawer.vue';
-import { required } from '@vuelidate/validators';
+import { email, required } from "@vuelidate/validators";
 import useVuelidate from '@vuelidate/core';
 import AppFormItem from '@/shared/form/form-item.vue';
-import AppNewActivityFilterOptions
-  from '@/modules/automation/components/filter-options/new-activity-filter-options.vue';
-import AppNewMemberFilterOptions from '@/modules/automation/components/filter-options/new-member-filter-options.vue';
-import AppAutomationWebhookAction from '@/modules/automation/components/action/webhook-action.vue';
-import AppAutomationSlackAction from '@/modules/automation/components/action/slack-action.vue';
 import { useAutomationStore } from '@/modules/automation/store';
 import Message from '@/shared/message/message';
 import { i18n } from '@/i18n';
 import formChangeDetector from '@/shared/form/form-change';
 import { useStore } from 'vuex';
+import { automationTypes } from '../config/automation-types';
 
 const props = defineProps({
   modelValue: {
@@ -197,6 +145,8 @@ const isDrawerOpen = computed({
   },
 });
 
+const typeData = computed(() => props.type && automationTypes[props.type]);
+
 const type = computed(() => props.automation?.type || props.type);
 
 const isEdit = computed(() => props.automation !== null);
diff --git a/frontend/src/modules/automation/components/executions/automation-execution.vue b/frontend/src/modules/automation/components/executions/automation-execution.vue
index b201caa895..6edf10ab78 100644
--- a/frontend/src/modules/automation/components/executions/automation-execution.vue
+++ b/frontend/src/modules/automation/components/executions/automation-execution.vue
@@ -102,7 +102,7 @@ const slackConnectUrl = computed(() => {
 
   return `${config.backendUrl}/tenant/${
     currentTenant.value.id
-  }/automation/slack?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
+  }/automation/config?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
 });
 
 const authenticateSlack = () => {
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot.ts b/frontend/src/modules/automation/config/automation-types/hubspot.ts
deleted file mode 100644
index 4590cc2690..0000000000
--- a/frontend/src/modules/automation/config/automation-types/hubspot.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
-import { CrowdIntegrations } from '@/integrations/integrations-config';
-
-export const hubspot: AutomationTypeConfig = {
-  name: 'HubSpot',
-  description: 'Send members or organizations to HubSpot',
-  icon: '/images/integrations/hubspot.png',
-  canCreate(store) {
-    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    return hubspot.status === 'done';
-  },
-  disabled(store) {
-    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    return hubspot.status !== 'done';
-  },
-};
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
new file mode 100644
index 0000000000..9f69d3c067
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -0,0 +1,24 @@
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types';
+// import { CrowdIntegrations } from '@/integrations/integrations-config';
+import AutomationsHubspotAction from './hubspot-action.vue';
+import AutomationsHubspotTrigger from './hubspot-trigger.vue'
+
+export const hubspot: AutomationTypeConfig = {
+  name: 'HubSpot',
+  description: 'Send members or organizations to HubSpot',
+  icon: '/images/integrations/hubspot.png',
+  triggerText: 'Define the conditions that will trigger your HubSpot action.',
+  actionText: 'Define which action will take place in HubSpot based on the defined conditions.',
+  canCreate(store) {
+    return true;
+    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    // return hubspot.status === 'done';
+  },
+  disabled(store) {
+    return false;
+    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    // return hubspot.status !== 'done';
+  },
+  actionComponent: AutomationsHubspotAction,
+  triggerComponent: AutomationsHubspotTrigger,
+};
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
new file mode 100644
index 0000000000..6b22e9bb93
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <app-form-item
+      class="pb-4"
+      label="Hubspot URL"
+      :required="true"
+      :validation="$v.url"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-input
+        v-model="form.url"
+        type="url"
+        placholder="https://somewebhook.url"
+        @blur="$v.url.$touch"
+        @change="$v.url.$touch"
+      />
+    </app-form-item>
+  </div>
+</template>
+
+<script setup>
+import {
+  computed, defineEmits, defineProps, onMounted,
+} from 'vue';
+import AppFormItem from '@/shared/form/form-item.vue';
+import { required } from '@vuelidate/validators';
+import useVuelidate from '@vuelidate/core';
+
+const emit = defineEmits(['update:modelValue']);
+
+const props = defineProps({
+  modelValue: {
+    type: Object,
+    required: true,
+  },
+});
+
+const defaultValue = {
+  url: '',
+};
+
+const form = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(value) {
+    emit('update:modelValue', value);
+  },
+});
+
+const rules = {
+  url: {
+    required,
+  },
+};
+
+const $v = useVuelidate(rules, form);
+
+onMounted(() => {
+  if (Object.keys(props.modelValue).length === 0) {
+    emit('update:modelValue', defaultValue);
+  }
+});
+
+</script>
+
+<script>
+export default {
+  name: 'AppAutomationHubspotAction',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
new file mode 100644
index 0000000000..32ee57d4e1
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <app-form-item
+      class="mb-4"
+      label="Choose trigger"
+      :required="true"
+      :validation="$v.trigger"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-select
+        v-model="form.trigger"
+        placeholder="Select option"
+        class="w-full"
+        @blur="$v.trigger.$touch"
+      >
+        <el-option
+          v-for="{ value, label } of triggerOptions"
+          :key="value"
+          :value="value"
+          :label="label"
+        />
+      </el-select>
+    </app-form-item>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  computed, defineEmits, reactive, ref,
+} from 'vue';
+import AppFormItem from '@/shared/form/form-item.vue';
+import useVuelidate from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+
+const props = defineProps<{
+  trigger: string,
+  settings: any,
+}>();
+
+const emit = defineEmits<{(e: 'update:trigger', value: string), (e: 'update:settings', value: any),}>();
+
+const trigger = computed<string>({
+  get() {
+    return props.trigger;
+  },
+  set(trigger: string) {
+    emit('update:trigger', trigger);
+  },
+});
+
+const settings = computed<any>({
+  get() {
+    return props.settings;
+  },
+  set(trigger: any) {
+    emit('update:settings', trigger);
+  },
+});
+
+const triggerOptions = ref([
+  {
+    label: 'Member attributes match condition(s)',
+    value: 'member_attributes_match',
+  },
+  {
+    label: 'Organization attributes match condition(s)',
+    value: 'organization_attributes_match',
+  },
+]);
+
+const form = reactive({
+  trigger: '',
+  settings: {},
+});
+
+const rules = {
+  trigger: {
+    required,
+  },
+};
+
+const $v = useVuelidate(rules, form);
+</script>
+
+<script lang="ts">
+export default {
+  name: 'AppAutomationHubspotTrigger',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
index d34fa70e93..934996f47c 100644
--- a/frontend/src/modules/automation/config/automation-types/index.ts
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -1,23 +1,29 @@
-import { webhook } from './webhook';
-import { slack } from './slack';
-import { hubspot } from './hubspot';
+import { webhook } from './webhook/config';
+import { slack } from './slack/config';
+import { hubspot } from './hubspot/config';
 
 interface AutomationTypeAction {
-  label: string;
-  action: () => void;
+  label: string; // Text of the action button
+  action: () => void; // Action triggered on  button click
+}
+interface AutomationTypeEmptyScreen {
+  title: string; // Title in empty screen
+  body: string; // Body text in empty screen
 }
 
 export interface AutomationTypeConfig {
-  name: string;
-  description: string;
-  icon: string;
-  canCreate: (store: any) => boolean;
-  actionButton?: (store: any) => AutomationTypeAction | null;
-  disabled?: (store: any) => boolean;
-  emptyScreen?: {
-    title: string;
-    body: string;
-  }
+  name: string; // Name of the automation
+  description: string; // Description shown under name in dropdown
+  icon: string; // Icon of the automation type
+  canCreate: (store: any) => boolean; // method if creation of that automation type is disabled
+  actionButton?: (store: any) => AutomationTypeAction | null; // Action button to show in dropdown
+  disabled?: (store: any) => boolean; // If dropdown option is disabled
+  emptyScreen?: AutomationTypeEmptyScreen, // Text for empty screen if there is no automations of that type
+  triggerText: string; // Description shown below Trigger in automation form
+  actionText: string; // Description shown below Action in automation form
+  createButtonText?: string;
+  actionComponent: any; // Component which handeles form for action
+  triggerComponent: any; // Component which handeles form for trigger
 }
 
 export const automationTypes: Record<string, AutomationTypeConfig> = {
diff --git a/frontend/src/modules/automation/components/filter-options/new-activity-filter-options.vue b/frontend/src/modules/automation/config/automation-types/shared/filter-options/new-activity-filter-options.vue
similarity index 100%
rename from frontend/src/modules/automation/components/filter-options/new-activity-filter-options.vue
rename to frontend/src/modules/automation/config/automation-types/shared/filter-options/new-activity-filter-options.vue
diff --git a/frontend/src/modules/automation/components/filter-options/new-member-filter-options.vue b/frontend/src/modules/automation/config/automation-types/shared/filter-options/new-member-filter-options.vue
similarity index 100%
rename from frontend/src/modules/automation/components/filter-options/new-member-filter-options.vue
rename to frontend/src/modules/automation/config/automation-types/shared/filter-options/new-member-filter-options.vue
diff --git a/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue b/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
new file mode 100644
index 0000000000..967bdb5f29
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
@@ -0,0 +1,53 @@
+<template>
+  <div>
+    <app-form-item
+      class="mb-4"
+      label="Choose trigger"
+      :required="true"
+      :validation="$v.trigger"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-select
+        v-model="form.trigger"
+        placeholder="Select option"
+        class="w-full"
+        @change="collapseOpen = 'filterOptions'"
+        @blur="$v.trigger.$touch"
+      >
+        <el-option
+          v-for="{ value, label } of triggerOptions"
+          :key="value"
+          :value="value"
+          :label="label"
+        />
+      </el-select>
+    </app-form-item>
+    <div class="filter-options pb-8">
+      <el-collapse v-if="form.trigger" v-model="collapseOpen">
+        <el-collapse-item
+          title="Filter options"
+          name="filterOptions"
+        >
+          <app-new-activity-filter-options v-if="form.trigger === 'new_activity'" v-model="form.settings" />
+          <app-new-member-filter-options v-if="form.trigger === 'new_member'" v-model="form.settings" />
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import AppFormItem from '@/shared/form/form-item.vue';
+import AppNewActivityFilterOptions
+  from '@/modules/automation/config/automation-types/shared/filter-options/new-activity-filter-options.vue';
+import AppNewMemberFilterOptions
+  from '@/modules/automation/config/automation-types/shared/filter-options/new-member-filter-options.vue';
+</script>
+
+<script lang="ts">
+export default {
+  name: 'AppAutomationTriggerMemberActivity',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/slack.ts b/frontend/src/modules/automation/config/automation-types/slack/config.ts
similarity index 72%
rename from frontend/src/modules/automation/config/automation-types/slack.ts
rename to frontend/src/modules/automation/config/automation-types/slack/config.ts
index bc48bb36b7..9da70b50e1 100644
--- a/frontend/src/modules/automation/config/automation-types/slack.ts
+++ b/frontend/src/modules/automation/config/automation-types/slack/config.ts
@@ -1,6 +1,8 @@
-import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types';
 import config from '@/config';
 import { AuthToken } from '@/modules/auth/auth-token';
+import AutomationsSlackAction from './slack-action.vue';
+import AutomationsTriggerMemberActivity from '../shared/trigger-member-activity.vue';
 
 export const slack: AutomationTypeConfig = {
   name: 'Slack notification',
@@ -10,6 +12,9 @@ export const slack: AutomationTypeConfig = {
     title: 'No Slack notifications yet',
     body: 'Send Slack notifications when a new activity happens, or a new member joins your community',
   },
+  triggerText: 'Define the event that triggers your Slack notification.',
+  actionText: 'Receive a notification in your Slack workspace every time the event is triggered.',
+  createButtonText: 'Add Slack notification',
   canCreate(store) {
     const tenant = store.getters['auth/currentTenant'];
     return !!tenant.settings[0].slackWebHook;
@@ -32,4 +37,6 @@ export const slack: AutomationTypeConfig = {
       },
     };
   },
+  actionComponent: AutomationsSlackAction,
+  triggerComponent: AutomationsTriggerMemberActivity,
 };
diff --git a/frontend/src/modules/automation/components/action/slack-action.vue b/frontend/src/modules/automation/config/automation-types/slack/slack-action.vue
similarity index 100%
rename from frontend/src/modules/automation/components/action/slack-action.vue
rename to frontend/src/modules/automation/config/automation-types/slack/slack-action.vue
diff --git a/frontend/src/modules/automation/config/automation-types/webhook.ts b/frontend/src/modules/automation/config/automation-types/webhook.ts
deleted file mode 100644
index 1078b3e87f..0000000000
--- a/frontend/src/modules/automation/config/automation-types/webhook.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AutomationTypeConfig } from '@/modules/automation/config/automation-types/index';
-
-export const webhook: AutomationTypeConfig = {
-  name: 'Webhook',
-  description: 'Send webhook payloads to automate workflows',
-  icon: '/images/automation/webhook.png',
-  emptyScreen: {
-    title: 'No Webhooks yet',
-    body: 'Create webhook actions when a new activity happens, or a new member joins your community',
-  },
-  canCreate: () => true,
-};
diff --git a/frontend/src/modules/automation/config/automation-types/webhook/config.ts b/frontend/src/modules/automation/config/automation-types/webhook/config.ts
new file mode 100644
index 0000000000..d1eeb3dbfe
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/webhook/config.ts
@@ -0,0 +1,19 @@
+import { AutomationTypeConfig } from '@/modules/automation/config/automation-types';
+import AutomationsWebhookAction from './webhook-action.vue';
+import AutomationsTriggerMemberActivity from '../shared/trigger-member-activity.vue';
+
+export const webhook: AutomationTypeConfig = {
+  name: 'Webhook',
+  description: 'Send webhook payloads to automate workflows',
+  icon: '/images/automation/webhook.png',
+  emptyScreen: {
+    title: 'No Webhooks yet',
+    body: 'Create webhook actions when a new activity happens, or a new member joins your community',
+  },
+  triggerText: 'Define the event that triggers your webhook',
+  actionText: 'Define the endpoint where the webhook payload should be sent to',
+  createButtonText: 'Add webhook',
+  canCreate: () => true,
+  actionComponent: AutomationsWebhookAction,
+  triggerComponent: AutomationsTriggerMemberActivity,
+};
diff --git a/frontend/src/modules/automation/components/action/webhook-action.vue b/frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue
similarity index 100%
rename from frontend/src/modules/automation/components/action/webhook-action.vue
rename to frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index ab207ae838..56da68c7d9 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -89,7 +89,7 @@
       v-else
       icon="ri-flow-chart"
       title="Start to automate manual tasks"
-      description="Create webhook actions or send Slack notifications when a new activity happens, or a new member joins your community "
+      description="Create config actions or send Slack notifications when a new activity happens, or a new member joins your community "
     />
 
     <!-- Add/Edit Webhook form drawer -->
@@ -196,7 +196,7 @@ const slackConnectUrl = computed(() => {
 
   return `${config.backendUrl}/tenant/${
     currentTenant.value.id
-  }/automation/slack?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
+  }/automation/config?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
 });
 
 const authenticateSlack = () => {

From b7540360b2b66e61ec899c10b2fc0b2040a2c9a5 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Mon, 24 Jul 2023 17:16:07 +0200
Subject: [PATCH 03/42] Add common trigger component

---
 .../automation/components/automation-form.vue | 13 ----
 .../shared/trigger-member-activity.vue        | 62 +++++++++++++++++--
 .../webhook/webhook-action.vue                |  4 +-
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 518ccf7b4d..6e4b3a4a13 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -151,19 +151,6 @@ const type = computed(() => props.automation?.type || props.type);
 
 const isEdit = computed(() => props.automation !== null);
 
-const triggerOptions = ref([
-  {
-    label: 'New activity happened in your community',
-    value: 'new_activity',
-  },
-  {
-    label: 'New member joined your community',
-    value: 'new_member',
-  },
-]);
-
-const collapseOpen = ref('filterOptions');
-
 // Setup and validation
 const form = reactive({
   name: '',
diff --git a/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue b/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
index 967bdb5f29..2a8b110ead 100644
--- a/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
+++ b/frontend/src/modules/automation/config/automation-types/shared/trigger-member-activity.vue
@@ -10,7 +10,7 @@
       }"
     >
       <el-select
-        v-model="form.trigger"
+        v-model="trigger"
         placeholder="Select option"
         class="w-full"
         @change="collapseOpen = 'filterOptions'"
@@ -25,13 +25,13 @@
       </el-select>
     </app-form-item>
     <div class="filter-options pb-8">
-      <el-collapse v-if="form.trigger" v-model="collapseOpen">
+      <el-collapse v-if="trigger" v-model="collapseOpen">
         <el-collapse-item
           title="Filter options"
           name="filterOptions"
         >
-          <app-new-activity-filter-options v-if="form.trigger === 'new_activity'" v-model="form.settings" />
-          <app-new-member-filter-options v-if="form.trigger === 'new_member'" v-model="form.settings" />
+          <app-new-activity-filter-options v-if="trigger === 'new_activity'" v-model="settings" />
+          <app-new-member-filter-options v-if="trigger === 'new_member'" v-model="settings" />
         </el-collapse-item>
       </el-collapse>
     </div>
@@ -44,6 +44,60 @@ import AppNewActivityFilterOptions
   from '@/modules/automation/config/automation-types/shared/filter-options/new-activity-filter-options.vue';
 import AppNewMemberFilterOptions
   from '@/modules/automation/config/automation-types/shared/filter-options/new-member-filter-options.vue';
+import { computed, defineEmits, ref } from 'vue';
+import { required } from '@vuelidate/validators';
+import useVuelidate from '@vuelidate/core';
+
+interface AutomationTriggerForm {
+  trigger: string;
+  settings: any;
+}
+
+const props = defineProps<AutomationTriggerForm>();
+
+const emit = defineEmits<{(e: 'update:trigger', value: string), (e: 'update:settings', value: any),}>();
+
+const collapseOpen = ref('filterOptions');
+
+const triggerOptions = ref([
+  {
+    label: 'New activity happened in your community',
+    value: 'new_activity',
+  },
+  {
+    label: 'New member joined your community',
+    value: 'new_member',
+  },
+]);
+
+const trigger = computed<string>({
+  get() {
+    return props.trigger;
+  },
+  set(value: string) {
+    emit('update:trigger', value);
+  },
+});
+
+const settings = computed<any>({
+  get() {
+    return props.settings;
+  },
+  set(value: any) {
+    emit('update:settings', value);
+  },
+});
+
+const rules = {
+  trigger: {
+    required,
+  },
+};
+
+const $v = useVuelidate<AutomationTriggerForm>(rules, {
+  trigger,
+  settings,
+});
 </script>
 
 <script lang="ts">
diff --git a/frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue b/frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue
index 14eeca4071..26491df36e 100644
--- a/frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/webhook/webhook-action.vue
@@ -7,6 +7,7 @@
       :validation="$v.url"
       :error-messages="{
         required: 'This field is required',
+        url: 'This is not a valid url',
       }"
     >
       <el-input
@@ -25,7 +26,7 @@ import {
   computed, defineEmits, defineProps, onMounted,
 } from 'vue';
 import AppFormItem from '@/shared/form/form-item.vue';
-import { required } from '@vuelidate/validators';
+import { required, url } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
 
 const emit = defineEmits(['update:modelValue']);
@@ -53,6 +54,7 @@ const form = computed({
 const rules = {
   url: {
     required,
+    url,
   },
 };
 

From 77b2e76796ebca741f8b5a47ec04dae7ca60bfed Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Tue, 25 Jul 2023 19:18:55 +0200
Subject: [PATCH 04/42] Hubspot automation form

---
 .../images/automation/hubspot-paywall.png     | Bin 0 -> 16483 bytes
 frontend/src/i18n/en.js                       |   2 +
 .../automation/components/automation-form.vue |   4 +-
 .../actions/hubspot-action-company-list.vue   | 109 +++++++++++++
 .../actions/hubspot-action-contact-list.vue   |  59 ++++++++
 .../config/automation-types/hubspot/config.ts |  42 ++++-
 .../hubspot/hubspot-action.vue                | 120 ++++++++++++---
 .../hubspot/hubspot-paywall.vue               |  33 ++++
 .../hubspot/hubspot-trigger.vue               | 143 ++++++++++++++++--
 .../hubspot/types/HubspotAutomationAction.ts  |   4 +
 .../hubspot/types/HubspotAutomationTrigger.ts |   4 +
 .../config/automation-types/index.ts          |   5 +-
 .../automation/pages/automation-list-page.vue |  66 ++++----
 .../modules/filters/components/FilterItem.vue |   5 +-
 14 files changed, 520 insertions(+), 76 deletions(-)
 create mode 100644 frontend/public/images/automation/hubspot-paywall.png
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/hubspot-paywall.vue
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationAction.ts
 create mode 100644 frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger.ts

diff --git a/frontend/public/images/automation/hubspot-paywall.png b/frontend/public/images/automation/hubspot-paywall.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a445463b4835ee22cdea81974b0e0f7df21b090
GIT binary patch
literal 16483
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
JPDHLkV1lN!8ifD=

literal 0
HcmV?d00001

diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js
index cbc69d8af7..21fc3160dc 100644
--- a/frontend/src/i18n/en.js
+++ b/frontend/src/i18n/en.js
@@ -385,6 +385,8 @@ const en = {
         new_activity:
           'New activity happened in your community',
         new_member: 'New member joined your community',
+        member_attributes_match: 'Member attributes match condition(s)',
+        organization_attributes_match: 'Organization attributes match condition(s)',
       },
     },
 
diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 6e4b3a4a13..ec68a8dd73 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -47,11 +47,11 @@
             Action
           </h5>
           <p class="text-2xs text-gray-500">
-            {{ typeData.triggerText }}
+            {{ typeData.actionText }}
           </p>
         </div>
         <div>
-          <component :is="typeData.actionComponent" v-model="form.settings" />
+          <component :is="typeData.actionComponent" v-model="form.settings" :trigger="form.trigger" />
         </div>
       </div>
     </template>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
new file mode 100644
index 0000000000..dde3ff432a
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <el-tooltip
+      :disabled="canSyncMembers"
+      content="Please enable Members syncing in HubSpot integration settings to use this feature"
+      placement="bottom"
+    >
+      <el-checkbox
+        v-model="form.syncCompanyContacts"
+        class="mb-5 filter-checkbox"
+        :disabled="!canSyncMembers"
+      >
+        <span class="text-xs" :class="canSyncMembers ? 'text-gray-900' : 'text-gray-400'">
+          Sync all members from the organisations matching your conditions criteria
+        </span>
+      </el-checkbox>
+    </el-tooltip>
+
+    <app-form-item
+      class="pb-4 mb-0"
+      label="HubSpot companies list"
+      :required="true"
+      :validation="$v.companyList"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-select
+        v-model="form.companyList"
+        placeholder="Select option"
+        class="w-full"
+        @blur="$v.companyList.$touch"
+      >
+        <!-- TODO: list company lists -->
+        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+      </el-select>
+    </app-form-item>
+    <app-form-item
+      v-if="form.syncCompanyContacts"
+      class="pb-4"
+      label="HubSpot contacts list"
+      :required="true"
+      :validation="$v.contactList"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-select
+        v-model="form.contactList"
+        placeholder="Select option"
+        class="w-full"
+        @blur="$v.contactList.$touch"
+      >
+        <!-- TODO: list contact list -->
+        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+      </el-select>
+    </app-form-item>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import AppFormItem from '@/shared/form/form-item.vue';
+import { computed, defineEmits, defineProps } from 'vue';
+import { required } from '@vuelidate/validators';
+import useVuelidate from '@vuelidate/core';
+import { useStore } from 'vuex';
+import { CrowdIntegrations } from '@/integrations/integrations-config';
+
+const store = useStore();
+
+const props = defineProps<{
+  modelValue: any,
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
+
+const form = computed<any>({
+  get() {
+    return props.modelValue;
+  },
+  set(value: any) {
+    emit('update:modelValue', value);
+  },
+});
+
+const rules: any = computed(() => ({
+  companyList: {
+    required,
+  },
+  contactList: {
+    required: (value: string) => (form.value.syncCompanyContacts ? value.length > 0 : true),
+  },
+}));
+
+const canSyncMembers = computed(() => {
+  const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+  console.log(hubspot);
+  const enabledFor = hubspot.settings?.enabledFor || [];
+  return enabledFor.includes('members');
+});
+
+const $v = useVuelidate(rules, form);
+</script>
+
+<script lang="ts">
+export default {
+  name: 'AppAutomationHubspotActionCompanyList',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
new file mode 100644
index 0000000000..db9973b579
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="pt-2">
+    <app-form-item
+      class="pb-4"
+      label="HubSpot contacts list"
+      :required="true"
+      :validation="$v.contactList"
+      :error-messages="{
+        required: 'This field is required',
+      }"
+    >
+      <el-select
+        v-model="form.contactList"
+        placeholder="Select option"
+        class="w-full"
+        @blur="$v.contactList.$touch"
+      >
+        <!-- TODO: list contact list -->
+        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+      </el-select>
+    </app-form-item>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import AppFormItem from '@/shared/form/form-item.vue';
+import { computed, defineEmits, defineProps } from 'vue';
+import { required } from '@vuelidate/validators';
+import useVuelidate from '@vuelidate/core';
+
+const props = defineProps<{
+  modelValue: any,
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
+
+const form = computed<any>({
+  get() {
+    return props.modelValue;
+  },
+  set(value: any) {
+    emit('update:modelValue', value);
+  },
+});
+
+const rules: any = {
+  contactList: {
+    required,
+  },
+};
+
+const $v = useVuelidate(rules, form);
+</script>
+
+<script lang="ts">
+export default {
+  name: 'AppAutomationHubspotActionContactList',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
index 9f69d3c067..ad895f0510 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -1,23 +1,55 @@
 import { AutomationTypeConfig } from '@/modules/automation/config/automation-types';
-// import { CrowdIntegrations } from '@/integrations/integrations-config';
+import { FeatureFlag } from '@/featureFlag';
 import AutomationsHubspotAction from './hubspot-action.vue';
-import AutomationsHubspotTrigger from './hubspot-trigger.vue'
+import AutomationsHubspotTrigger from './hubspot-trigger.vue';
+import AutomationsHubspotPaywall from './hubspot-paywall.vue';
 
 export const hubspot: AutomationTypeConfig = {
   name: 'HubSpot',
   description: 'Send members or organizations to HubSpot',
   icon: '/images/integrations/hubspot.png',
+  emptyScreen: {
+    title: 'No HubSpot automations yet',
+    body: 'Send members or organizations to HubSpot based on certain conditions.',
+  },
   triggerText: 'Define the conditions that will trigger your HubSpot action.',
   actionText: 'Define which action will take place in HubSpot based on the defined conditions.',
   canCreate(store) {
-    return true;
     // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    // return hubspot.status === 'done';
+    // return hubspot.status === 'done' && FeatureFlag.isFlagEnabled('hubspot');
+    return true;
   },
   disabled(store) {
+    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    // return FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done';
     return false;
+  },
+  tooltip(store) {
     // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    // return hubspot.status !== 'done';
+    // if (FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done') {
+    //   return 'Connect with HubSpot via Integrations to enable this automation';
+    // }
+    // return null;
+    return null;
+  },
+  actionButton() {
+    const hubspotEnabeled = FeatureFlag.isFlagEnabled('hubspot');
+    if (hubspotEnabeled) {
+      return null;
+    }
+    return {
+      label: 'Upgrade plan',
+      action: () => {
+        window.open('https://cal.com/team/crowddotdev/custom-plan', '_blank');
+      },
+    };
+  },
+  paywallComponent() {
+    const hubspotEnabeled = FeatureFlag.isFlagEnabled('hubspot');
+    if (hubspotEnabeled) {
+      return null;
+    }
+    return AutomationsHubspotPaywall;
   },
   actionComponent: AutomationsHubspotAction,
   triggerComponent: AutomationsHubspotTrigger,
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
index 6b22e9bb93..7b91d49a48 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -1,63 +1,135 @@
 <template>
   <div>
     <app-form-item
-      class="pb-4"
-      label="Hubspot URL"
+      class="pb-4 !mb-0"
+      label="Choose action"
       :required="true"
-      :validation="$v.url"
+      :validation="$v.action"
       :error-messages="{
         required: 'This field is required',
       }"
     >
-      <el-input
-        v-model="form.url"
-        type="url"
-        placholder="https://somewebhook.url"
-        @blur="$v.url.$touch"
-        @change="$v.url.$touch"
-      />
+      <el-select
+        v-model="form.action"
+        placeholder="Select option"
+        class="w-full"
+        @blur="$v.action.$touch"
+      >
+        <el-option
+          v-for="actionOption of actionOptions"
+          :key="actionOption.value"
+          :value="actionOption.value"
+          :label="actionOption.label"
+          class="!h-17 !px-3"
+        >
+          <div>
+            <h6 class="pb-1 text-sm font-normal leading-5">
+              {{ actionOption.label }}
+            </h6>
+            <p class="text-2xs text-gray-500 leading-5 font-normal">
+              {{ actionOption.description }}
+            </p>
+          </div>
+        </el-option>
+      </el-select>
     </app-form-item>
+    <div>
+      <app-automation-hubspot-action-contact-list
+        v-if="form.action === HubspotAutomationAction.ADD_TO_CONTACT_LIST"
+        v-model="form"
+      />
+      <app-automation-hubspot-action-company-list
+        v-else-if="form.action === HubspotAutomationAction.ADD_TO_COMPANY_LIST"
+        v-model="form"
+      />
+    </div>
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import {
   computed, defineEmits, defineProps, onMounted,
 } from 'vue';
 import AppFormItem from '@/shared/form/form-item.vue';
 import { required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
+import {
+  HubspotAutomationTrigger,
+} from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger';
+import {
+  HubspotAutomationAction,
+} from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationAction';
 
-const emit = defineEmits(['update:modelValue']);
+import AppAutomationHubspotActionContactList from '@/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue';
+import AppAutomationHubspotActionCompanyList from '@/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue';
 
-const props = defineProps({
-  modelValue: {
-    type: Object,
-    required: true,
-  },
-});
+interface HubspotActionOption {
+  label: string;
+  description: string;
+  value: string;
+}
+
+const props = defineProps<{
+  modelValue: any,
+  trigger: HubspotAutomationTrigger
+}>();
+
+const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
 
 const defaultValue = {
-  url: '',
+  list: [],
+  data: {},
+  operator: 'and',
+  filters: {},
+  action: '',
+  contactList: '',
+  companyList: '',
+  syncCompanyContacts: false,
 };
 
-const form = computed({
+const form = computed<any>({
   get() {
     return props.modelValue;
   },
-  set(value) {
+  set(value: any) {
     emit('update:modelValue', value);
   },
 });
 
-const rules = {
-  url: {
+const rules: any = {
+  action: {
     required,
   },
 };
 
 const $v = useVuelidate(rules, form);
 
+const memberOptions: HubspotActionOption[] = [
+  {
+    label: 'Add member to a HubSpot contacts list',
+    description: 'Send member to HubSpot and add it to a contacts list.',
+    value: HubspotAutomationAction.ADD_TO_CONTACT_LIST,
+  },
+];
+
+const organizationOptions: HubspotActionOption[] = [
+  {
+    label: 'Add organization to a HubSpot companies list',
+    description: 'Send organization to HubSpot and add it to a companies list.',
+    value: HubspotAutomationAction.ADD_TO_COMPANY_LIST,
+  },
+];
+
+const actionOptions = computed<HubspotActionOption[]>(() => {
+  if (props.trigger === HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH) {
+    return memberOptions;
+  }
+  if (props.trigger === HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH) {
+    return organizationOptions;
+  }
+  return [];
+});
+
 onMounted(() => {
   if (Object.keys(props.modelValue).length === 0) {
     emit('update:modelValue', defaultValue);
@@ -66,7 +138,7 @@ onMounted(() => {
 
 </script>
 
-<script>
+<script lang="ts">
 export default {
   name: 'AppAutomationHubspotAction',
 };
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-paywall.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-paywall.vue
new file mode 100644
index 0000000000..64ef999ed9
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-paywall.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="pt-14 flex justify-center">
+    <div>
+      <div class="flex justify-center">
+        <div class="max-w-[340px]">
+          <img alt="Hubspot Paywall" src="/images/automation/hubspot-paywall.png" />
+        </div>
+      </div>
+      <h3 class="text-lg font-semibold text-center pt-8 pb-4">
+        Upgrade your plan to enable HubSpot automations
+      </h3>
+      <p class="text-sm text-center">
+        Send members or organizations to HubSpot based on certain conditions.
+      </p>
+      <div class="flex justify-center pt-8">
+        <a
+          href="https://cal.com/team/crowddotdev/custom-plan"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="btn btn--md btn--bordered"
+        >
+          Upgrade plan
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppAutomationHubspotAction',
+};
+</script>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
index 32ee57d4e1..f69bda05e0 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <app-form-item
-      class="mb-4"
+      class="mb-6"
       label="Choose trigger"
       :required="true"
       :validation="$v.trigger"
@@ -10,10 +10,11 @@
       }"
     >
       <el-select
-        v-model="form.trigger"
+        v-model="trigger"
         placeholder="Select option"
         class="w-full"
         @blur="$v.trigger.$touch"
+        @change="resetFilterForm()"
       >
         <el-option
           v-for="{ value, label } of triggerOptions"
@@ -23,30 +24,112 @@
         />
       </el-select>
     </app-form-item>
+    <section v-if="trigger">
+      <!-- Header -->
+      <div class="flex justify-between items-center pb-3 pr-12">
+        <p class="text-xs leading-5 font-semibold">
+          Condition(s) <span class="text-brand-500">*</span>
+        </p>
+        <el-dropdown v-if="settings.list?.length > 0" placement="bottom-end">
+          <p class="text-xs leading-5 font-medium text-gray-900">
+            Matching {{ settings.operator === 'and' ? 'all' : 'any' }} <i class="ri-arrow-down-s-line" />
+          </p>
+          <template #dropdown>
+            <el-dropdown-item
+              class="flex items-center justify-between"
+              :class="{ 'bg-brand-50': settings.operator === 'and' }"
+              @click="settings.operator = 'and'"
+            >
+              Matching all
+              <i
+                :class="settings.operator === 'and' ? 'opacity-100' : 'opacity-0'"
+                class="ri-check-line !text-brand-500 !mr-0 ml-1"
+              />
+            </el-dropdown-item>
+            <el-dropdown-item
+              class="flex items-center justify-between"
+              :class="{ 'bg-brand-50': settings.operator === 'or' }"
+              @click="settings.operator = 'or'"
+            >
+              Matching any
+              <i
+                :class="settings.operator === 'or' ? 'opacity-100' : 'opacity-0'"
+                class="ri-check-line !text-brand-500 !mr-0 ml-1"
+              />
+            </el-dropdown-item>
+          </template>
+        </el-dropdown>
+      </div>
+
+      <div>
+        <div v-for="filter of settings.list" :key="filter" class="flex items-center mb-3">
+          <cr-filter-item
+            v-model="settings.data[filter]"
+            v-model:open="open"
+            :config="filterConfigs[filter]"
+            :hide-remove="true"
+            class="flex-grow"
+            chip-classes="w-full !h-10"
+          />
+          <div
+            class="ml-2 h-10 w-10 flex items-center justify-center cursor-pointer"
+            @click="removeFilter(filter)"
+          >
+            <i class="ri-delete-bin-line text-lg h-5 flex items-center" />
+          </div>
+        </div>
+      </div>
+
+      <div class="pt-1">
+        <el-dropdown placement="bottom-start">
+          <p class="text-brand-500 text-xs leading-5 font-medium cursor-pointer">
+            + Add condition
+          </p>
+          <template #dropdown>
+            <el-dropdown-item
+              v-for="(config, key) in filterConfigs"
+              :key="key"
+              @click="addFilter(key)"
+            >
+              {{ config.label }}
+            </el-dropdown-item>
+          </template>
+        </el-dropdown>
+      </div>
+    </section>
   </div>
 </template>
 
 <script setup lang="ts">
 import {
-  computed, defineEmits, reactive, ref,
+  computed, defineEmits, ref,
 } from 'vue';
 import AppFormItem from '@/shared/form/form-item.vue';
 import useVuelidate from '@vuelidate/core';
 import { required } from '@vuelidate/validators';
+import {
+  HubspotAutomationTrigger,
+} from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger';
+import { memberFilters } from '@/modules/member/config/filters/main';
+import { organizationFilters } from '@/modules/organization/config/filters/main';
+import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
+import CrFilterItem from '@/shared/modules/filters/components/FilterItem.vue';
 
 const props = defineProps<{
-  trigger: string,
+  trigger: HubspotAutomationTrigger,
   settings: any,
 }>();
 
-const emit = defineEmits<{(e: 'update:trigger', value: string), (e: 'update:settings', value: any),}>();
+const emit = defineEmits<{(e: 'update:trigger', value: HubspotAutomationTrigger),
+  (e: 'update:settings', value: any),
+}>();
 
-const trigger = computed<string>({
+const trigger = computed<HubspotAutomationTrigger>({
   get() {
     return props.trigger;
   },
-  set(trigger: string) {
-    emit('update:trigger', trigger);
+  set(value: HubspotAutomationTrigger) {
+    emit('update:trigger', value);
   },
 });
 
@@ -54,25 +137,30 @@ const settings = computed<any>({
   get() {
     return props.settings;
   },
-  set(trigger: any) {
-    emit('update:settings', trigger);
+  set(value: any) {
+    emit('update:settings', value);
   },
 });
 
 const triggerOptions = ref([
   {
     label: 'Member attributes match condition(s)',
-    value: 'member_attributes_match',
+    value: HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH,
   },
   {
     label: 'Organization attributes match condition(s)',
-    value: 'organization_attributes_match',
+    value: HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH,
   },
 ]);
 
-const form = reactive({
-  trigger: '',
-  settings: {},
+const filterConfigs = computed<Record<string, FilterConfig>>(() => {
+  if (trigger.value === HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH) {
+    return memberFilters;
+  }
+  if (trigger.value === HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH) {
+    return organizationFilters;
+  }
+  return {} as Record<string, FilterConfig>;
 });
 
 const rules = {
@@ -81,7 +169,30 @@ const rules = {
   },
 };
 
-const $v = useVuelidate(rules, form);
+const $v = useVuelidate(rules, {
+  trigger,
+  settings,
+});
+
+const open = ref('');
+const addFilter = (key: string) => {
+  settings.value.list.push(key);
+  open.value = key;
+};
+
+const removeFilter = (key) => {
+  open.value = '';
+  settings.value.list = settings.value.list.filter((el) => el !== key);
+  delete settings.value.data[key];
+};
+
+const resetFilterForm = () => {
+  open.value = '';
+  settings.value.list = [];
+  settings.value.data = {};
+  settings.value.operator = 'and';
+};
+
 </script>
 
 <script lang="ts">
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationAction.ts b/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationAction.ts
new file mode 100644
index 0000000000..fd51b097fb
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationAction.ts
@@ -0,0 +1,4 @@
+export enum HubspotAutomationAction {
+  ADD_TO_CONTACT_LIST = 'add_to_contact_list',
+  ADD_TO_COMPANY_LIST = 'add_to_company_list',
+}
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger.ts b/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger.ts
new file mode 100644
index 0000000000..d09f6d96de
--- /dev/null
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger.ts
@@ -0,0 +1,4 @@
+export enum HubspotAutomationTrigger {
+  MEMBER_ATTRIBUTE_MATCH = 'member_attributes_match',
+  ORGANIZATION_ATTRIBUTE_MATCH = 'organization_attributes_match',
+}
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
index 934996f47c..1820038428 100644
--- a/frontend/src/modules/automation/config/automation-types/index.ts
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -17,13 +17,16 @@ export interface AutomationTypeConfig {
   icon: string; // Icon of the automation type
   canCreate: (store: any) => boolean; // method if creation of that automation type is disabled
   actionButton?: (store: any) => AutomationTypeAction | null; // Action button to show in dropdown
-  disabled?: (store: any) => boolean; // If dropdown option is disabled
+  disabled?: (store: any) => boolean | string; // If dropdown option is disabled
+  tooltip?: (store: any) => string | null; // Show tooltip
   emptyScreen?: AutomationTypeEmptyScreen, // Text for empty screen if there is no automations of that type
   triggerText: string; // Description shown below Trigger in automation form
   actionText: string; // Description shown below Action in automation form
   createButtonText?: string;
   actionComponent: any; // Component which handeles form for action
   triggerComponent: any; // Component which handeles form for trigger
+  paywallComponent?: (store: any) => any | null;
+  settingsMap?: (settings: any) => any;
 }
 
 export const automationTypes: Record<string, AutomationTypeConfig> = {
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index 56da68c7d9..5e9018cd50 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -32,42 +32,54 @@
             </el-button>
           </template>
 
-          <div
+          <el-tooltip
             v-for="(automationType, key) of automationTypes"
             :key="key"
-            class="popover-item h-auto mb-1 py-2 px-2.5"
-            :class="{
-              'hover:bg-white !cursor-default': !automationType.canCreate(store),
-              'opacity-50': automationType.disabled && automationType.disabled(store),
-            }"
-            @click="createAutomation(key)"
+            :content="automationType.tooltip && automationType.tooltip(store)"
+            :disabled="!(automationType.tooltip && automationType.tooltip(store))"
+            placement="top"
           >
-            <div class="flex">
-              <div class="mt-0.5">
-                <img :alt="automationType.name" :src="automationType.icon" class="w-4 max-w-4">
-              </div>
-              <div class="pl-2">
-                <h6 class="text-xs leading-5 font-medium mb-0.5 text-gray-900">
-                  {{ automationType.name }}
-                </h6>
-                <p class="text-2xs leading-4.5 text-gray-500 text-left break-normal">
-                  {{ automationType.description }}
-                </p>
-                <el-button
-                  v-if="automationType.actionButton && automationType.actionButton(store)"
-                  class="btn btn--primary btn--sm !h-8 mt-3"
-                  @click="automationType.actionButton(store).action()"
-                >
-                  {{ automationType.actionButton(store).label }}
-                </el-button>
+            <div
+
+              class="popover-item h-auto mb-1 py-2 px-2.5"
+              :class="{
+                'hover:bg-white !cursor-default': !automationType.canCreate(store),
+                'opacity-50': automationType.disabled && automationType.disabled(store),
+              }"
+              @click="createAutomation(key)"
+            >
+              <div class="flex">
+                <div class="mt-0.5">
+                  <img :alt="automationType.name" :src="automationType.icon" class="w-4 max-w-4">
+                </div>
+                <div class="pl-2">
+                  <h6 class="text-xs leading-5 font-medium mb-0.5 text-gray-900">
+                    {{ automationType.name }}
+                  </h6>
+                  <p class="text-2xs leading-4.5 text-gray-500 text-left break-normal">
+                    {{ automationType.description }}
+                  </p>
+                  <el-button
+                    v-if="automationType.actionButton && automationType.actionButton(store)"
+                    class="btn btn--bordered btn--sm !h-8 mt-3"
+                    @click="automationType.actionButton(store).action()"
+                  >
+                    {{ automationType.actionButton(store).label }}
+                  </el-button>
+                </div>
               </div>
             </div>
-          </div>
+          </el-tooltip>
         </el-popover>
       </div>
     </div>
+    <component
+      :is="automationTypes[filter.type].paywallComponent(store)"
+      v-if="filter.type && filter.type !== 'all' && automationTypes[filter.type]?.paywallComponent
+        && automationTypes[filter.type]?.paywallComponent(store)"
+    />
     <div
-      v-if="loadingAutomations"
+      v-else-if="loadingAutomations"
       v-loading="loadingAutomations"
       class="app-page-spinner"
     />
diff --git a/frontend/src/shared/modules/filters/components/FilterItem.vue b/frontend/src/shared/modules/filters/components/FilterItem.vue
index a64b8a6583..9495aa39ad 100644
--- a/frontend/src/shared/modules/filters/components/FilterItem.vue
+++ b/frontend/src/shared/modules/filters/components/FilterItem.vue
@@ -12,7 +12,7 @@
       <template #reference>
         <div
           class="border border-gray-100 rounded-l-md h-8 flex items-center py-1 px-2 bg-white cursor-pointer hover:bg-gray-100 transition"
-          :class="{ '!bg-gray-100': isOpen }"
+          :class="[{ '!bg-gray-100': isOpen }, props.chipClasses]"
           data-qa="filter-list-chip"
         >
           <i class="text-base text-black mr-2" :class="config.iconClass" />
@@ -41,6 +41,7 @@
 
     <!-- Cancel -->
     <div
+      v-if="!props.hideRemove"
       class="border border-gray-100 rounded-r-md h-8 flex items-center p-2 bg-white -ml-px hover:bg-gray-100 transition cursor-pointer group"
       data-qa="filter-list-chip-close"
       @click="emit('remove')"
@@ -60,6 +61,8 @@ const props = defineProps<{
   modelValue: string,
   open: string;
   config: FilterConfig,
+  hideRemove?: boolean,
+  chipClasses?: string;
 }>();
 
 const emit = defineEmits<{(e: 'update:modelValue', value: any): void, (e: 'remove'): void, (e: 'update:open', value: string): void}>();

From 4826a24d0470f7a24937e69de9598dfbfe71e89e Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Tue, 25 Jul 2023 20:00:01 +0200
Subject: [PATCH 05/42] Hubspot automations testing & fixes

---
 .../components/automation-executions.vue      | 10 ++--
 .../automation/components/automation-form.vue |  5 +-
 .../components/list/automation-list-table.vue | 11 +++--
 .../actions/hubspot-action-company-list.vue   |  2 +-
 .../config/automation-types/hubspot/config.ts | 48 ++++++++++++++-----
 .../hubspot/hubspot-action.vue                |  9 +++-
 .../hubspot/hubspot-trigger.vue               | 41 ++++++++++------
 .../config/filters/seniorityLevel/config.ts   | 19 ++++++++
 .../config/filters/annualRevenue/config.ts    | 24 ++++++++++
 .../organization/config/filters/main.ts       |  2 +
 10 files changed, 130 insertions(+), 41 deletions(-)
 create mode 100644 frontend/src/modules/member/config/filters/seniorityLevel/config.ts
 create mode 100644 frontend/src/modules/organization/config/filters/annualRevenue/config.ts

diff --git a/frontend/src/modules/automation/components/automation-executions.vue b/frontend/src/modules/automation/components/automation-executions.vue
index afab1edfd6..ea282fe46a 100644
--- a/frontend/src/modules/automation/components/automation-executions.vue
+++ b/frontend/src/modules/automation/components/automation-executions.vue
@@ -8,7 +8,7 @@
       <div v-if="automation" class="-mt-4">
         <div class="bg-gray-50 p-4 rounded-md mb-8">
           <h5 class="text-sm font-medium leading-5 mb-0.5">
-            {{ automation.name ?? translate(
+            {{ automation.name && automation.name.length > 0 ? automation.name : translate(
               `entities.automation.triggers.${automation.trigger}`,
             ) }}
           </h5>
@@ -31,6 +31,7 @@ import AppDrawer from '@/shared/drawer/drawer.vue';
 import { computed, defineProps } from 'vue';
 import { i18n } from '@/i18n';
 import AppAutomationExecutionList from '@/modules/automation/components/executions/automation-execution-list.vue';
+import { automationTypes } from '../config/automation-types';
 
 const props = defineProps({
   modelValue: {
@@ -44,11 +45,8 @@ const emit = defineEmits(['update:modelValue']);
 
 const title = computed(() => {
   if (props.modelValue) {
-    if (props.modelValue.type === 'webhook') {
-      return 'Webhook executions';
-    }
-    if (props.modelValue.type === 'slack') {
-      return 'Slack notification executions';
+    if (automationTypes[props.modelValue.type]) {
+      return `${automationTypes[props.modelValue.type].name} executions`;
     }
   }
   return '';
diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 328cc7ef03..854607db95 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -100,7 +100,7 @@ import {
   computed, defineProps, defineEmits, reactive, ref, watch, onMounted,
 } from 'vue';
 import AppDrawer from '@/shared/drawer/drawer.vue';
-import { email, required } from "@vuelidate/validators";
+import { email, required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
 import AppFormItem from '@/shared/form/form-item.vue';
 import { useAutomationStore } from '@/modules/automation/store';
@@ -192,7 +192,8 @@ const doSubmit = () => {
   }
   sending.value = true;
   const data = {
-    name: form.name ?? i18n(`entities.automation.triggers.${form.trigger}`),
+    name: form.name && form.name.length > 0
+      ? form.name : i18n(`entities.automation.triggers.${form.trigger}`),
     type: type.value,
     trigger: form.trigger,
     settings: {
diff --git a/frontend/src/modules/automation/components/list/automation-list-table.vue b/frontend/src/modules/automation/components/list/automation-list-table.vue
index f85677e740..10b1b4a0fc 100644
--- a/frontend/src/modules/automation/components/list/automation-list-table.vue
+++ b/frontend/src/modules/automation/components/list/automation-list-table.vue
@@ -13,12 +13,16 @@
           <template #default="scope">
             <div class="flex items-center py-4">
               <div class="w-6">
-                <img v-if="scope.row.type === 'webhook'" alt="Webhook" src="/images/automation/webhook.png" class="w-6">
-                <img v-else-if="scope.row.type === 'slack'" alt="Slack" src="https://cdn-icons-png.flaticon.com/512/3800/3800024.png" class="w-6">
+                <img
+                  v-if="automationTypes[scope.row.type]"
+                  :alt="automationTypes[scope.row.type].name"
+                  :src="automationTypes[scope.row.type].icon"
+                  class="w-6"
+                >
               </div>
               <div class="pl-4">
                 <h6 class="text-sm font-medium mb-0.5 leading-5 text-black">
-                  {{ scope.row.name ?? translate(
+                  {{ scope.row.name && scope.row.name.length > 0 ? scope.row.name : translate(
                     `entities.automation.triggers.${scope.row.trigger}`,
                   ) }}
                 </h6>
@@ -117,6 +121,7 @@ import moment from 'moment';
 import { i18n } from '@/i18n';
 import AppAutomationToggle from '@/modules/automation/components/automation-toggle.vue';
 import AppAutomationDropdown from '@/modules/automation/components/automation-dropdown.vue';
+import { automationTypes } from '../../config/automation-types';
 
 const emit = defineEmits(['openEditAutomationDrawer', 'openExecutionsDrawer']);
 
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
index dde3ff432a..0ad14d2520 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -94,8 +94,8 @@ const rules: any = computed(() => ({
 
 const canSyncMembers = computed(() => {
   const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-  console.log(hubspot);
   const enabledFor = hubspot.settings?.enabledFor || [];
+  // TODO: change to enum when merged
   return enabledFor.includes('members');
 });
 
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
index ad895f0510..e150c40188 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -1,8 +1,18 @@
 import { AutomationTypeConfig } from '@/modules/automation/config/automation-types';
 import { FeatureFlag } from '@/featureFlag';
-import AutomationsHubspotAction from './hubspot-action.vue';
-import AutomationsHubspotTrigger from './hubspot-trigger.vue';
+import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
+import noOfActivities from '@/modules/member/config/filters/noOfActivities/config';
+import activityType from '@/modules/member/config/filters/activityType/config';
+import tags from '@/modules/member/config/filters/tags/config';
+import noOfMembers from '@/modules/organization/config/filters/noOfMembers/config';
+import headcount from '@/modules/organization/config/filters/headcount/config';
+import industry from '@/modules/organization/config/filters/industry/config';
+import seniorityLevel from '@/modules/member/config/filters/seniorityLevel/config';
+import annualRevenue from '@/modules/organization/config/filters/annualRevenue/config';
+import { CrowdIntegrations } from '@/integrations/integrations-config';
 import AutomationsHubspotPaywall from './hubspot-paywall.vue';
+import AutomationsHubspotTrigger from './hubspot-trigger.vue';
+import AutomationsHubspotAction from './hubspot-action.vue';
 
 export const hubspot: AutomationTypeConfig = {
   name: 'HubSpot',
@@ -15,21 +25,18 @@ export const hubspot: AutomationTypeConfig = {
   triggerText: 'Define the conditions that will trigger your HubSpot action.',
   actionText: 'Define which action will take place in HubSpot based on the defined conditions.',
   canCreate(store) {
-    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    // return hubspot.status === 'done' && FeatureFlag.isFlagEnabled('hubspot');
-    return true;
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    return hubspot.status === 'done' && FeatureFlag.isFlagEnabled('hubspot');
   },
   disabled(store) {
-    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    // return FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done';
-    return false;
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    return FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done';
   },
   tooltip(store) {
-    // const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    // if (FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done') {
-    //   return 'Connect with HubSpot via Integrations to enable this automation';
-    // }
-    // return null;
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    if (FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done') {
+      return 'Connect with HubSpot via Integrations to enable this automation';
+    }
     return null;
   },
   actionButton() {
@@ -54,3 +61,18 @@ export const hubspot: AutomationTypeConfig = {
   actionComponent: AutomationsHubspotAction,
   triggerComponent: AutomationsHubspotTrigger,
 };
+
+export const hubspotMemberFilters: Record<string, FilterConfig> = {
+  noOfActivities,
+  activityType,
+  seniorityLevel,
+  tags,
+};
+
+export const hubspotOrganizationFilters: Record<string, FilterConfig> = {
+  noOfActivities,
+  noOfMembers,
+  headcount,
+  industry,
+  annualRevenue,
+};
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
index 7b91d49a48..e61e3a0c60 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -13,6 +13,7 @@
         v-model="form.action"
         placeholder="Select option"
         class="w-full"
+        :disabled="!props.trigger"
         @blur="$v.action.$touch"
       >
         <el-option
@@ -48,7 +49,7 @@
 
 <script setup lang="ts">
 import {
-  computed, defineEmits, defineProps, onMounted,
+  computed, defineEmits, defineProps, onMounted, watch,
 } from 'vue';
 import AppFormItem from '@/shared/form/form-item.vue';
 import { required } from '@vuelidate/validators';
@@ -104,6 +105,12 @@ const rules: any = {
 
 const $v = useVuelidate(rules, form);
 
+watch(() => props.trigger, () => {
+  if (props.trigger && actionOptions.value.length > 0) {
+    form.value.action = actionOptions.value[0].value;
+  }
+});
+
 const memberOptions: HubspotActionOption[] = [
   {
     label: 'Add member to a HubSpot contacts list',
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
index f69bda05e0..e38bf7ef6a 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
@@ -28,7 +28,7 @@
       <!-- Header -->
       <div class="flex justify-between items-center pb-3 pr-12">
         <p class="text-xs leading-5 font-semibold">
-          Condition(s) <span class="text-brand-500">*</span>
+          Condition(s)
         </p>
         <el-dropdown v-if="settings.list?.length > 0" placement="bottom-end">
           <p class="text-xs leading-5 font-medium text-gray-900">
@@ -110,10 +110,14 @@ import { required } from '@vuelidate/validators';
 import {
   HubspotAutomationTrigger,
 } from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger';
-import { memberFilters } from '@/modules/member/config/filters/main';
-import { organizationFilters } from '@/modules/organization/config/filters/main';
 import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
 import CrFilterItem from '@/shared/modules/filters/components/FilterItem.vue';
+import { useStore } from 'vuex';
+import { CrowdIntegrations } from '@/integrations/integrations-config';
+import {
+  hubspotMemberFilters,
+  hubspotOrganizationFilters,
+} from '@/modules/automation/config/automation-types/hubspot/config';
 
 const props = defineProps<{
   trigger: HubspotAutomationTrigger,
@@ -124,6 +128,8 @@ const emit = defineEmits<{(e: 'update:trigger', value: HubspotAutomationTrigger)
   (e: 'update:settings', value: any),
 }>();
 
+const store = useStore();
+
 const trigger = computed<HubspotAutomationTrigger>({
   get() {
     return props.trigger;
@@ -142,23 +148,28 @@ const settings = computed<any>({
   },
 });
 
-const triggerOptions = ref([
-  {
-    label: 'Member attributes match condition(s)',
-    value: HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH,
-  },
-  {
-    label: 'Organization attributes match condition(s)',
-    value: HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH,
-  },
-]);
+const triggerOptions = computed(() => {
+  const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+  // TODO: remove test properties when merged and change to enum
+  const enabledFor = hubspot.settings?.enabledFor || ['members', 'organizations'];
+  return [
+    ...(enabledFor.includes('members') ? [{
+      label: 'Member attributes match condition(s)',
+      value: HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH,
+    }] : []),
+    ...(enabledFor.includes('organizations') ? [{
+      label: 'Organization attributes match condition(s)',
+      value: HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH,
+    }] : []),
+  ];
+});
 
 const filterConfigs = computed<Record<string, FilterConfig>>(() => {
   if (trigger.value === HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH) {
-    return memberFilters;
+    return hubspotMemberFilters;
   }
   if (trigger.value === HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH) {
-    return organizationFilters;
+    return hubspotOrganizationFilters;
   }
   return {} as Record<string, FilterConfig>;
 });
diff --git a/frontend/src/modules/member/config/filters/seniorityLevel/config.ts b/frontend/src/modules/member/config/filters/seniorityLevel/config.ts
new file mode 100644
index 0000000000..17ccfbcb7a
--- /dev/null
+++ b/frontend/src/modules/member/config/filters/seniorityLevel/config.ts
@@ -0,0 +1,19 @@
+import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
+import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
+import { apiFilterRendererByType } from '@/shared/modules/filters/config/apiFilterRendererByType';
+import { StringFilterConfig, StringFilterOptions, StringFilterValue } from '@/shared/modules/filters/types/filterTypes/StringFilterConfig';
+
+const seniorityLevel: StringFilterConfig = {
+  id: 'seniorityLevel',
+  label: 'Seniority level',
+  iconClass: 'ri-menu-2-line',
+  type: FilterConfigType.STRING,
+  options: {},
+  itemLabelRenderer(value: StringFilterValue, options: StringFilterOptions): string {
+    return itemLabelRendererByType[FilterConfigType.STRING]('Seniority level', value, options);
+  },
+  apiFilterRenderer(value: StringFilterValue): any[] {
+    return apiFilterRendererByType[FilterConfigType.STRING]('attributes.seniorityLevel.default', value);
+  },
+};
+export default seniorityLevel;
diff --git a/frontend/src/modules/organization/config/filters/annualRevenue/config.ts b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
new file mode 100644
index 0000000000..2504f422b6
--- /dev/null
+++ b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
@@ -0,0 +1,24 @@
+import {
+  NumberFilterConfig,
+  NumberFilterOptions,
+  NumberFilterValue,
+} from '@/shared/modules/filters/types/filterTypes/NumberFilterConfig';
+import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
+import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
+import { apiFilterRendererByType } from '@/shared/modules/filters/config/apiFilterRendererByType';
+
+const annualRevenue: NumberFilterConfig = {
+  id: 'annualRevenue',
+  label: 'Annual revenue',
+  iconClass: 'ri-money-dollar-circle-line',
+  type: FilterConfigType.NUMBER,
+  options: {},
+  itemLabelRenderer(value: NumberFilterValue, options: NumberFilterOptions): string {
+    return itemLabelRendererByType[FilterConfigType.NUMBER]('Annual revenue', value, options);
+  },
+  apiFilterRenderer(value: NumberFilterValue): any[] {
+    return apiFilterRendererByType[FilterConfigType.NUMBER]('annualRevenue', value);
+  },
+};
+
+export default annualRevenue;
diff --git a/frontend/src/modules/organization/config/filters/main.ts b/frontend/src/modules/organization/config/filters/main.ts
index 34e66bee49..e12ebfbc65 100644
--- a/frontend/src/modules/organization/config/filters/main.ts
+++ b/frontend/src/modules/organization/config/filters/main.ts
@@ -1,5 +1,6 @@
 import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
 import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
+import annualRevenue from '@/modules/organization/config/filters/annualRevenue/config';
 import noOfMembers from './noOfMembers/config';
 import noOfActivities from './noOfActivities/config';
 import activeOn from './activeOn/config';
@@ -26,6 +27,7 @@ export const organizationFilters: Record<string, FilterConfig> = {
   lastActivityDate,
   location,
   type,
+  annualRevenue,
 };
 
 export const organizationSearchFilter: SearchFilterConfig = {

From d55deed4117ab78bcce498eb7bd0ab58784a4f44 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Tue, 25 Jul 2023 20:02:46 +0200
Subject: [PATCH 06/42] Bug fixes

---
 .../discourse/components/discourse-connect-drawer.vue           | 2 +-
 frontend/src/integrations/slack/components/slack-connect.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue b/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
index 9cb1222560..56536ba330 100644
--- a/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
+++ b/frontend/src/integrations/discourse/components/discourse-connect-drawer.vue
@@ -144,7 +144,7 @@
       <el-card v-if="isAPIConnectionValid && props.integration?.settings?.forumHostname" shadow="never" class="rounded-[6px]">
         <div class="mb-3 flex flex-row w-full justify-between">
           <el-button :disabled="isWebhookVerifying" class="btn btn--bordered" @click="verifyWebhook()">
-            Verify config
+            Verify webhook
           </el-button>
           <div v-if="isWebhookVerifying == null" />
           <div v-else-if="isWebhookVerifying">
diff --git a/frontend/src/integrations/slack/components/slack-connect.vue b/frontend/src/integrations/slack/components/slack-connect.vue
index 48bc712bdf..bc13d4fe2c 100644
--- a/frontend/src/integrations/slack/components/slack-connect.vue
+++ b/frontend/src/integrations/slack/components/slack-connect.vue
@@ -19,7 +19,7 @@ defineProps({
 const connectUrl = computed(() => {
   const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?success=true`;
 
-  return `${config.backendUrl}/config/${
+  return `${config.backendUrl}/slack/${
     store.getters['auth/currentTenant'].id
   }/connect?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
 });

From d5a019d17d627e214d14f427d057d8e1043a423b Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 11:06:36 +0200
Subject: [PATCH 07/42] Bug fixing and improvements

---
 .../automation/components/automation-form.vue |  7 ++-
 .../actions/hubspot-action-company-list.vue   |  4 +-
 .../config/automation-types/hubspot/config.ts | 55 ++++++++++++++-----
 .../hubspot/hubspot-action.vue                |  2 +-
 .../hubspot/hubspot-trigger.vue               | 17 +++---
 .../config/automation-types/index.ts          |  2 +-
 6 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 854607db95..0a2ab23048 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -191,13 +191,18 @@ const doSubmit = () => {
     return;
   }
   sending.value = true;
+  let { settings } = form;
+  if (automationTypes[type.value].settingsMap) {
+    settings = automationTypes[type.value].settingsMap(settings, form.trigger);
+  }
+
   const data = {
     name: form.name && form.name.length > 0
       ? form.name : i18n(`entities.automation.triggers.${form.trigger}`),
     type: type.value,
     trigger: form.trigger,
     settings: {
-      ...form.settings,
+      ...settings,
     },
   };
   if (!isEdit.value) {
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
index 0ad14d2520..23fd935df3 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -65,6 +65,7 @@ import { required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
 import { useStore } from 'vuex';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
+import { HubspotEntity } from "@/integrations/hubspot/types/HubspotEntity";
 
 const store = useStore();
 
@@ -95,8 +96,7 @@ const rules: any = computed(() => ({
 const canSyncMembers = computed(() => {
   const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
   const enabledFor = hubspot.settings?.enabledFor || [];
-  // TODO: change to enum when merged
-  return enabledFor.includes('members');
+  return enabledFor.includes(HubspotEntity.MEMBERS);
 });
 
 const $v = useVuelidate(rules, form);
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
index e150c40188..9f0e70a772 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -10,10 +10,28 @@ import industry from '@/modules/organization/config/filters/industry/config';
 import seniorityLevel from '@/modules/member/config/filters/seniorityLevel/config';
 import annualRevenue from '@/modules/organization/config/filters/annualRevenue/config';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
+import {
+  HubspotAutomationTrigger,
+} from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger';
 import AutomationsHubspotPaywall from './hubspot-paywall.vue';
 import AutomationsHubspotTrigger from './hubspot-trigger.vue';
 import AutomationsHubspotAction from './hubspot-action.vue';
 
+export const hubspotMemberFilters: Record<string, FilterConfig> = {
+  noOfActivities,
+  activityType,
+  seniorityLevel,
+  tags,
+};
+
+export const hubspotOrganizationFilters: Record<string, FilterConfig> = {
+  noOfActivities,
+  noOfMembers,
+  headcount,
+  industry,
+  annualRevenue,
+};
+
 export const hubspot: AutomationTypeConfig = {
   name: 'HubSpot',
   description: 'Send members or organizations to HubSpot',
@@ -58,21 +76,28 @@ export const hubspot: AutomationTypeConfig = {
     }
     return AutomationsHubspotPaywall;
   },
-  actionComponent: AutomationsHubspotAction,
-  triggerComponent: AutomationsHubspotTrigger,
-};
+  settingsMap(settings: any, trigger: string) {
+    const { operator, list, data } = settings;
 
-export const hubspotMemberFilters: Record<string, FilterConfig> = {
-  noOfActivities,
-  activityType,
-  seniorityLevel,
-  tags,
-};
+    let filters: Record<string, FilterConfig> = {};
+    if (trigger === HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH) {
+      filters = hubspotMemberFilters;
+    }
+    if (trigger === HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH) {
+      filters = hubspotOrganizationFilters;
+    }
 
-export const hubspotOrganizationFilters: Record<string, FilterConfig> = {
-  noOfActivities,
-  noOfMembers,
-  headcount,
-  industry,
-  annualRevenue,
+    const apiFilterData = list.map((property: string) => {
+      const config: FilterConfig = filters[property];
+      return config.apiFilterRenderer(data[property]);
+    }).flat();
+    return {
+      ...settings,
+      filter: {
+        [operator]: apiFilterData,
+      },
+    };
+  },
+  actionComponent: AutomationsHubspotAction,
+  triggerComponent: AutomationsHubspotTrigger,
 };
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
index e61e3a0c60..d80a750023 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -81,7 +81,7 @@ const defaultValue = {
   list: [],
   data: {},
   operator: 'and',
-  filters: {},
+  filter: {},
   action: '',
   contactList: '',
   companyList: '',
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
index e38bf7ef6a..48347afaf9 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
@@ -17,10 +17,11 @@
         @change="resetFilterForm()"
       >
         <el-option
-          v-for="{ value, label } of triggerOptions"
+          v-for="{ value, label, display } of triggerOptions"
           :key="value"
           :value="value"
           :label="label"
+          :disabled="!display"
         />
       </el-select>
     </app-form-item>
@@ -118,6 +119,7 @@ import {
   hubspotMemberFilters,
   hubspotOrganizationFilters,
 } from '@/modules/automation/config/automation-types/hubspot/config';
+import { HubspotEntity } from '@/integrations/hubspot/types/HubspotEntity';
 
 const props = defineProps<{
   trigger: HubspotAutomationTrigger,
@@ -150,17 +152,18 @@ const settings = computed<any>({
 
 const triggerOptions = computed(() => {
   const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-  // TODO: remove test properties when merged and change to enum
-  const enabledFor = hubspot.settings?.enabledFor || ['members', 'organizations'];
+  const enabledFor = hubspot.settings?.enabledFor || [];
   return [
-    ...(enabledFor.includes('members') ? [{
+    {
       label: 'Member attributes match condition(s)',
       value: HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH,
-    }] : []),
-    ...(enabledFor.includes('organizations') ? [{
+      display: enabledFor.includes(HubspotEntity.MEMBERS),
+    },
+    {
       label: 'Organization attributes match condition(s)',
       value: HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH,
-    }] : []),
+      display: enabledFor.includes(HubspotEntity.ORGANIZATIONS),
+    },
   ];
 });
 
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
index 1820038428..4a86360cc2 100644
--- a/frontend/src/modules/automation/config/automation-types/index.ts
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -26,7 +26,7 @@ export interface AutomationTypeConfig {
   actionComponent: any; // Component which handeles form for action
   triggerComponent: any; // Component which handeles form for trigger
   paywallComponent?: (store: any) => any | null;
-  settingsMap?: (settings: any) => any;
+  settingsMap?: (settings: any, trigger: string) => any;
 }
 
 export const automationTypes: Record<string, AutomationTypeConfig> = {

From 35779c1150b6403cfb970bddd4d263d05fe8ffe9 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 11:33:48 +0200
Subject: [PATCH 08/42] Fix limits on scale plan

---
 frontend/src/modules/automation/automation-limit.js | 1 +
 frontend/src/modules/member/member-export-limit.js  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/modules/automation/automation-limit.js b/frontend/src/modules/automation/automation-limit.js
index 313ee8f885..2d17fb356b 100644
--- a/frontend/src/modules/automation/automation-limit.js
+++ b/frontend/src/modules/automation/automation-limit.js
@@ -3,6 +3,7 @@ import { router } from '@/router';
 import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 
 const workflowMax = {
+  scale: 'unlimited',
   enterprise: 'unlimited',
   growth: 10,
   essential: 2,
diff --git a/frontend/src/modules/member/member-export-limit.js b/frontend/src/modules/member/member-export-limit.js
index 692fc13062..5ddb93c713 100644
--- a/frontend/src/modules/member/member-export-limit.js
+++ b/frontend/src/modules/member/member-export-limit.js
@@ -3,6 +3,7 @@ import { router } from '@/router';
 import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 
 const exportMax = {
+  scale: 'unlimited',
   enterprise: 'unlimited',
   growth: 10,
   essential: 2,

From 05c06c22ed97d20b2794bf2804116dec7e09fb28 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 13:23:42 +0200
Subject: [PATCH 09/42] Fix limits on scale plan

---
 frontend/src/modules/automation/automation-limit.js | 3 +++
 frontend/src/modules/member/member-export-limit.js  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/frontend/src/modules/automation/automation-limit.js b/frontend/src/modules/automation/automation-limit.js
index 2d17fb356b..3186df2ef5 100644
--- a/frontend/src/modules/automation/automation-limit.js
+++ b/frontend/src/modules/automation/automation-limit.js
@@ -14,6 +14,9 @@ const workflowMax = {
  * @returns maximum number of workflows
  */
 export const getWorkflowMax = (plan) => {
+  if (plan === Plans.values.scale) {
+    return workflowMax.scale;
+  }
   if (plan === Plans.values.enterprise) {
     return workflowMax.enterprise;
   } if (
diff --git a/frontend/src/modules/member/member-export-limit.js b/frontend/src/modules/member/member-export-limit.js
index 5ddb93c713..d2e0fa1b82 100644
--- a/frontend/src/modules/member/member-export-limit.js
+++ b/frontend/src/modules/member/member-export-limit.js
@@ -14,6 +14,9 @@ const exportMax = {
  * @returns maximum number of exports
  */
 export const getExportMax = (plan) => {
+  if (plan === Plans.values.scale) {
+    return exportMax.scale;
+  }
   if (plan === Plans.values.enterprise) {
     return exportMax.enterprise;
   } if (

From b9453e231acb11d549026f21e333a04217779629 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 14:00:45 +0200
Subject: [PATCH 10/42] bug fixes and improvements

---
 .../hubspot/hubspot.api.service.ts            | 10 ++++++++
 .../hubspot/types/HubspotLists.ts             |  9 +++++++
 .../components/automation-toggle.vue          | 16 +++++++++++-
 .../actions/hubspot-action-company-list.vue   | 18 ++++++++++---
 .../actions/hubspot-action-contact-list.vue   | 10 ++++++--
 .../config/automation-types/hubspot/config.ts | 12 +++++++++
 .../hubspot/hubspot-action.vue                | 25 ++++++++++++++++++-
 .../config/automation-types/index.ts          |  3 ++-
 .../config/filters/annualRevenue/config.ts    |  2 +-
 .../organization/config/filters/main.ts       |  2 --
 10 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/integrations/hubspot/types/HubspotLists.ts

diff --git a/frontend/src/integrations/hubspot/hubspot.api.service.ts b/frontend/src/integrations/hubspot/hubspot.api.service.ts
index b64786d87b..784f04de3c 100644
--- a/frontend/src/integrations/hubspot/hubspot.api.service.ts
+++ b/frontend/src/integrations/hubspot/hubspot.api.service.ts
@@ -2,6 +2,7 @@ import AuthCurrentTenant from '@/modules/auth/auth-current-tenant';
 import authAxios from '@/shared/axios/auth-axios';
 import { MappableFields } from '@/integrations/hubspot/types/MappableFields';
 import { HubspotOnboard } from '@/integrations/hubspot/types/HubspotOnboard';
+import { HubspotLists } from '@/integrations/hubspot/types/HubspotLists';
 
 export class HubspotApiService {
   static getMappableFields(): Promise<MappableFields> {
@@ -78,4 +79,13 @@ export class HubspotApiService {
     )
       .then((response) => response.data);
   }
+
+  static getLists(): Promise<HubspotLists> {
+    const tenantId = AuthCurrentTenant.get();
+
+    return authAxios.get(
+      `/tenant/${tenantId}/hubspot-get-lists`,
+    )
+      .then((response) => response.data);
+  }
 }
diff --git a/frontend/src/integrations/hubspot/types/HubspotLists.ts b/frontend/src/integrations/hubspot/types/HubspotLists.ts
new file mode 100644
index 0000000000..18f4221327
--- /dev/null
+++ b/frontend/src/integrations/hubspot/types/HubspotLists.ts
@@ -0,0 +1,9 @@
+export interface HubspotList {
+  id: string;
+  name: string;
+}
+
+export interface HubspotLists {
+  members: HubspotList[];
+  organizations: HubspotList[];
+}
diff --git a/frontend/src/modules/automation/components/automation-toggle.vue b/frontend/src/modules/automation/components/automation-toggle.vue
index a2d5ba825a..8386e1f979 100644
--- a/frontend/src/modules/automation/components/automation-toggle.vue
+++ b/frontend/src/modules/automation/components/automation-toggle.vue
@@ -3,6 +3,7 @@
     <el-switch
       :model-value="props.automation.state === 'active'"
       class="!grow-0 !ml-0"
+      :disabled="!canEnable"
       @change="handleChange"
     />
     <span class="ml-2 text-gray-900 text-sm">
@@ -12,8 +13,10 @@
 </template>
 
 <script setup>
-import { defineProps } from 'vue';
+import { computed, defineProps } from 'vue';
 import { useAutomationStore } from '@/modules/automation/store';
+import { useStore } from 'vuex';
+import { automationTypes } from '../config/automation-types';
 
 const props = defineProps({
   automation: {
@@ -22,8 +25,19 @@ const props = defineProps({
   },
 });
 
+const store = useStore();
+
 const { changePublishState } = useAutomationStore();
 
+const canEnable = computed(() => {
+  const { type } = props.automation;
+  if (automationTypes[type]?.enableGuard) {
+    console.log(automationTypes[type]?.enableGuard(props.automation, store));
+    return props.automation.state === 'active' || automationTypes[type]?.enableGuard(props.automation, store);
+  }
+  return true;
+});
+
 const handleChange = (value) => {
   changePublishState(props.automation.id, value);
 };
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
index 23fd935df3..6502781711 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -31,8 +31,12 @@
         class="w-full"
         @blur="$v.companyList.$touch"
       >
-        <!-- TODO: list company lists -->
-        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+        <el-option
+          v-for="list of props.lists.organizations"
+          :key="list.id"
+          :value="list.id"
+          :label="list.name"
+        />
       </el-select>
     </app-form-item>
     <app-form-item
@@ -51,8 +55,12 @@
         class="w-full"
         @blur="$v.contactList.$touch"
       >
-        <!-- TODO: list contact list -->
-        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+        <el-option
+          v-for="list of props.lists.members"
+          :key="list.id"
+          :value="list.id"
+          :label="list.name"
+        />
       </el-select>
     </app-form-item>
   </div>
@@ -66,11 +74,13 @@ import useVuelidate from '@vuelidate/core';
 import { useStore } from 'vuex';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
 import { HubspotEntity } from "@/integrations/hubspot/types/HubspotEntity";
+import { HubspotLists } from "@/integrations/hubspot/types/HubspotLists";
 
 const store = useStore();
 
 const props = defineProps<{
   modelValue: any,
+  lists: HubspotLists,
 }>();
 
 const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
index db9973b579..62d6eef710 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
@@ -15,8 +15,12 @@
         class="w-full"
         @blur="$v.contactList.$touch"
       >
-        <!-- TODO: list contact list -->
-        <el-option :value="'customlist1'" :label="'Custom list 1'" />
+        <el-option
+          v-for="list of props.lists.members"
+          :key="list.id"
+          :value="list.id"
+          :label="list.name"
+        />
       </el-select>
     </app-form-item>
   </div>
@@ -27,9 +31,11 @@ import AppFormItem from '@/shared/form/form-item.vue';
 import { computed, defineEmits, defineProps } from 'vue';
 import { required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
+import { HubspotLists } from '@/integrations/hubspot/types/HubspotLists';
 
 const props = defineProps<{
   modelValue: any,
+  lists: HubspotLists,
 }>();
 
 const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
index 9f0e70a772..2690ff6427 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -13,6 +13,7 @@ import { CrowdIntegrations } from '@/integrations/integrations-config';
 import {
   HubspotAutomationTrigger,
 } from '@/modules/automation/config/automation-types/hubspot/types/HubspotAutomationTrigger';
+import { HubspotEntity } from '@/integrations/hubspot/types/HubspotEntity';
 import AutomationsHubspotPaywall from './hubspot-paywall.vue';
 import AutomationsHubspotTrigger from './hubspot-trigger.vue';
 import AutomationsHubspotAction from './hubspot-action.vue';
@@ -98,6 +99,17 @@ export const hubspot: AutomationTypeConfig = {
       },
     };
   },
+  enableGuard(automation: any, store: string) {
+    const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
+    const enabledFor = hubspot.settings?.enabledFor || [];
+    if (automation.trigger === HubspotAutomationTrigger.MEMBER_ATTRIBUTE_MATCH) {
+      return enabledFor.includes(HubspotEntity.MEMBERS);
+    }
+    if (automation.trigger === HubspotAutomationTrigger.ORGANIZATION_ATTRIBUTE_MATCH) {
+      return enabledFor.includes(HubspotEntity.ORGANIZATIONS);
+    }
+    return true;
+  },
   actionComponent: AutomationsHubspotAction,
   triggerComponent: AutomationsHubspotTrigger,
 };
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
index d80a750023..6cb1b9908b 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -38,10 +38,12 @@
       <app-automation-hubspot-action-contact-list
         v-if="form.action === HubspotAutomationAction.ADD_TO_CONTACT_LIST"
         v-model="form"
+        :lists="lists"
       />
       <app-automation-hubspot-action-company-list
         v-else-if="form.action === HubspotAutomationAction.ADD_TO_COMPANY_LIST"
         v-model="form"
+        :lists="lists"
       />
     </div>
   </div>
@@ -49,7 +51,7 @@
 
 <script setup lang="ts">
 import {
-  computed, defineEmits, defineProps, onMounted, watch,
+  computed, defineEmits, defineProps, onMounted, ref, watch,
 } from 'vue';
 import AppFormItem from '@/shared/form/form-item.vue';
 import { required } from '@vuelidate/validators';
@@ -63,6 +65,8 @@ import {
 
 import AppAutomationHubspotActionContactList from '@/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue';
 import AppAutomationHubspotActionCompanyList from '@/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue';
+import { HubspotApiService } from '@/integrations/hubspot/hubspot.api.service';
+import { HubspotLists } from '@/integrations/hubspot/types/HubspotLists';
 
 interface HubspotActionOption {
   label: string;
@@ -77,6 +81,11 @@ const props = defineProps<{
 
 const emit = defineEmits<{(e: 'update:modelValue', value: any)}>();
 
+const lists = ref<HubspotLists>({
+  members: [],
+  organizations: [],
+});
+
 const defaultValue = {
   list: [],
   data: {},
@@ -137,10 +146,24 @@ const actionOptions = computed<HubspotActionOption[]>(() => {
   return [];
 });
 
+const getLists = () => {
+  HubspotApiService.getLists()
+    .then((hubspotLists) => {
+      lists.value = hubspotLists;
+    })
+    .catch(() => {
+      lists.value = {
+        members: [],
+        organizations: [],
+      };
+    });
+};
+
 onMounted(() => {
   if (Object.keys(props.modelValue).length === 0) {
     emit('update:modelValue', defaultValue);
   }
+  getLists();
 });
 
 </script>
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
index 4a86360cc2..8af97c0b7f 100644
--- a/frontend/src/modules/automation/config/automation-types/index.ts
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -26,7 +26,8 @@ export interface AutomationTypeConfig {
   actionComponent: any; // Component which handeles form for action
   triggerComponent: any; // Component which handeles form for trigger
   paywallComponent?: (store: any) => any | null;
-  settingsMap?: (settings: any, trigger: string) => any;
+  settingsMap?: (settings: any, trigger: string) => any; // Mapping automation settings before they are sent to backend
+  enableGuard?: (automation: any, store: any) => boolean; // Guard protecting automation from enabling
 }
 
 export const automationTypes: Record<string, AutomationTypeConfig> = {
diff --git a/frontend/src/modules/organization/config/filters/annualRevenue/config.ts b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
index 2504f422b6..8e7c91ec23 100644
--- a/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
+++ b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
@@ -17,7 +17,7 @@ const annualRevenue: NumberFilterConfig = {
     return itemLabelRendererByType[FilterConfigType.NUMBER]('Annual revenue', value, options);
   },
   apiFilterRenderer(value: NumberFilterValue): any[] {
-    return apiFilterRendererByType[FilterConfigType.NUMBER]('annualRevenue', value);
+    return apiFilterRendererByType[FilterConfigType.NUMBER]('revenueRange.max', value);
   },
 };
 
diff --git a/frontend/src/modules/organization/config/filters/main.ts b/frontend/src/modules/organization/config/filters/main.ts
index e12ebfbc65..34e66bee49 100644
--- a/frontend/src/modules/organization/config/filters/main.ts
+++ b/frontend/src/modules/organization/config/filters/main.ts
@@ -1,6 +1,5 @@
 import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
 import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
-import annualRevenue from '@/modules/organization/config/filters/annualRevenue/config';
 import noOfMembers from './noOfMembers/config';
 import noOfActivities from './noOfActivities/config';
 import activeOn from './activeOn/config';
@@ -27,7 +26,6 @@ export const organizationFilters: Record<string, FilterConfig> = {
   lastActivityDate,
   location,
   type,
-  annualRevenue,
 };
 
 export const organizationSearchFilter: SearchFilterConfig = {

From b5d07eac5566702718a1df620d1d99d504eea521 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 14:20:45 +0200
Subject: [PATCH 11/42] Fetch integrations

---
 .../automation/components/automation-form.vue |  1 -
 .../components/automation-toggle.vue          |  1 -
 .../automation/pages/automation-list-page.vue | 27 +++----------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 0a2ab23048..8eb3f5c624 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -133,7 +133,6 @@ const emit = defineEmits(['update:modelValue', 'update:automation']);
 const { createAutomation, updateAutomation, getAutomations } = useAutomationStore();
 
 const store = useStore();
-const fetchIntegrations = () => store.dispatch('integration/doFetch');
 
 const isDrawerOpen = computed({
   get() {
diff --git a/frontend/src/modules/automation/components/automation-toggle.vue b/frontend/src/modules/automation/components/automation-toggle.vue
index 8386e1f979..9b5f845e04 100644
--- a/frontend/src/modules/automation/components/automation-toggle.vue
+++ b/frontend/src/modules/automation/components/automation-toggle.vue
@@ -32,7 +32,6 @@ const { changePublishState } = useAutomationStore();
 const canEnable = computed(() => {
   const { type } = props.automation;
   if (automationTypes[type]?.enableGuard) {
-    console.log(automationTypes[type]?.enableGuard(props.automation, store));
     return props.automation.state === 'active' || automationTypes[type]?.enableGuard(props.automation, store);
   }
   return true;
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index 5e9018cd50..e7158b3aba 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -118,15 +118,13 @@
 
 <script setup>
 import {
-  ref, onMounted, computed,
+  ref, onMounted,
 } from 'vue';
 import { useAutomationStore } from '@/modules/automation/store';
 import { storeToRefs } from 'pinia';
 import pluralize from 'pluralize';
 import AppAutomationForm from '@/modules/automation/components/automation-form.vue';
 import AppAutomationListTable from '@/modules/automation/components/list/automation-list-table.vue';
-import config from '@/config';
-import { AuthToken } from '@/modules/auth/auth-token';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import AppAutomationExecutions from '@/modules/automation/components/automation-executions.vue';
 import { FeatureFlag } from '@/featureFlag';
@@ -159,6 +157,7 @@ const { getAutomations, changeAutomationFilter } = automationStore;
 const { currentTenant } = mapGetters('auth');
 
 const store = useStore();
+const fetchIntegrations = () => store.dispatch('integration/doFetch');
 
 /**
  * Check if tenant has feature flag enabled
@@ -200,28 +199,8 @@ const updateAutomation = (automation) => {
   editAutomation.value = automation;
 };
 
-// Slack connect
-const slackConnected = computed(() => currentTenant.value?.settings[0].slackWebHook);
-
-const slackConnectUrl = computed(() => {
-  const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?activeTab=automations&success=true`;
-
-  return `${config.backendUrl}/tenant/${
-    currentTenant.value.id
-  }/automation/config?redirectUrl=${redirectUrl}&crowdToken=${AuthToken.get()}`;
-});
-
-const authenticateSlack = () => {
-  window.open(slackConnectUrl.value, '_self');
-};
-
-const createSlackAutomation = () => {
-  if (slackConnected.value) {
-    createAutomation('slack');
-  }
-};
-
 onMounted(() => {
+  fetchIntegrations();
   getAutomations();
 });
 

From 63c195212077a1644c2f7c9cdece8c5b177b0705 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 21:43:18 +0200
Subject: [PATCH 12/42] Bug fixes

---
 .../automation/components/automation-form.vue    |  3 ---
 .../config/automation-types/hubspot/config.ts    | 12 +++++++-----
 .../automation/config/automation-types/index.ts  |  2 ++
 .../automation/pages/automation-list-page.vue    | 16 +++++++++++++++-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/modules/automation/components/automation-form.vue b/frontend/src/modules/automation/components/automation-form.vue
index 8eb3f5c624..c7a2a4c8e3 100644
--- a/frontend/src/modules/automation/components/automation-form.vue
+++ b/frontend/src/modules/automation/components/automation-form.vue
@@ -132,8 +132,6 @@ const emit = defineEmits(['update:modelValue', 'update:automation']);
 
 const { createAutomation, updateAutomation, getAutomations } = useAutomationStore();
 
-const store = useStore();
-
 const isDrawerOpen = computed({
   get() {
     return props.modelValue;
@@ -232,7 +230,6 @@ const doSubmit = () => {
 };
 
 onMounted(() => {
-  fetchIntegrations();
   if (type.value && props.automation) {
     fillForm(props.automation);
   } else {
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
index 2690ff6427..3c685cb550 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/config.ts
@@ -37,6 +37,8 @@ export const hubspot: AutomationTypeConfig = {
   name: 'HubSpot',
   description: 'Send members or organizations to HubSpot',
   icon: '/images/integrations/hubspot.png',
+  plan: 'Scale',
+  featureFlag: FeatureFlag.flags.hubspot,
   emptyScreen: {
     title: 'No HubSpot automations yet',
     body: 'Send members or organizations to HubSpot based on certain conditions.',
@@ -45,21 +47,21 @@ export const hubspot: AutomationTypeConfig = {
   actionText: 'Define which action will take place in HubSpot based on the defined conditions.',
   canCreate(store) {
     const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    return hubspot.status === 'done' && FeatureFlag.isFlagEnabled('hubspot');
+    return hubspot.status === 'done' && FeatureFlag.isFlagEnabled(FeatureFlag.flags.hubspot);
   },
   disabled(store) {
     const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    return FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done';
+    return FeatureFlag.isFlagEnabled(FeatureFlag.flags.hubspot) && hubspot.status !== 'done';
   },
   tooltip(store) {
     const hubspot = CrowdIntegrations.getMappedConfig('hubspot', store);
-    if (FeatureFlag.isFlagEnabled('hubspot') && hubspot.status !== 'done') {
+    if (FeatureFlag.isFlagEnabled(FeatureFlag.flags.hubspot) && hubspot.status !== 'done') {
       return 'Connect with HubSpot via Integrations to enable this automation';
     }
     return null;
   },
   actionButton() {
-    const hubspotEnabeled = FeatureFlag.isFlagEnabled('hubspot');
+    const hubspotEnabeled = FeatureFlag.isFlagEnabled(FeatureFlag.flags.hubspot);
     if (hubspotEnabeled) {
       return null;
     }
@@ -71,7 +73,7 @@ export const hubspot: AutomationTypeConfig = {
     };
   },
   paywallComponent() {
-    const hubspotEnabeled = FeatureFlag.isFlagEnabled('hubspot');
+    const hubspotEnabeled = FeatureFlag.isFlagEnabled(FeatureFlag.flags.hubspot);
     if (hubspotEnabeled) {
       return null;
     }
diff --git a/frontend/src/modules/automation/config/automation-types/index.ts b/frontend/src/modules/automation/config/automation-types/index.ts
index 8af97c0b7f..74e7dd7d2b 100644
--- a/frontend/src/modules/automation/config/automation-types/index.ts
+++ b/frontend/src/modules/automation/config/automation-types/index.ts
@@ -15,6 +15,8 @@ export interface AutomationTypeConfig {
   name: string; // Name of the automation
   description: string; // Description shown under name in dropdown
   icon: string; // Icon of the automation type
+  plan?: string; // Plan name
+  featureFlag?: string; // Plan name
   canCreate: (store: any) => boolean; // method if creation of that automation type is disabled
   actionButton?: (store: any) => AutomationTypeAction | null; // Action button to show in dropdown
   disabled?: (store: any) => boolean | string; // If dropdown option is disabled
diff --git a/frontend/src/modules/automation/pages/automation-list-page.vue b/frontend/src/modules/automation/pages/automation-list-page.vue
index e7158b3aba..0eee292bc4 100644
--- a/frontend/src/modules/automation/pages/automation-list-page.vue
+++ b/frontend/src/modules/automation/pages/automation-list-page.vue
@@ -55,6 +55,9 @@
                 <div class="pl-2">
                   <h6 class="text-xs leading-5 font-medium mb-0.5 text-gray-900">
                     {{ automationType.name }}
+                    <sup v-if="plan(automationType)" class="text-brand-500">
+                      {{ plan(automationType) }}
+                    </sup>
                   </h6>
                   <p class="text-2xs leading-4.5 text-gray-500 text-left break-normal">
                     {{ automationType.description }}
@@ -118,7 +121,7 @@
 
 <script setup>
 import {
-  ref, onMounted,
+  ref, onMounted, computed,
 } from 'vue';
 import { useAutomationStore } from '@/modules/automation/store';
 import { storeToRefs } from 'pinia';
@@ -131,6 +134,7 @@ import { FeatureFlag } from '@/featureFlag';
 import { getWorkflowMax, showWorkflowLimitDialog } from '@/modules/automation/automation-limit';
 
 import { useStore } from 'vuex';
+import config from '@/config';
 import { automationTypes } from '../config/automation-types';
 
 const options = ref([
@@ -199,6 +203,16 @@ const updateAutomation = (automation) => {
   editAutomation.value = automation;
 };
 
+const plan = (type) => {
+  if (type.plan && type.featureFlag && !FeatureFlag.isFlagEnabled(type.featureFlag)) {
+    if (config.isCommunityVersion) {
+      return 'Premium';
+    }
+    return type.plan;
+  }
+  return null;
+};
+
 onMounted(() => {
   fetchIntegrations();
   getAutomations();

From 6df22c125586229e978e615c27088598eddb0711 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Wed, 26 Jul 2023 21:45:56 +0200
Subject: [PATCH 13/42] Fix settings drawer

---
 .../hubspot/components/hubspot-settings-drawer.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
index a2d60e460e..f366e031b4 100644
--- a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
+++ b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
@@ -1,7 +1,7 @@
 <template>
   <app-drawer
     v-model="isDrawerVisible"
-    title="Discourse"
+    title="HubSpot"
     size="600px"
     pre-title="Integration"
     :show-footer="true"
@@ -12,7 +12,7 @@
       <img
         :src="hubspotDetails.image"
         class="w-6 h-6 mr-2"
-        alt="Discourse logo"
+        alt="HubSpot logo"
       />
     </template>
     <template #content>

From 946fc25db7ec732d6f81960313447d840151afb6 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Tue, 1 Aug 2023 13:09:09 +0200
Subject: [PATCH 14/42] get mappable fields also returns readonly information

---
 .../api/integration/helpers/hubspotConnect.ts |  2 +-
 .../field-mapper/hubspotFieldMapper.ts        | 17 ++++++---
 .../src/integrations/premium/hubspot/types.ts | 35 +++++++++++++++++++
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/backend/src/api/integration/helpers/hubspotConnect.ts b/backend/src/api/integration/helpers/hubspotConnect.ts
index ab1a61fa5f..4b6332d3ae 100644
--- a/backend/src/api/integration/helpers/hubspotConnect.ts
+++ b/backend/src/api/integration/helpers/hubspotConnect.ts
@@ -3,7 +3,7 @@ import IntegrationService from '../../../services/integrationService'
 import PermissionChecker from '../../../services/user/permissionChecker'
 
 export default async (req, res) => {
-  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  new PermissionChecker(req).validateHas(Permissions.values.integrationEdit)
   const payload = await new IntegrationService(req).hubspotConnect()
   await req.responseHandler.success(req, res, payload)
 }
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
index 5878cc8c22..8601327afe 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
@@ -1,5 +1,11 @@
 import { IMemberAttribute } from '@crowd/types'
-import { HubspotEntity, HubspotPropertyType, IFieldProperty, IHubspotObject } from '../types'
+import {
+  HubspotEntity,
+  HubspotPropertyType,
+  IFieldProperty,
+  IHubspotObject,
+  ITypeInfo,
+} from '../types'
 
 export abstract class HubspotFieldMapper {
   protected fieldProperties: Record<string, IFieldProperty>
@@ -45,15 +51,18 @@ export abstract class HubspotFieldMapper {
     return value
   }
 
-  public getTypeMap(): Record<string, HubspotPropertyType> {
+  public getTypeMap(): Record<string, ITypeInfo> {
     if (!this.fieldProperties) {
       throw new Error(`Can't find field properties of ${this.entity}!`)
     }
 
-    const typeMap: Record<string, HubspotPropertyType> = {}
+    const typeMap: Record<string, ITypeInfo> = {}
 
     Object.keys(this.fieldProperties).forEach((propertyName) => {
-      typeMap[propertyName] = this.fieldProperties[propertyName].hubspotType
+      typeMap[propertyName] = {
+        hubspotType: this.fieldProperties[propertyName].hubspotType,
+        readonly: this.fieldProperties[propertyName].readonly || false,
+      }
     })
 
     return typeMap
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/types.ts b/services/libs/integrations/src/integrations/premium/hubspot/types.ts
index 1c70da0553..f5d747328b 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/types.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/types.ts
@@ -83,6 +83,41 @@ export interface IHubspotProperty {
   modificationMetadata: IHubspotPropertyModificationMetadata
 }
 
+export interface IHubspotListMetadata {
+  size: number
+  lastSizeChangeAt: number
+  processing: string
+  lastProcessingStateChangeAt: number
+  error: string
+  listReferencesCount: number
+  parentFolderId: number
+}
+
+export interface IHubspotList {
+  portalId: number
+  listId: number
+  createdAt: number
+  updatedAt: number
+  name: string
+  listType: string
+  authorId: number
+  parentId: number
+  filters: string[]
+  metaData: IHubspotListMetadata
+  archived: boolean
+  teamIds: number[]
+  ilsFilterBranch: string
+  readOnly: boolean
+  internal: boolean
+  limitExempt: boolean
+  dynamic: boolean
+}
+
+export interface ITypeInfo {
+  hubspotType: HubspotPropertyType
+  readonly: boolean
+}
+
 export interface IHubspotObject {
   id: string
   properties: unknown

From 634aef0c50f7165b6d534e406b672fd494562595 Mon Sep 17 00:00:00 2001
From: Yeganathan S <hilariousengineer@protonmail.com>
Date: Thu, 3 Aug 2023 12:16:09 +0530
Subject: [PATCH 15/42] Add icon for read-only attributes and introduce alert
 popover (#1209)

---
 .../components/hubspot-property-map.vue       |  6 +-
 .../hubspot-readonly-attr-popover.vue         | 88 +++++++++++++++++++
 .../components/hubspot-settings-drawer.vue    | 75 +++++++++++++---
 3 files changed, 157 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/integrations/hubspot/components/hubspot-readonly-attr-popover.vue

diff --git a/frontend/src/integrations/hubspot/components/hubspot-property-map.vue b/frontend/src/integrations/hubspot/components/hubspot-property-map.vue
index 95e06f7ab4..dd6b3e413d 100644
--- a/frontend/src/integrations/hubspot/components/hubspot-property-map.vue
+++ b/frontend/src/integrations/hubspot/components/hubspot-property-map.vue
@@ -10,7 +10,10 @@
     </div>
     <div class="w-1/2 py-2">
       <div class="flex items-center w-full">
-        <div class="ri-arrow-left-right-line text-base text-gray-400 mr-4 h-4 flex items-center" />
+        <div
+          class="text-base text-gray-400 mr-4 h-4 flex items-center"
+          :class="readOnly ? 'ri-arrow-right-line' : 'ri-arrow-left-right-line'"
+        />
         <el-select
           v-if="props.hubspotFields.length > 0"
           v-model="mapping"
@@ -47,6 +50,7 @@ const props = defineProps<{
   modelValue: string,
   field: string,
   enabled: boolean,
+  readOnly: boolean,
   hubspotFields: HubspotProperty[]
 }>();
 
diff --git a/frontend/src/integrations/hubspot/components/hubspot-readonly-attr-popover.vue b/frontend/src/integrations/hubspot/components/hubspot-readonly-attr-popover.vue
new file mode 100644
index 0000000000..f2fc58ea02
--- /dev/null
+++ b/frontend/src/integrations/hubspot/components/hubspot-readonly-attr-popover.vue
@@ -0,0 +1,88 @@
+<template>
+  <app-dialog
+    v-model="model"
+    title="Read-only attributes"
+    size="large"
+  >
+    <template #header>
+      <div class="flex gap-4">
+        <span class="rounded-full bg-blue-50 p-4 w-9 h-9 flex items-center justify-center">
+          <i class="ri-information-line font-medium text-lg text-blue-600 leading-none" />
+        </span>
+        <p class="text-sm text-gray-500 font-medium mt-1">
+          The following attributes, auto-generated by crowd.dev, are only mapped into HubSpot, and won't be overwritten if their value is updated on your HubSpot account.
+        </p>
+      </div>
+    </template>
+    <template #content>
+      <section class="px-6 pb-4 -mt-2">
+        <ul class="mx-18 mb-4 text-gray-900 font-semibold text-sm list-disc">
+          <li v-for="(attribute, index) in attributes" :key="index">
+            {{ attribute }}
+          </li>
+        </ul>
+      </section>
+      <footer class="flex justify-between py-4 px-6 items-center bg-gray-100 rounded-b-md">
+        <el-checkbox
+          v-model="doNotShow"
+          class="filter-checkbox"
+        >
+          <span class="text-xs text-gray-900">Don't show this message again</span>
+        </el-checkbox>
+        <div>
+          <el-button
+            class="btn btn--primary btn--md btn--full"
+            @click="onContinue"
+          >
+            Continue
+          </el-button>
+        </div>
+      </footer>
+    </template>
+  </app-dialog>
+</template>
+
+<script setup>
+import {
+  defineEmits, defineProps, computed, h, ref,
+} from 'vue';
+import AppDialog from '@/shared/dialog/dialog.vue';
+
+const emit = defineEmits(['update:modelValue', 'doNotShowModal', 'continue']);
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: () => false,
+  },
+  attributes: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const model = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(v) {
+    emit('update:modelValue', v);
+  },
+});
+
+const doNotShow = ref(false);
+
+const onContinue = () => {
+  model.value = false;
+  if (doNotShow.value) {
+    emit('doNotShowModal');
+  }
+  emit('continue');
+};
+</script>
+
+<script>
+export default {
+  name: 'AppHubspotReadOnlyAttrPopover',
+};
+</script>
diff --git a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
index f366e031b4..0465f50cc7 100644
--- a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
+++ b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
@@ -125,12 +125,13 @@
                 </div>
                 <section class="pt-1 pb-3">
                   <app-hubspot-property-map
-                    v-for="(type, field) in memberMappableFields"
-                    :key="field"
-                    v-model="form.mapping.members[field]"
-                    v-model:enabled="form.enabled.members[field]"
-                    :field="field as string"
-                    :hubspot-fields="getHubspotMemberFields(type, form.mapping.members[field])"
+                    v-for="(value, key) in memberMappableFields"
+                    :key="key"
+                    v-model="form.mapping.members[key]"
+                    v-model:enabled="form.enabled.members[key]"
+                    :field="key"
+                    :read-only="value.readonly"
+                    :hubspot-fields="getHubspotMemberFields(value.hubspotType, form.mapping.members[key])"
                   />
                 </section>
               </div>
@@ -165,12 +166,13 @@
                 </div>
                 <section class="pt-1 pb-3">
                   <app-hubspot-property-map
-                    v-for="(type, field) in organizationMappableFields"
-                    :key="field"
+                    v-for="(value, key) in organizationMappableFields"
+                    :key="key"
                     v-model="form.mapping.organizations[field]"
                     v-model:enabled="form.enabled.organizations[field]"
-                    :field="field as string"
-                    :hubspot-fields="getHubspotOrganizationFields(type, form.mapping.organizations[field])"
+                    :field="key"
+                    :read-only="value.readonly"
+                    :hubspot-fields="getHubspotOrganizationFields(value.hubspotType, form.mapping.organizations[field])"
                   />
                 </section>
               </div>
@@ -200,20 +202,28 @@
       </div>
     </template>
   </app-drawer>
+  <app-hubspot-read-only-attr-popover
+    v-model="isReadOnlyConfirmModalVisible"
+    :attributes="readOnlyAttributes"
+    @update:modelValue="isReadOnlyConfirmModalVisible = $event"
+    @doNotShowModal="handleDoNotShowModal"
+    @continue="handleContinue"
+  />
 </template>
 
 <script lang="ts" setup>
 import {
   computed, onMounted, reactive, ref,
 } from 'vue';
+import { useStore } from 'vuex';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
 import { HubspotApiService } from '@/integrations/hubspot/hubspot.api.service';
 import { MappableFields } from '@/integrations/hubspot/types/MappableFields';
-import { useStore } from 'vuex';
 import { HubspotOnboard } from '@/integrations/hubspot/types/HubspotOnboard';
 import { HubspotEntity } from '@/integrations/hubspot/types/HubspotEntity';
 import { mapActions } from '@/shared/vuex/vuex.helpers';
 import AppHubspotPropertyMap from '@/integrations/hubspot/components/hubspot-property-map.vue';
+import AppHubspotReadOnlyAttrPopover from '@/integrations/hubspot/components/hubspot-readonly-attr-popover.vue';
 
 const props = defineProps<{
   modelValue: boolean
@@ -238,6 +248,12 @@ const isDrawerVisible = computed({
   },
 });
 
+const isReadOnlyConfirmModalVisible = ref<boolean>(false);
+const readOnlyAttributes = ref<string[]>([]);
+
+// updateData is a new reference of "data" object used in update() method
+const updateData = ref<HubspotOnboard | null>(null);
+
 const form = reactive({
   members: false,
   organizations: false,
@@ -313,6 +329,24 @@ const isMappingValid = computed(() => {
     && (form.members || form.organizations);
 });
 
+const getReadOnlyAttributes = (attributesMapping, mappableFields) => {
+  const filterReadOnlyAttributes = Object.keys(attributesMapping)
+    .filter((attribute) => mappableFields[attribute] && mappableFields[attribute].readonly);
+
+  return filterReadOnlyAttributes;
+};
+
+// save read only confirm modal to false in local storage
+const handleDoNotShowModal = () => {
+  localStorage.setItem('show_hubspot_read_only_confirm_modal', 'false');
+};
+
+// hide modal and execute update
+const handleContinue = () => {
+  isReadOnlyConfirmModalVisible.value = false;
+  executeUpdate(updateData.value);
+};
+
 const update = () => {
   if (!isMappingValid.value) {
     return;
@@ -341,6 +375,25 @@ const update = () => {
       [b]: form.mapping.organizations[b],
     }), {});
   }
+
+  const checkReadOnlyAttributes = [
+    ...getReadOnlyAttributes(data.attributesMapping.members, memberMappableFields.value),
+    ...getReadOnlyAttributes(data.attributesMapping.organizations, organizationMappableFields.value),
+  ];
+
+  const showReadOnlyModal = localStorage.getItem('show_hubspot_read_only_confirm_modal') === 'false';
+
+  if (checkReadOnlyAttributes.length > 0 && !showReadOnlyModal) {
+    readOnlyAttributes.value = checkReadOnlyAttributes;
+    isReadOnlyConfirmModalVisible.value = true;
+    updateData.value = data;
+  } else {
+    executeUpdate(data);
+  }
+};
+
+const executeUpdate = (data: HubspotOnboard) => {
+
   loading.value = true;
   HubspotApiService.finishOnboard(data)
     .then(() => {

From 5efa396aa1aa0d47a2db1e821f6b253efc443ab7 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Thu, 3 Aug 2023 09:12:36 +0200
Subject: [PATCH 16/42] Fix organization sync

---
 .../actions/hubspot-action-company-list.vue   | 79 +++++++------------
 .../hubspot/hubspot-action.vue                |  4 +-
 2 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
index 6502781711..999a3e591d 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -16,65 +16,43 @@
       </el-checkbox>
     </el-tooltip>
 
-    <app-form-item
-      class="pb-4 mb-0"
-      label="HubSpot companies list"
-      :required="true"
-      :validation="$v.companyList"
-      :error-messages="{
-        required: 'This field is required',
-      }"
-    >
-      <el-select
-        v-model="form.companyList"
-        placeholder="Select option"
-        class="w-full"
-        @blur="$v.companyList.$touch"
-      >
-        <el-option
-          v-for="list of props.lists.organizations"
-          :key="list.id"
-          :value="list.id"
-          :label="list.name"
-        />
-      </el-select>
-    </app-form-item>
-    <app-form-item
-      v-if="form.syncCompanyContacts"
-      class="pb-4"
-      label="HubSpot contacts list"
-      :required="true"
-      :validation="$v.contactList"
-      :error-messages="{
-        required: 'This field is required',
-      }"
-    >
-      <el-select
-        v-model="form.contactList"
-        placeholder="Select option"
-        class="w-full"
-        @blur="$v.contactList.$touch"
+    <div v-if="form.syncCompanyContacts" class="flex items-end">
+      <div class="ri-corner-down-right-line text-xl mr-4 mb-2 text-gray-400 h-6 flex items-center" />
+      <app-form-item
+        class="!mb-0 w-full"
+        label="HubSpot contacts list"
+        :required="true"
+        :validation="$v.contactList"
+        :error-messages="{
+          required: 'This field is required',
+        }"
       >
-        <el-option
-          v-for="list of props.lists.members"
-          :key="list.id"
-          :value="list.id"
-          :label="list.name"
-        />
-      </el-select>
-    </app-form-item>
+        <el-select
+          v-model="form.contactList"
+          placeholder="Select option"
+          class="w-full"
+          @blur="$v.contactList.$touch"
+        >
+          <el-option
+            v-for="list of props.lists.members"
+            :key="list.id"
+            :value="list.id"
+            :label="list.name"
+          />
+        </el-select>
+      </app-form-item>
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import AppFormItem from '@/shared/form/form-item.vue';
 import { computed, defineEmits, defineProps } from 'vue';
-import { required } from '@vuelidate/validators';
 import useVuelidate from '@vuelidate/core';
 import { useStore } from 'vuex';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
-import { HubspotEntity } from "@/integrations/hubspot/types/HubspotEntity";
-import { HubspotLists } from "@/integrations/hubspot/types/HubspotLists";
+import { HubspotEntity } from '@/integrations/hubspot/types/HubspotEntity';
+import { HubspotLists } from '@/integrations/hubspot/types/HubspotLists';
 
 const store = useStore();
 
@@ -95,9 +73,6 @@ const form = computed<any>({
 });
 
 const rules: any = computed(() => ({
-  companyList: {
-    required,
-  },
   contactList: {
     required: (value: string) => (form.value.syncCompanyContacts ? value.length > 0 : true),
   },
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
index 6cb1b9908b..feef3ccca4 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-action.vue
@@ -130,8 +130,8 @@ const memberOptions: HubspotActionOption[] = [
 
 const organizationOptions: HubspotActionOption[] = [
   {
-    label: 'Add organization to a HubSpot companies list',
-    description: 'Send organization to HubSpot and add it to a companies list.',
+    label: 'Create company(ies) in HubSpot',
+    description: 'Send organization(s) to HubSpot matching your conditions criteria.',
     value: HubspotAutomationAction.ADD_TO_COMPANY_LIST,
   },
 ];

From 46281922865a3592569d540850e0550ad5288f66 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Thu, 3 Aug 2023 09:21:19 +0200
Subject: [PATCH 17/42] automations for hubspot members

---
 .../integration/helpers/hubspotGetLists.ts    |   9 +
 backend/src/api/integration/index.ts          |   6 +
 .../repositories/types/automationTypes.ts     |   3 +-
 backend/src/services/automationService.ts     |  27 +++
 backend/src/services/integrationService.ts    |  38 +++-
 backend/src/types/automationTypes.ts          |   4 +-
 .../actions/hubspot-action-contact-list.vue   |   4 +-
 .../src/repo/automation.repo.ts               |  28 +++
 .../src/service/integrationRunService.ts      |   9 +
 .../src/queue/index.ts                        |  25 ++-
 .../src/repo/automation.repo.ts               |  15 ++
 .../src/service/member.sync.service.ts        | 202 +++++++++++++++++-
 .../src/service/opensearch.service.ts         |   2 +-
 .../integrations/src/integrations/index.ts    |   1 +
 .../premium/hubspot/api/addContactsToList.ts  |  32 +++
 .../integrations/premium/hubspot/api/lists.ts |  42 ++++
 .../field-mapper/hubspotFieldMapper.ts        |  14 ++
 .../premium/hubspot/processSyncRemote.ts      |  18 +-
 .../premium/hubspot/startSyncRemote.ts        |  29 +++
 .../src/integrations/premium/hubspot/types.ts |   1 +
 services/libs/integrations/src/types.ts       |  10 +-
 .../src/instances/integrationSyncWorker.ts    |  30 ++-
 services/libs/types/src/automations.ts        |  24 +++
 services/libs/types/src/index.ts              |   2 +
 .../queue/integration_sync_worker/index.ts    |   1 +
 25 files changed, 564 insertions(+), 12 deletions(-)
 create mode 100644 backend/src/api/integration/helpers/hubspotGetLists.ts
 create mode 100644 services/apps/integration_run_worker/src/repo/automation.repo.ts
 create mode 100644 services/apps/integration_sync_worker/src/repo/automation.repo.ts
 create mode 100644 services/libs/integrations/src/integrations/premium/hubspot/api/addContactsToList.ts
 create mode 100644 services/libs/integrations/src/integrations/premium/hubspot/api/lists.ts
 create mode 100644 services/libs/types/src/automations.ts

diff --git a/backend/src/api/integration/helpers/hubspotGetLists.ts b/backend/src/api/integration/helpers/hubspotGetLists.ts
new file mode 100644
index 0000000000..9723f44ef4
--- /dev/null
+++ b/backend/src/api/integration/helpers/hubspotGetLists.ts
@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.integrationEdit)
+  const payload = await new IntegrationService(req).hubspotGetLists()
+  await req.responseHandler.success(req, res, payload)
+}
diff --git a/backend/src/api/integration/index.ts b/backend/src/api/integration/index.ts
index faf7679a70..4c98042a45 100644
--- a/backend/src/api/integration/index.ts
+++ b/backend/src/api/integration/index.ts
@@ -102,6 +102,12 @@ export default (app) => {
     safeWrap(require('./helpers/hubspotGetMappableFields').default),
   )
 
+  app.get(
+    '/tenant/:tenantId/hubspot-get-lists',
+    featureFlagMiddleware(FeatureFlag.HUBSPOT, 'hubspot.errors.notInPlan'),
+    safeWrap(require('./helpers/hubspotGetLists').default),
+  )
+
   app.post(
     '/tenant/:tenantId/hubspot-sync-member',
     featureFlagMiddleware(FeatureFlag.HUBSPOT, 'hubspot.errors.notInPlan'),
diff --git a/backend/src/database/repositories/types/automationTypes.ts b/backend/src/database/repositories/types/automationTypes.ts
index b14892bd3c..67126b474c 100644
--- a/backend/src/database/repositories/types/automationTypes.ts
+++ b/backend/src/database/repositories/types/automationTypes.ts
@@ -1,3 +1,4 @@
+import { AutomationSyncTrigger } from '@crowd/types'
 import {
   AutomationExecutionState,
   AutomationSettings,
@@ -9,7 +10,7 @@ import {
 export interface DbAutomationInsertData {
   name: string
   type: AutomationType
-  trigger: AutomationTrigger
+  trigger: AutomationTrigger | AutomationSyncTrigger
   settings: AutomationSettings
   state: AutomationState
 }
diff --git a/backend/src/services/automationService.ts b/backend/src/services/automationService.ts
index aa5bf2b7e4..8de2e57591 100644
--- a/backend/src/services/automationService.ts
+++ b/backend/src/services/automationService.ts
@@ -1,7 +1,9 @@
+import { AutomationSyncTrigger, PlatformType } from '@crowd/types'
 import {
   AutomationCriteria,
   AutomationData,
   AutomationState,
+  AutomationType,
   CreateAutomationRequest,
   UpdateAutomationRequest,
 } from '../types/automationTypes'
@@ -10,6 +12,9 @@ import SequelizeRepository from '../database/repositories/sequelizeRepository'
 import AutomationRepository from '../database/repositories/automationRepository'
 import { PageData } from '../types/common'
 import { ServiceBase } from './serviceBase'
+import { getIntegrationSyncWorkerEmitter } from '@/serverless/utils/serviceSQS'
+import IntegrationRepository from '@/database/repositories/integrationRepository'
+import Error404 from '@/errors/Error404'
 
 export default class AutomationService extends ServiceBase<
   AutomationData,
@@ -39,6 +44,28 @@ export default class AutomationService extends ServiceBase<
 
       await SequelizeRepository.commitTransaction(txOptions.transaction)
 
+      // check automation type, if hubspot trigger an automation onboard
+      if (req.type === AutomationType.HUBSPOT) {
+        let integration
+
+        try {
+          integration = await IntegrationRepository.findByPlatform(PlatformType.HUBSPOT, {
+            ...this.options,
+          })
+        } catch (err) {
+          this.options.log.error(err, 'Error while fetching HubSpot integration from DB!')
+          throw new Error404()
+        }
+
+        const integrationSyncWorkerEmitter = await getIntegrationSyncWorkerEmitter()
+        await integrationSyncWorkerEmitter.triggerOnboardAutomation(
+          this.options.currentTenant.id,
+          integration.id,
+          result.id,
+          req.trigger as AutomationSyncTrigger,
+        )
+      }
+
       return result
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(txOptions.transaction)
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index 1bc8a27626..f8b024c05d 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -13,6 +13,7 @@ import {
   IHubspotTokenInfo,
   HubspotEndpoint,
   IHubspotManualSyncPayload,
+  getHubspotLists,
 } from '@crowd/integrations'
 import { ILinkedInOrganization } from '../serverless/integrations/types/linkedinTypes'
 import { DISCORD_CONFIG, GITHUB_CONFIG, IS_TEST_ENV, KUBE_MODE, NANGO_CONFIG } from '../conf/index'
@@ -768,6 +769,39 @@ export default class IntegrationService {
     )
   }
 
+  async hubspotGetLists() {
+    const tenantId = this.options.currentTenant.id
+    const nangoId = `${tenantId}-${PlatformType.HUBSPOT}`
+
+    let token: string
+    try {
+      token = await getToken(nangoId, PlatformType.HUBSPOT, this.options.log)
+    } catch (err) {
+      this.options.log.error(err, 'Error while verifying HubSpot tenant token in Nango!')
+      throw new Error400(this.options.language, 'errors.noNangoToken.message')
+    }
+
+    if (!token) {
+      throw new Error400(this.options.language, 'errors.noNangoToken.message')
+    }
+
+    const context = {
+      log: this.options.log,
+      serviceSettings: {
+        nangoId,
+        nangoUrl: NANGO_CONFIG.url,
+        nangoSecretKey: NANGO_CONFIG.secretKey,
+      },
+    }
+
+    const memberLists = await getHubspotLists(nangoId, context)
+
+    return {
+      members: memberLists,
+      organizations: [], // hubspot doesn't support company lists yet
+    }
+  }
+
   async hubspotGetMappableFields() {
     const memberAttributeSettings = (
       await MemberAttributeSettingsRepository.findAndCountAll({}, this.options)
@@ -791,8 +825,8 @@ export default class IntegrationService {
     )
 
     return {
-      members: memberMapper.getTypeMap(),
-      organizations: organizationMapper.getTypeMap(),
+      members: memberMapper.getTypeMapOld(),
+      organizations: organizationMapper.getTypeMapOld(),
     }
   }
 
diff --git a/backend/src/types/automationTypes.ts b/backend/src/types/automationTypes.ts
index cd2797c170..afc5550947 100644
--- a/backend/src/types/automationTypes.ts
+++ b/backend/src/types/automationTypes.ts
@@ -1,11 +1,13 @@
 /**
  * all automation types that we are currently supporting
  */
+import { AutomationSyncTrigger } from '@crowd/types'
 import { SearchCriteria } from './common'
 
 export enum AutomationType {
   WEBHOOK = 'webhook',
   SLACK = 'slack',
+  HUBSPOT = 'hubspot',
 }
 
 /**
@@ -84,7 +86,7 @@ export interface AutomationData {
 export interface CreateAutomationRequest {
   name: string
   type: AutomationType
-  trigger: AutomationTrigger
+  trigger: AutomationTrigger | AutomationSyncTrigger
   settings: AutomationSettings
 }
 
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
index 62d6eef710..476e69323d 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-contact-list.vue
@@ -17,8 +17,8 @@
       >
         <el-option
           v-for="list of props.lists.members"
-          :key="list.id"
-          :value="list.id"
+          :key="list.listId"
+          :value="list.listId"
           :label="list.name"
         />
       </el-select>
diff --git a/services/apps/integration_run_worker/src/repo/automation.repo.ts b/services/apps/integration_run_worker/src/repo/automation.repo.ts
new file mode 100644
index 0000000000..95711fcadf
--- /dev/null
+++ b/services/apps/integration_run_worker/src/repo/automation.repo.ts
@@ -0,0 +1,28 @@
+import { DbStore, RepositoryBase } from '@crowd/database'
+import { Logger } from '@crowd/logging'
+import { AutomationSyncTrigger, IAutomation } from '@crowd/types'
+
+export class AutomationRepository extends RepositoryBase<AutomationRepository> {
+  constructor(dbStore: DbStore, parentLog: Logger) {
+    super(dbStore, parentLog)
+  }
+
+  public async findSyncAutomations(
+    tenantId: string,
+    platform: string,
+  ): Promise<IAutomation[] | null> {
+    const results = await this.db().any(
+      `select * from automations where platform = $(platform) and "tenantId" = $(tenantId) and trigger in ($(syncAutomationTriggers:csv))`,
+      {
+        tenantId,
+        platform,
+        syncAutomationTriggers: [
+          AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
+          AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
+        ],
+      },
+    )
+
+    return results
+  }
+}
diff --git a/services/apps/integration_run_worker/src/service/integrationRunService.ts b/services/apps/integration_run_worker/src/service/integrationRunService.ts
index cc08eea3bb..152d1e4723 100644
--- a/services/apps/integration_run_worker/src/service/integrationRunService.ts
+++ b/services/apps/integration_run_worker/src/service/integrationRunService.ts
@@ -19,10 +19,12 @@ import { NANGO_CONFIG, PLATFORM_CONFIG, SLACK_ALERTING_CONFIG } from '../conf'
 import IntegrationRunRepository from '../repo/integrationRun.repo'
 import MemberAttributeSettingsRepository from '../repo/memberAttributeSettings.repo'
 import SampleDataRepository from '../repo/sampleData.repo'
+import { AutomationRepository } from '@/repo/automation.repo'
 
 export default class IntegrationRunService extends LoggerBase {
   private readonly repo: IntegrationRunRepository
   private readonly sampleDataRepo: SampleDataRepository
+  private readonly automationRepo: AutomationRepository
 
   constructor(
     private readonly redisClient: RedisClient,
@@ -38,6 +40,7 @@ export default class IntegrationRunService extends LoggerBase {
 
     this.repo = new IntegrationRunRepository(store, this.log)
     this.sampleDataRepo = new SampleDataRepository(store, this.log)
+    this.automationRepo = new AutomationRepository(store, this.log)
   }
 
   public async handleStreamProcessed(runId: string): Promise<void> {
@@ -169,6 +172,11 @@ export default class IntegrationRunService extends LoggerBase {
             settings.syncRemoteEnabled &&
             settings.blockSyncRemote !== true
           ) {
+            const syncAutomations = await this.automationRepo.findSyncAutomations(
+              runInfo.tenantId,
+              runInfo.integrationType,
+            )
+
             const syncRemoteContext: IIntegrationStartRemoteSyncContext = {
               integrationSyncWorkerEmitter: this.integrationSyncWorkerEmitter,
               integration: {
@@ -179,6 +187,7 @@ export default class IntegrationRunService extends LoggerBase {
                 settings: runInfo.integrationSettings,
                 token: runInfo.integrationToken,
               },
+              automations: syncAutomations,
               tenantId: runInfo.tenantId,
               log: this.log,
             }
diff --git a/services/apps/integration_sync_worker/src/queue/index.ts b/services/apps/integration_sync_worker/src/queue/index.ts
index 89414b742b..210b7ef968 100644
--- a/services/apps/integration_sync_worker/src/queue/index.ts
+++ b/services/apps/integration_sync_worker/src/queue/index.ts
@@ -9,7 +9,7 @@ import {
   SqsClient,
   SqsQueueReceiver,
 } from '@crowd/sqs'
-import { IQueueMessage, IntegrationSyncWorkerQueueMessageType } from '@crowd/types'
+import { AutomationSyncTrigger, IQueueMessage, IntegrationSyncWorkerQueueMessageType } from '@crowd/types'
 import { Client } from '@opensearch-project/opensearch'
 
 export class WorkerQueueReceiver extends SqsQueueReceiver {
@@ -71,6 +71,29 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
             data.integrationId,
           )
           break
+        case IntegrationSyncWorkerQueueMessageType.ONBOARD_AUTOMATION:
+
+            if (data.automationTrigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
+              await this.initMemberService().syncAllFilteredMembers(
+                data.tenantId,
+                data.integrationId,
+                data.automationId,
+              )
+
+            }
+            // else if (data.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH) {
+            //   await this.initOrganizationService().syncAllFilteredOrganizations(
+            //     data.tenantId,
+            //     data.integrationId,
+            //   )
+// 
+            // }
+            else {
+              const errorMessage = `Unsupported trigger for onboard automation message!`
+              this.log.error( { message }, errorMessage)
+              throw new Error(errorMessage)
+            }
+          break
 
         default:
           throw new Error(`Unknown message type: ${message.type}`)
diff --git a/services/apps/integration_sync_worker/src/repo/automation.repo.ts b/services/apps/integration_sync_worker/src/repo/automation.repo.ts
new file mode 100644
index 0000000000..0275d58303
--- /dev/null
+++ b/services/apps/integration_sync_worker/src/repo/automation.repo.ts
@@ -0,0 +1,15 @@
+import { DbStore, RepositoryBase } from '@crowd/database'
+import { Logger } from '@crowd/logging'
+import { IDbIntegration } from './integration.data'
+import { IAutomation } from '@crowd/types'
+
+export class AutomationRepository extends RepositoryBase<AutomationRepository> {
+  constructor(dbStore: DbStore, parentLog: Logger) {
+    super(dbStore, parentLog)
+  }
+
+  public async findById(id: string): Promise< IAutomation | null> {
+    return await this.db().oneOrNone(`select * from automations where id = $(id)`, { id })
+  }
+
+}
diff --git a/services/apps/integration_sync_worker/src/service/member.sync.service.ts b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
index 2f4cca8bd2..72eff6d4d6 100644
--- a/services/apps/integration_sync_worker/src/service/member.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
@@ -8,7 +8,7 @@ import { Edition } from '@crowd/types'
 import { ISearchHit } from './opensearch.data'
 import { OpenSearchService } from './opensearch.service'
 import { IntegrationRepository } from '@/repo/integration.repo'
-import { FieldTranslatorFactory } from '@crowd/opensearch'
+import { FieldTranslatorFactory, OpensearchQueryParser } from '@crowd/opensearch'
 import {
   IBatchCreateMemberResult,
   IIntegrationProcessRemoteSyncContext,
@@ -16,10 +16,12 @@ import {
 } from '@crowd/integrations'
 import { IDbIntegration } from '@/repo/integration.data'
 import { SearchSyncWorkerEmitter } from '@crowd/sqs'
+import { AutomationRepository } from '@/repo/automation.repo'
 
 export class MemberSyncService extends LoggerBase {
   private readonly memberRepo: MemberRepository
   private readonly integrationRepo: IntegrationRepository
+  private readonly automationRepo: AutomationRepository
 
   constructor(
     store: DbStore,
@@ -31,6 +33,7 @@ export class MemberSyncService extends LoggerBase {
 
     this.memberRepo = new MemberRepository(store, this.log)
     this.integrationRepo = new IntegrationRepository(store, this.log)
+    this.automationRepo = new AutomationRepository(store, this.log)
   }
 
   public async syncMember(
@@ -232,4 +235,201 @@ export class MemberSyncService extends LoggerBase {
       }
     } while (markedMembers.length > 0)
   }
+
+  public async syncAllFilteredMembers(tenantId: string, integrationId: string, automationId: string, batchSize: number = 50) {
+    const integration: IDbIntegration = await this.integrationRepo.findById(integrationId)
+    const automation = await this.automationRepo.findById(automationId)
+
+    const platforms = await this.memberRepo.getExistingPlatforms(tenantId)
+
+    const attributes = await this.memberRepo.getTenantMemberAttributes(tenantId)
+
+    const isMultiSegment = SERVICE_CONFIG().edition === Edition.LFX
+
+    const translator = FieldTranslatorFactory.getTranslator(OpenSearchIndex.MEMBERS, attributes, [
+      'default',
+      'custom',
+      'crowd',
+      'enrichment',
+      automation.type, // it could be that no members have the outgoing identity yet, but member could be marked through attributes
+      ...platforms,
+    ])
+
+    const parseOptions = {
+      filter: automation.settings.filter,
+      limit: batchSize,
+      offset: 0,
+      orderBy: 'createdAt_DESC'
+    }
+
+    const parsed = OpensearchQueryParser.parse(
+      parseOptions,
+      OpenSearchIndex.MEMBERS,
+      translator,
+    )
+
+    // only get members that aren't marked as sync yet
+    parsed.query.bool.must.push({
+      bool: {
+        should: [
+          {
+            bool: {
+              must_not: {
+                exists: {
+                  field: `obj_attributes.obj_syncRemote.bool_${integration.platform}`
+                }
+              }
+            }
+          },
+          {
+            term: {
+              [`obj_attributes.obj_syncRemote.bool_${integration.platform}`]: false
+            }
+          }
+        ],
+        minimum_should_match: 1
+      }
+    })
+
+    // discard team members, bots and organizations
+    parsed.query.bool.must.push({
+      bool: {
+        must: [
+          {
+            bool: {
+              must_not: {
+                term: {
+                  [`obj_attributes.obj_isTeamMember.bool_default`]: true
+                }
+              }
+            }
+          },
+          {
+            bool: {
+              must_not: {
+                term: {
+                  [`obj_attributes.obj_isBot.bool_default`]: true
+                }
+              }
+            }
+          },
+          {
+            bool: {
+              must_not: {
+                term: {
+                  [`obj_attributes.obj_isOrganization.bool_default`]: true
+                }
+              }
+            }
+          },
+        ],
+      }
+    })
+
+    if (isMultiSegment) {
+      parsed.query.bool.must.push({
+        term: {
+          uuid_segmentId: integration.segmentId,
+        },
+      })
+    }
+
+    let filteredMembers
+    let offset
+
+    this.log.trace( { filter: automation.settings.filter }, 'Trying to sync members that conform to sent filter!')
+
+    do {
+      const membersToCreate: IMember[] = []
+      const membersToUpdate: IMember[] = []
+
+      offset = filteredMembers ? offset + batchSize : 0
+      parsed.from = offset
+
+      filteredMembers = await this.openSearchService.client.search({
+        index: OpenSearchIndex.MEMBERS,
+        body: parsed
+      })
+
+      this.log.trace("Found members: ")
+      this.log.trace(filteredMembers)
+  
+      const translatedMembers: IMember[] = filteredMembers.body.hits.hits.reduce((acc, member) => {
+        const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
+        acc.push(membersWithCrowdFields)
+        return acc
+      }, [])
+  
+      while (translatedMembers.length > 0) {
+        const memberToSync = translatedMembers.shift()
+  
+        this.log.trace(`Syncing member ${memberToSync.id} to ${integration.platform} remote!`)
+  
+        const memberFromDb = await this.memberRepo.findMemberAttributes(memberToSync.id)
+  
+        // if sourceId doesn't exist in opensearch, but exists in db, use the sourceId in db and sync to opensearch again
+        if (
+          !memberToSync.attributes?.sourceId?.[integration.platform] &&
+          memberFromDb.attributes?.sourceId?.[integration.platform]
+        ) {
+          this.log.warn(
+            `${integration.platform} sourceId found in db but not in opensearch - using db value and sending trigger member sync to search-sync-worker!`,
+          )
+          if (memberToSync.attributes?.sourceId) {
+            memberToSync.attributes.sourceId[integration.platform] =
+              memberFromDb.attributes.sourceId[integration.platform]
+          } else {
+            memberToSync.attributes.sourceId = {
+              [integration.platform]: memberFromDb.attributes?.sourceId?.[integration.platform],
+            }
+          }
+  
+          await this.searchSyncEmitter.triggerMemberSync(tenantId, memberFromDb.id)
+        }
+  
+        if (memberToSync.attributes?.sourceId?.[integration.platform]) {
+          membersToUpdate.push(memberToSync)
+        } else {
+          membersToCreate.push(memberToSync)
+        }
+      }
+
+      const service = singleOrDefault(INTEGRATION_SERVICES, (s) => s.type === integration.platform)
+
+      if (service.processSyncRemote) {
+        const context: IIntegrationProcessRemoteSyncContext = {
+          integration,
+          log: this.log,
+          serviceSettings: {
+            nangoId: `${tenantId}-${integration.platform}`,
+            nangoUrl: NANGO_CONFIG().url,
+            nangoSecretKey: NANGO_CONFIG().secretKey,
+          },
+          tenantId,
+          automation,
+        }
+
+        const newMembers = await service.processSyncRemote<IMember>(
+          membersToCreate,
+          membersToUpdate,
+          Entity.MEMBERS,
+          context,
+        )
+
+        for (const newMember of newMembers as IBatchCreateMemberResult[]) {
+          await this.memberRepo.setIntegrationSourceId(
+            newMember.memberId,
+            integration.platform as PlatformType,
+            newMember.sourceId,
+          )
+
+          await this.searchSyncEmitter.triggerMemberSync(tenantId, newMember.memberId)
+        }
+      } else {
+        this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
+      }
+
+
+    } while (filteredMembers.length > 0)
+  }
 }
diff --git a/services/apps/integration_sync_worker/src/service/opensearch.service.ts b/services/apps/integration_sync_worker/src/service/opensearch.service.ts
index 6efa76eede..b3f484763a 100644
--- a/services/apps/integration_sync_worker/src/service/opensearch.service.ts
+++ b/services/apps/integration_sync_worker/src/service/opensearch.service.ts
@@ -4,7 +4,7 @@ import { ISearchHit } from './opensearch.data'
 import { OpenSearchIndex } from '@crowd/types'
 
 export class OpenSearchService extends LoggerBase {
-  private readonly client: Client
+  public readonly client: Client
 
   constructor(parentLog: Logger, client: Client) {
     super(parentLog)
diff --git a/services/libs/integrations/src/integrations/index.ts b/services/libs/integrations/src/integrations/index.ts
index af64a3d479..822d6a51f1 100644
--- a/services/libs/integrations/src/integrations/index.ts
+++ b/services/libs/integrations/src/integrations/index.ts
@@ -32,6 +32,7 @@ export * from './premium/hubspot/api/types'
 export * from './premium/hubspot/field-mapper/mapperFactory'
 export { getProperties as getHubspotProperties } from './premium/hubspot/api/properties'
 export { getTokenInfo as getHubspotTokenInfo } from './premium/hubspot/api/tokenInfo'
+export { getLists as getHubspotLists } from './premium/hubspot/api/lists'
 
 export * from './reddit/grid'
 export * from './reddit/types'
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/addContactsToList.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/addContactsToList.ts
new file mode 100644
index 0000000000..3ce54f9ad7
--- /dev/null
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/addContactsToList.ts
@@ -0,0 +1,32 @@
+import axios, { AxiosRequestConfig } from 'axios'
+import { PlatformType } from '@crowd/types'
+import { getNangoToken } from '../../../nango'
+import { IGenerateStreamsContext, IProcessStreamContext } from '@/types'
+
+export const addContactsToList = async (
+  nangoId: string,
+  listId: string,
+  contactIds: string[],
+  ctx: IProcessStreamContext | IGenerateStreamsContext,
+): Promise<void> => {
+  const config: AxiosRequestConfig<unknown> = {
+    method: 'post',
+    url: `https://api.hubapi.com/contacts/v1/lists/${listId}/add`,
+    data: {},
+  }
+  try {
+    ctx.log.debug({ nangoId }, `Adding contacts to list ${listId} in HubSpot!`)
+
+    const accessToken = await getNangoToken(nangoId, PlatformType.HUBSPOT, ctx)
+    config.headers = { Authorization: `Bearer ${accessToken}` }
+
+    config.data = {
+      vids: contactIds,
+    }
+
+    await axios(config)
+  } catch (err) {
+    ctx.log.error({ err }, `Error while adding contacts to hubspot list!`)
+    throw err
+  }
+}
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/lists.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/lists.ts
new file mode 100644
index 0000000000..999c15d6ac
--- /dev/null
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/lists.ts
@@ -0,0 +1,42 @@
+import axios, { AxiosRequestConfig } from 'axios'
+import { PlatformType } from '@crowd/types'
+import { getNangoToken } from '../../../nango'
+import { IGenerateStreamsContext, IProcessStreamContext } from '@/types'
+import { IHubspotList } from '../types'
+
+export const getLists = async (
+  nangoId: string,
+  ctx: IProcessStreamContext | IGenerateStreamsContext,
+): Promise<IHubspotList[]> => {
+  const PAGE_SIZE = 100
+  const config: AxiosRequestConfig<unknown> = {
+    method: 'get',
+    url: `https://api.hubapi.com/contacts/v1/lists`,
+  }
+  try {
+    ctx.log.debug({ nangoId }, `Fetching lists from HubSpot`)
+
+    const accessToken = await getNangoToken(nangoId, PlatformType.HUBSPOT, ctx)
+    config.headers = { Authorization: `Bearer ${accessToken}` }
+
+    let response
+    let offset
+    const hubspotLists: IHubspotList[] = []
+
+    do {
+      offset = response === undefined ? 0 : response.offset
+      config.url = `https://api.hubapi.com/contacts/v1/lists?count=${PAGE_SIZE}&offset=${offset}`
+
+      ctx.log.debug({ PAGE_SIZE, offset, url: config.url }, `Getting lists!`)
+
+      response = (await axios(config)).data
+
+      hubspotLists.push(...response.lists.filter((l) => l.dynamic !== true))
+    } while (response[`has-more`] !== false)
+
+    return hubspotLists
+  } catch (err) {
+    ctx.log.error({ err }, `Error while getting hubspot lists!`)
+    throw err
+  }
+}
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
index 8601327afe..90fbcf4b01 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
@@ -68,6 +68,20 @@ export abstract class HubspotFieldMapper {
     return typeMap
   }
 
+  public getTypeMapOld(): Record<string, HubspotPropertyType> {
+    if (!this.fieldProperties) {
+      throw new Error(`Can't find field properties of ${this.entity}!`)
+    }
+
+    const typeMap: Record<string, HubspotPropertyType> = {}
+
+    Object.keys(this.fieldProperties).forEach((propertyName) => {
+      typeMap[propertyName] = this.fieldProperties[propertyName].hubspotType
+    })
+
+    return typeMap
+  }
+
   public getCrowdFieldName(hubspotAttributeName: string): string {
     if (!this.fieldMap) {
       throw new Error(`${this.entity} field map is not set!`)
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts b/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
index bc56811f26..be42e74c04 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
@@ -4,7 +4,7 @@ import {
   ProcessIntegrationSyncHandler,
 } from '@/types'
 import { HubspotEntity, IHubspotIntegrationSettings } from './types'
-import { Entity, IMember, IOrganization } from '@crowd/types'
+import { AutomationSyncTrigger, Entity, IMember, IOrganization } from '@crowd/types'
 import { HubspotFieldMapperFactory } from './field-mapper/mapperFactory'
 import { HubspotMemberFieldMapper } from './field-mapper/memberFieldMapper'
 import { RequestThrottler } from '@crowd/common'
@@ -14,6 +14,7 @@ import { HubspotOrganizationFieldMapper } from './field-mapper/organizationField
 import { batchCreateOrganizations } from './api/batchCreateOrganizations'
 import { batchUpdateOrganizations } from './api/batchUpdateOrganizations'
 import { IBatchOperationResult } from './api/types'
+import { addContactsToList } from './api/addContactsToList'
 
 const handler: ProcessIntegrationSyncHandler = async <T>(
   toCreate: T[],
@@ -71,6 +72,21 @@ const handler: ProcessIntegrationSyncHandler = async <T>(
         )
       }
 
+      // we should also add members to hubspot lists, if it's coming from an automation
+      if (ctx.automation.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
+        const vids: string[] = [
+          ...membersCreatedInHubspot.map((m) => m.sourceId),
+          ...(toUpdate as IMember[]).map((m) => m.attributes.sourceId.hubspot),
+        ]
+
+        await addContactsToList(
+          nangoId,
+          ctx.automation.settings.contactList,
+          vids,
+          integrationContext,
+        )
+      }
+
       return membersCreatedInHubspot || []
     }
     case Entity.ORGANIZATIONS: {
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts b/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
index 7ec0544d68..6da0db2aa3 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
@@ -1,5 +1,6 @@
 import { StartIntegrationSyncHandler } from '@/types'
 import { HubspotEntity, IHubspotIntegrationSettings } from './types'
+import { AutomationSyncTrigger } from '@crowd/types'
 
 const handler: StartIntegrationSyncHandler = async (ctx) => {
   const settings = ctx.integration.settings as IHubspotIntegrationSettings
@@ -9,6 +10,20 @@ const handler: StartIntegrationSyncHandler = async (ctx) => {
       ctx.tenantId,
       ctx.integration.id,
     )
+
+    const memberSyncAutomations = ctx.automations.filter(
+      (a) => a.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
+    )
+
+    // sync filter automations
+    for (const automation of memberSyncAutomations) {
+      await ctx.integrationSyncWorkerEmitter.triggerOnboardAutomation(
+        ctx.tenantId,
+        ctx.integration.id,
+        automation.id,
+        automation.trigger as AutomationSyncTrigger,
+      )
+    }
   }
 
   if (settings.enabledFor.includes(HubspotEntity.ORGANIZATIONS)) {
@@ -17,6 +32,20 @@ const handler: StartIntegrationSyncHandler = async (ctx) => {
       ctx.tenantId,
       ctx.integration.id,
     )
+
+    const organizationSyncAutomations = ctx.automations.filter(
+      (a) => a.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
+    )
+
+    // sync filter automations
+    for (const automation of organizationSyncAutomations) {
+      await ctx.integrationSyncWorkerEmitter.triggerOnboardAutomation(
+        ctx.tenantId,
+        ctx.integration.id,
+        automation.id,
+        automation.trigger as AutomationSyncTrigger,
+      )
+    }
   }
 }
 
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/types.ts b/services/libs/integrations/src/integrations/premium/hubspot/types.ts
index f5d747328b..6480187114 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/types.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/types.ts
@@ -8,6 +8,7 @@ export enum HubspotPropertyType {
   STRING = 'string',
   NUMBER = 'number',
 }
+
 export interface IFieldProperty {
   hubspotType: HubspotPropertyType
   readonly?: boolean
diff --git a/services/libs/integrations/src/types.ts b/services/libs/integrations/src/types.ts
index e391011a76..67e6802c86 100644
--- a/services/libs/integrations/src/types.ts
+++ b/services/libs/integrations/src/types.ts
@@ -1,4 +1,10 @@
-import { IMemberAttribute, IActivityData, IntegrationResultType, Entity } from '@crowd/types'
+import {
+  IMemberAttribute,
+  IActivityData,
+  IntegrationResultType,
+  Entity,
+  IAutomation,
+} from '@crowd/types'
 import { Logger } from '@crowd/logging'
 import { ICache, IIntegration, IIntegrationStream, IRateLimiter } from '@crowd/types'
 
@@ -20,6 +26,7 @@ export interface IIntegrationContext {
 export interface IIntegrationStartRemoteSyncContext {
   integrationSyncWorkerEmitter: IntegrationSyncWorkerEmitter
   integration: IIntegration
+  automations: IAutomation[]
   tenantId: string
   log: Logger
 }
@@ -29,6 +36,7 @@ export interface IIntegrationProcessRemoteSyncContext {
   integration: IIntegration
   log: Logger
   serviceSettings: IIntegrationServiceSettings
+  automation?: IAutomation
 }
 
 export interface IGenerateStreamsContext extends IIntegrationContext {
diff --git a/services/libs/sqs/src/instances/integrationSyncWorker.ts b/services/libs/sqs/src/instances/integrationSyncWorker.ts
index 43828618e8..97c74a718f 100644
--- a/services/libs/sqs/src/instances/integrationSyncWorker.ts
+++ b/services/libs/sqs/src/instances/integrationSyncWorker.ts
@@ -1,5 +1,5 @@
 import { Logger } from '@crowd/logging'
-import { IntegrationSyncWorkerQueueMessageType } from '@crowd/types'
+import { AutomationSyncTrigger, IntegrationSyncWorkerQueueMessageType } from '@crowd/types'
 import { INTEGRATION_SYNC_WORKER_QUEUE_SETTINGS, SqsClient, SqsQueueEmitter } from '..'
 
 export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
@@ -53,6 +53,34 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
     )
   }
 
+  public async triggerOnboardAutomation(
+    tenantId: string,
+    integrationId: string,
+    automationId: string,
+    automationTrigger: AutomationSyncTrigger,
+  ): Promise<void> {
+    if (!tenantId) {
+      throw new Error('tenantId is required!')
+    }
+    if (!automationId) {
+      throw new Error('automationId is required!')
+    }
+    if (!integrationId) {
+      throw new Error('integrationId is required!')
+    }
+    await this.sendMessage(
+      `integration-onboard-automation-${integrationId}-${tenantId}`,
+      {
+        type: IntegrationSyncWorkerQueueMessageType.ONBOARD_AUTOMATION,
+        tenantId,
+        integrationId,
+        automationId,
+        automationTrigger,
+      },
+      `integration-onboard-automation-${automationId}`,
+    )
+  }
+
   public async triggerSyncMarkedOrganizations(
     tenantId: string,
     integrationId: string,
diff --git a/services/libs/types/src/automations.ts b/services/libs/types/src/automations.ts
new file mode 100644
index 0000000000..332f2e0a3d
--- /dev/null
+++ b/services/libs/types/src/automations.ts
@@ -0,0 +1,24 @@
+export enum AutomationSyncTrigger {
+  MEMBER_ATTRIBUTES_MATCH = 'member_attributes_match',
+  ORGANIZATION_ATTRIBUTES_MATCH = 'organization_attributes_match',
+}
+
+export enum AutomationType {
+  WEBHOOK = 'webhook',
+  SLACK = 'slack',
+  HUBSPOT = 'hubspot',
+}
+
+export interface IAutomation {
+  id: string
+  name: string
+  type: AutomationType
+  tenantId: string
+  trigger: string
+  settings: any
+  state: string
+  createdAt: string
+  updatedAt: string
+  createdById: string
+  updatedById: string
+}
diff --git a/services/libs/types/src/index.ts b/services/libs/types/src/index.ts
index 1ff68aea2b..a8f3eb60a0 100644
--- a/services/libs/types/src/index.ts
+++ b/services/libs/types/src/index.ts
@@ -40,3 +40,5 @@ export * from './enums/entities'
 export * from './tags'
 
 export * from './attributes'
+
+export * from './automations'
diff --git a/services/libs/types/src/queue/integration_sync_worker/index.ts b/services/libs/types/src/queue/integration_sync_worker/index.ts
index e4a4c5bc05..27900f991d 100644
--- a/services/libs/types/src/queue/integration_sync_worker/index.ts
+++ b/services/libs/types/src/queue/integration_sync_worker/index.ts
@@ -3,4 +3,5 @@ export enum IntegrationSyncWorkerQueueMessageType {
   SYNC_MEMBER = 'sync_member',
   SYNC_ALL_MARKED_ORGANIZATIONS = 'sync_all_marked_organizations',
   SYNC_ORGANIZATION = 'sync_organization',
+  ONBOARD_AUTOMATION = 'onboard_automation',
 }

From 95ea4a39fcf4d893c23bfa3bd340329ed6790de4 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Thu, 3 Aug 2023 09:22:49 +0200
Subject: [PATCH 18/42] switch to new endpoint for mappable fields

---
 backend/src/services/integrationService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index f8b024c05d..a5166f185f 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -825,8 +825,8 @@ export default class IntegrationService {
     )
 
     return {
-      members: memberMapper.getTypeMapOld(),
-      organizations: organizationMapper.getTypeMapOld(),
+      members: memberMapper.getTypeMap(),
+      organizations: organizationMapper.getTypeMap(),
     }
   }
 

From df82857f2f7cc9a62cdd38b5ed2643afde72b0e9 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Thu, 3 Aug 2023 09:23:36 +0200
Subject: [PATCH 19/42] removed old typemap mapper function

---
 .../hubspot/field-mapper/hubspotFieldMapper.ts     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
index 90fbcf4b01..8601327afe 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/hubspotFieldMapper.ts
@@ -68,20 +68,6 @@ export abstract class HubspotFieldMapper {
     return typeMap
   }
 
-  public getTypeMapOld(): Record<string, HubspotPropertyType> {
-    if (!this.fieldProperties) {
-      throw new Error(`Can't find field properties of ${this.entity}!`)
-    }
-
-    const typeMap: Record<string, HubspotPropertyType> = {}
-
-    Object.keys(this.fieldProperties).forEach((propertyName) => {
-      typeMap[propertyName] = this.fieldProperties[propertyName].hubspotType
-    })
-
-    return typeMap
-  }
-
   public getCrowdFieldName(hubspotAttributeName: string): string {
     if (!this.fieldMap) {
       throw new Error(`${this.entity} field map is not set!`)

From abdf0ab63b5b0b27ca393e3cedd63b99137a525c Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Thu, 3 Aug 2023 12:34:31 +0200
Subject: [PATCH 20/42] Fix headcount filter render

---
 .../src/modules/organization/config/filters/headcount/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/modules/organization/config/filters/headcount/config.ts b/frontend/src/modules/organization/config/filters/headcount/config.ts
index 93533c7163..5e951fd13a 100644
--- a/frontend/src/modules/organization/config/filters/headcount/config.ts
+++ b/frontend/src/modules/organization/config/filters/headcount/config.ts
@@ -19,7 +19,7 @@ const headcount: SelectFilterConfig = {
   },
   apiFilterRenderer({ value, include }: SelectFilterValue): any[] {
     const filter = {
-      size: value,
+      size: { eq: value },
     };
     return [
       (include ? filter : { not: filter }),

From 2ba164e4a9fdc043b946c77d31a28acfc6bd2c4f Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Thu, 3 Aug 2023 14:27:08 +0200
Subject: [PATCH 21/42] Add prevention of duplicate filters & property filter
 fix

---
 .../hubspot/components/hubspot-settings-drawer.vue          | 6 +++---
 .../config/automation-types/hubspot/hubspot-trigger.vue     | 4 ++++
 .../organization/config/filters/annualRevenue/config.ts     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
index 0465f50cc7..6b5846abf0 100644
--- a/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
+++ b/frontend/src/integrations/hubspot/components/hubspot-settings-drawer.vue
@@ -168,11 +168,11 @@
                   <app-hubspot-property-map
                     v-for="(value, key) in organizationMappableFields"
                     :key="key"
-                    v-model="form.mapping.organizations[field]"
-                    v-model:enabled="form.enabled.organizations[field]"
+                    v-model="form.mapping.organizations[key]"
+                    v-model:enabled="form.enabled.organizations[key]"
                     :field="key"
                     :read-only="value.readonly"
-                    :hubspot-fields="getHubspotOrganizationFields(value.hubspotType, form.mapping.organizations[field])"
+                    :hubspot-fields="getHubspotOrganizationFields(value.hubspotType, form.mapping.organizations[key])"
                   />
                 </section>
               </div>
diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
index 48347afaf9..cc7dfb4a4a 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/hubspot-trigger.vue
@@ -90,6 +90,7 @@
             <el-dropdown-item
               v-for="(config, key) in filterConfigs"
               :key="key"
+              :disabled="settings.list.includes(key)"
               @click="addFilter(key)"
             >
               {{ config.label }}
@@ -190,6 +191,9 @@ const $v = useVuelidate(rules, {
 
 const open = ref('');
 const addFilter = (key: string) => {
+  if (settings.value.list.includes(key)) {
+    return;
+  }
   settings.value.list.push(key);
   open.value = key;
 };
diff --git a/frontend/src/modules/organization/config/filters/annualRevenue/config.ts b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
index 8e7c91ec23..f7bd3449d6 100644
--- a/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
+++ b/frontend/src/modules/organization/config/filters/annualRevenue/config.ts
@@ -17,7 +17,7 @@ const annualRevenue: NumberFilterConfig = {
     return itemLabelRendererByType[FilterConfigType.NUMBER]('Annual revenue', value, options);
   },
   apiFilterRenderer(value: NumberFilterValue): any[] {
-    return apiFilterRendererByType[FilterConfigType.NUMBER]('revenueRange.max', value);
+    return apiFilterRendererByType[FilterConfigType.NUMBER]('revenueRange', value);
   },
 };
 

From e12a9f84e6b717b0cc108516e05f718f840366c8 Mon Sep 17 00:00:00 2001
From: Gasper Grom <gasper.grom@gmail.com>
Date: Thu, 3 Aug 2023 16:18:23 +0200
Subject: [PATCH 22/42] Fix organization contact list validation

---
 .../hubspot/actions/hubspot-action-company-list.vue         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
index 999a3e591d..4615d9cea5 100644
--- a/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
+++ b/frontend/src/modules/automation/config/automation-types/hubspot/actions/hubspot-action-company-list.vue
@@ -35,8 +35,8 @@
         >
           <el-option
             v-for="list of props.lists.members"
-            :key="list.id"
-            :value="list.id"
+            :key="list.listId"
+            :value="list.listId"
             :label="list.name"
           />
         </el-select>
@@ -74,7 +74,7 @@ const form = computed<any>({
 
 const rules: any = computed(() => ({
   contactList: {
-    required: (value: string) => (form.value.syncCompanyContacts ? value.length > 0 : true),
+    required: (value: string) => (form.value.syncCompanyContacts ? !!value : true),
   },
 }));
 

From 59aebd05daac26f778746420ca6f3c3fbdc37352 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 11:54:40 +0200
Subject: [PATCH 23/42] automations with new maintanence tables

---
 .../U1691074653__syncRemoteTables.sql         |   0
 .../V1691074653__syncRemoteTables.sql         |  30 ++
 .../memberSyncRemoteRepository.ts             | 109 +++++
 .../organizationSyncRemoteRepository.ts       | 111 +++++
 backend/src/services/automationService.ts     |  38 ++
 backend/src/services/integrationService.ts    |  24 ++
 backend/src/types/automationTypes.ts          |   2 +-
 .../data_sink_worker/src/repo/member.repo.ts  |  21 +-
 .../src/repo/organization.repo.ts             |  20 +
 .../src/service/member.service.ts             |  10 +
 .../src/service/organization.service.ts       |   6 +
 .../src/repo/automation.repo.ts               |   2 +-
 .../src/queue/index.ts                        |  48 ++-
 .../src/repo/member.repo.ts                   | 181 +++++++-
 .../src/repo/organization.repo.ts             | 275 +++++++++---
 .../src/service/member.sync.service.ts        | 404 +++++++++++-------
 .../src/service/organization.sync.service.ts  | 173 +++++++-
 services/libs/common/package-lock.json        |  31 ++
 services/libs/common/package.json             |   1 +
 services/libs/common/src/index.ts             |   1 +
 services/libs/common/src/rawQueryParser.ts    | 354 +++++++++++++++
 .../premium/hubspot/api/batchCreateMembers.ts |  42 +-
 .../hubspot/api/batchCreateOrganizations.ts   |  54 ++-
 .../premium/hubspot/api/contactById.ts        |  50 +++
 .../src/integrations/premium/hubspot/index.ts |   3 +-
 .../premium/hubspot/processSyncRemote.ts      |   7 +-
 .../premium/hubspot/startSyncRemote.ts        |  10 +-
 services/libs/integrations/src/types.ts       |   1 -
 .../src/instances/integrationSyncWorker.ts    |  12 +
 services/libs/types/src/automations.ts        |   5 +
 services/libs/types/src/index.ts              |   4 +
 services/libs/types/src/members.ts            |  10 +
 services/libs/types/src/opensearch.ts         |  35 --
 services/libs/types/src/organizations.ts      |  10 +
 services/libs/types/src/query.ts              |  52 +++
 services/libs/types/src/sync.ts               |   5 +
 services/scripts/build_libs.sh                |   2 +-
 37 files changed, 1819 insertions(+), 324 deletions(-)
 create mode 100644 backend/src/database/migrations/U1691074653__syncRemoteTables.sql
 create mode 100644 backend/src/database/migrations/V1691074653__syncRemoteTables.sql
 create mode 100644 backend/src/database/repositories/memberSyncRemoteRepository.ts
 create mode 100644 backend/src/database/repositories/organizationSyncRemoteRepository.ts
 create mode 100644 services/libs/common/src/rawQueryParser.ts
 create mode 100644 services/libs/integrations/src/integrations/premium/hubspot/api/contactById.ts
 create mode 100644 services/libs/types/src/query.ts
 create mode 100644 services/libs/types/src/sync.ts

diff --git a/backend/src/database/migrations/U1691074653__syncRemoteTables.sql b/backend/src/database/migrations/U1691074653__syncRemoteTables.sql
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/backend/src/database/migrations/V1691074653__syncRemoteTables.sql b/backend/src/database/migrations/V1691074653__syncRemoteTables.sql
new file mode 100644
index 0000000000..1354fbadae
--- /dev/null
+++ b/backend/src/database/migrations/V1691074653__syncRemoteTables.sql
@@ -0,0 +1,30 @@
+create table "membersSyncRemote" (
+    id uuid not null,
+    "memberId" uuid not null,
+    "sourceId" text,
+    "integrationId" uuid not null,
+    "syncFrom" text not null,
+    "metaData" text,
+    "lastSyncedAt" timestamptz,
+    "status" text not null,
+    constraint "membersSyncRemote_pkey" primary key (id),
+    foreign key ("memberId") references members (id) on delete cascade,
+    foreign key ("integrationId") references integrations (id) on delete cascade,
+    unique("memberId", "integrationId", "syncFrom")
+);
+
+
+create table "organizationsSyncRemote" (
+    id uuid not null,
+    "organizationId" uuid not null,
+    "sourceId" text,
+    "integrationId" uuid not null,
+    "syncFrom" text not null,
+    "metaData" text,
+    "lastSyncedAt" timestamptz,
+    "status" text not null,
+    constraint "organizationsSyncRemote_pkey" primary key (id),
+    foreign key ("organizationId") references organizations (id) on delete cascade,
+    foreign key ("integrationId") references integrations (id) on delete cascade,
+    unique("organizationId", "integrationId", "syncFrom")
+);
\ No newline at end of file
diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
new file mode 100644
index 0000000000..1df8300462
--- /dev/null
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -0,0 +1,109 @@
+import { generateUUIDv1 as uuid } from '@crowd/common'
+import { IMemberSyncRemoteData, SyncStatus } from '@crowd/types'
+import { QueryTypes } from 'sequelize'
+import { IRepositoryOptions } from './IRepositoryOptions'
+import { RepositoryBase } from './repositoryBase'
+
+class MemberSyncRemoteRepository extends RepositoryBase<
+  IMemberSyncRemoteData,
+  string,
+  IMemberSyncRemoteData,
+  unknown,
+  unknown
+> {
+  public constructor(options: IRepositoryOptions) {
+    super(options, true)
+  }
+
+  async stopSyncingAutomation(automationId: string) {
+    await this.options.database.sequelize.query(
+      `update "membersSyncRemote" set status = :status where "syncFrom" = :automationId
+        `,
+      {
+        replacements: {
+          status: SyncStatus.STOPPED,
+          automationId,
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
+  async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
+    const existingSyncRemote = await this.findByMemberId(data.memberId)
+
+    if (existingSyncRemote) {
+      data.sourceId = existingSyncRemote.sourceId
+    }
+
+    const memberSyncRemoteInserted = await this.options.database.sequelize.query(
+      `INSERT INTO "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+          VALUES
+              (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
+          RETURNING "id"
+        `,
+      {
+        replacements: {
+          id: uuid(),
+          memberId: data.memberId,
+          integrationId: data.integrationId,
+          syncFrom: data.syncFrom,
+          metaData: data.metaData,
+          lastSyncedAt: data.lastSyncedAt || null,
+          sourceId: data.sourceId || null,
+          status: SyncStatus.ACTIVE,
+        },
+        type: QueryTypes.INSERT,
+      },
+    )
+
+    const memberSyncRemote = await this.findById(memberSyncRemoteInserted[0][0].id)
+    return memberSyncRemote
+  }
+
+  async findByMemberId(memberId: string): Promise<IMemberSyncRemoteData> {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "membersSyncRemote"
+             WHERE "memberId" = :memberId
+             and "sourceId" is not null
+             limit 1;
+            `,
+      {
+        replacements: {
+          memberId,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+
+  async findById(id: string): Promise<IMemberSyncRemoteData> {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "membersSyncRemote"
+             WHERE id = :id;
+            `,
+      {
+        replacements: {
+          id,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+}
+
+export default MemberSyncRemoteRepository
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
new file mode 100644
index 0000000000..f120c298a4
--- /dev/null
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -0,0 +1,111 @@
+import { generateUUIDv1 as uuid } from '@crowd/common'
+import { IOrganizationSyncRemoteData, SyncStatus } from '@crowd/types'
+import { QueryTypes } from 'sequelize'
+import { IRepositoryOptions } from './IRepositoryOptions'
+import { RepositoryBase } from './repositoryBase'
+
+class OrganizationSyncRemoteRepository extends RepositoryBase<
+  IOrganizationSyncRemoteData,
+  string,
+  IOrganizationSyncRemoteData,
+  unknown,
+  unknown
+> {
+  public constructor(options: IRepositoryOptions) {
+    super(options, true)
+  }
+
+  async stopSyncingAutomation(automationId: string) {
+    await this.options.database.sequelize.query(
+      `update "organizationsSyncRemote" set status = :status where "syncFrom" = :automationId
+        `,
+      {
+        replacements: {
+          status: SyncStatus.STOPPED,
+          automationId,
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
+  async markOrganizationForSyncing(
+    data: IOrganizationSyncRemoteData,
+  ): Promise<IOrganizationSyncRemoteData> {
+    const existingSyncRemote = await this.findByOrganizationId(data.organizationId)
+
+    if (existingSyncRemote) {
+      data.sourceId = existingSyncRemote.sourceId
+    }
+
+    const organizationSyncRemoteInserted = await this.options.database.sequelize.query(
+      `INSERT INTO "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+          VALUES
+              (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
+          RETURNING "id"
+        `,
+      {
+        replacements: {
+          id: uuid(),
+          organizationId: data.organizationId,
+          integrationId: data.integrationId,
+          syncFrom: data.syncFrom,
+          metaData: data.metaData,
+          lastSyncedAt: data.lastSyncedAt || null,
+          sourceId: data.sourceId || null,
+          status: SyncStatus.ACTIVE,
+        },
+        type: QueryTypes.INSERT,
+      },
+    )
+
+    const organizationSyncRemote = await this.findById(organizationSyncRemoteInserted[0][0].id)
+    return organizationSyncRemote
+  }
+
+  async findByOrganizationId(organizationId: string): Promise<IOrganizationSyncRemoteData> {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "organizationsSyncRemote"
+             WHERE "organizationId" = :organizationId
+             and "sourceId" is not null
+             limit 1;
+            `,
+      {
+        replacements: {
+          organizationId,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+
+  async findById(id: string): Promise<IOrganizationSyncRemoteData> {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "organizationsSyncRemote"
+             WHERE id = :id;
+            `,
+      {
+        replacements: {
+          id,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+}
+
+export default OrganizationSyncRemoteRepository
diff --git a/backend/src/services/automationService.ts b/backend/src/services/automationService.ts
index 8de2e57591..54a79a0bfc 100644
--- a/backend/src/services/automationService.ts
+++ b/backend/src/services/automationService.ts
@@ -15,6 +15,8 @@ import { ServiceBase } from './serviceBase'
 import { getIntegrationSyncWorkerEmitter } from '@/serverless/utils/serviceSQS'
 import IntegrationRepository from '@/database/repositories/integrationRepository'
 import Error404 from '@/errors/Error404'
+import MemberSyncRemoteRepository from '@/database/repositories/memberSyncRemoteRepository'
+import OrganizationSyncRemoteRepository from '@/database/repositories/organizationSyncRemoteRepository'
 
 export default class AutomationService extends ServiceBase<
   AutomationData,
@@ -89,6 +91,42 @@ export default class AutomationService extends ServiceBase<
       // update an existing automation including its state
       const result = await new AutomationRepository(txOptions).update(id, req)
       await SequelizeRepository.commitTransaction(txOptions.transaction)
+      // check automation type, if hubspot trigger an automation onboard
+      if (result.type === AutomationType.HUBSPOT) {
+        let integration
+
+        try {
+          integration = await IntegrationRepository.findByPlatform(PlatformType.HUBSPOT, {
+            ...this.options,
+          })
+        } catch (err) {
+          this.options.log.error(err, 'Error while fetching HubSpot integration from DB!')
+          throw new Error404()
+        }
+
+        if (
+          result.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH ||
+          result.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH
+        ) {
+          if (result.state === AutomationState.ACTIVE) {
+            const integrationSyncWorkerEmitter = await getIntegrationSyncWorkerEmitter()
+            await integrationSyncWorkerEmitter.triggerOnboardAutomation(
+              this.options.currentTenant.id,
+              integration.id,
+              result.id,
+              result.trigger as AutomationSyncTrigger,
+            )
+          } else if (result.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
+            // disable memberSyncRemote for given automationId
+            const syncRepo = new MemberSyncRemoteRepository(this.options)
+            await syncRepo.stopSyncingAutomation(result.id)
+          } else if (result.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH) {
+            // disable organizationSyncRemote for given automationId
+            const syncRepo = new OrganizationSyncRemoteRepository(this.options)
+            await syncRepo.stopSyncingAutomation(result.id)
+          }
+        }
+      }
       return result
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(txOptions.transaction)
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index af26e18649..08cb948479 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -40,6 +40,8 @@ import MemberAttributeSettingsRepository from '../database/repositories/memberAt
 import TenantRepository from '../database/repositories/tenantRepository'
 import MemberService from './memberService'
 import OrganizationService from './organizationService'
+import MemberSyncRemoteRepository from '@/database/repositories/memberSyncRemoteRepository'
+import OrganizationSyncRemoteRepository from '@/database/repositories/organizationSyncRemoteRepository'
 
 const discordToken = DISCORD_CONFIG.token2 || DISCORD_CONFIG.token
 
@@ -517,6 +519,16 @@ export default class IntegrationService {
       member.attributes.syncRemote.default = true
     }
 
+    const memberSyncRemoteRepo = new MemberSyncRemoteRepository(this.options)
+
+    const memberSyncRemote = await memberSyncRemoteRepo.markMemberForSyncing({
+      integrationId: integration.id,
+      memberId: member.id,
+      metaData: null,
+      syncFrom: 'manual',
+      lastSyncedAt: null,
+    })
+
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     // set integration.settings.syncRemoteEnabled to true, and mark member as syncRemote
@@ -544,6 +556,7 @@ export default class IntegrationService {
       this.options.currentTenant.id,
       integration.id,
       payload.memberId,
+      memberSyncRemote.id,
     )
   }
 
@@ -613,6 +626,16 @@ export default class IntegrationService {
       organization.attributes.syncRemote.default = true
     }
 
+    const organizationSyncRemoteRepo = new OrganizationSyncRemoteRepository(this.options)
+
+    const organizationSyncRemote = await organizationSyncRemoteRepo.markOrganizationForSyncing({
+      integrationId: integration.id,
+      organizationId: organization.id,
+      metaData: null,
+      syncFrom: 'manual',
+      lastSyncedAt: null,
+    })
+
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     // set integration.settings.syncRemoteEnabled to true, and mark organization as syncRemote
@@ -642,6 +665,7 @@ export default class IntegrationService {
       this.options.currentTenant.id,
       integration.id,
       payload.organizationId,
+      organizationSyncRemote.id,
     )
   }
 
diff --git a/backend/src/types/automationTypes.ts b/backend/src/types/automationTypes.ts
index afc5550947..9921c79fa1 100644
--- a/backend/src/types/automationTypes.ts
+++ b/backend/src/types/automationTypes.ts
@@ -71,7 +71,7 @@ export interface AutomationData {
   name: string
   type: AutomationType
   tenantId: string
-  trigger: AutomationTrigger
+  trigger: AutomationTrigger | AutomationSyncTrigger
   settings: AutomationSettings
   state: AutomationState
   createdAt: string
diff --git a/services/apps/data_sink_worker/src/repo/member.repo.ts b/services/apps/data_sink_worker/src/repo/member.repo.ts
index 96772d6fa9..991bdc1403 100644
--- a/services/apps/data_sink_worker/src/repo/member.repo.ts
+++ b/services/apps/data_sink_worker/src/repo/member.repo.ts
@@ -10,7 +10,7 @@ import {
   IDbMemberCreateData,
   IDbMemberUpdateData,
 } from './member.data'
-import { IMemberIdentity } from '@crowd/types'
+import { IMemberIdentity, SyncStatus } from '@crowd/types'
 import { generateUUIDv1 } from '@crowd/common'
 
 export default class MemberRepository extends RepositoryBase<MemberRepository> {
@@ -241,4 +241,23 @@ export default class MemberRepository extends RepositoryBase<MemberRepository> {
       ' ON CONFLICT DO NOTHING'
     await this.db().none(query)
   }
+
+  public async addToSyncRemote(memberId: string, integrationId: string, sourceId: string) {
+    await this.db().none(
+      `insert into "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+      values
+          ($(id), $(memberId), $(sourceId), $(integrationId), $(syncFrom), $(metaData), $(lastSyncedAt), $(status))
+          on conflict do nothing`,
+      {
+        id: generateUUIDv1(),
+        memberId,
+        sourceId,
+        integrationId,
+        syncFrom: 'enrich',
+        metaData: null,
+        lastSyncedAt: null,
+        status: SyncStatus.NEVER,
+      },
+    )
+  }
 }
diff --git a/services/apps/data_sink_worker/src/repo/organization.repo.ts b/services/apps/data_sink_worker/src/repo/organization.repo.ts
index 69a7955b17..3f7da54e92 100644
--- a/services/apps/data_sink_worker/src/repo/organization.repo.ts
+++ b/services/apps/data_sink_worker/src/repo/organization.repo.ts
@@ -12,6 +12,7 @@ import {
   getUpdateOrganizationColumnSet,
 } from './organization.data'
 import { generateUUIDv1 } from '@crowd/common'
+import { SyncStatus } from '@crowd/types'
 
 export class OrganizationRepository extends RepositoryBase<OrganizationRepository> {
   private readonly insertCacheOrganizationColumnSet: DbColumnSet
@@ -254,4 +255,23 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
 
     await this.db().none(query, parameters)
   }
+
+  public async addToSyncRemote(organizationId: string, integrationId: string, sourceId: string) {
+    await this.db().none(
+      `insert into "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+      values
+          ($(id), $(organizationId), $(sourceId), $(integrationId), $(syncFrom), $(metaData), $(lastSyncedAt), $(status))
+          on conflict do nothing`,
+      {
+        id: generateUUIDv1(),
+        organizationId,
+        sourceId,
+        integrationId,
+        syncFrom: 'enrich',
+        metaData: null,
+        lastSyncedAt: null,
+        status: SyncStatus.NEVER,
+      },
+    )
+  }
 }
diff --git a/services/apps/data_sink_worker/src/service/member.service.ts b/services/apps/data_sink_worker/src/service/member.service.ts
index 6609049c3b..3513675ea4 100644
--- a/services/apps/data_sink_worker/src/service/member.service.ts
+++ b/services/apps/data_sink_worker/src/service/member.service.ts
@@ -232,6 +232,16 @@ export default class MemberService extends LoggerBase {
         if (dbMember) {
           this.log.trace({ memberId: dbMember.id }, 'Found existing member.')
 
+          // set a record in membersSyncRemote to save the sourceId
+          // we can't use member.attributes because of segments
+          if (member.attributes?.sourceId?.[platform]) {
+            await txRepo.addToSyncRemote(
+              dbMember.id,
+              dbIntegration.id,
+              member.attributes?.sourceId?.[platform],
+            )
+          }
+
           await this.update(
             dbMember.id,
             tenantId,
diff --git a/services/apps/data_sink_worker/src/service/organization.service.ts b/services/apps/data_sink_worker/src/service/organization.service.ts
index 2ed230006e..0fcb823fd3 100644
--- a/services/apps/data_sink_worker/src/service/organization.service.ts
+++ b/services/apps/data_sink_worker/src/service/organization.service.ts
@@ -230,6 +230,12 @@ export class OrganizationService extends LoggerBase {
         if (dbOrganization) {
           this.log.trace({ organizationId: dbOrganization.id }, 'Found existing organization.')
 
+          // set a record in organizationsSyncRemote to save the sourceId
+          // we can't use organization.attributes because of segments
+          if (sourceId) {
+            await txRepo.addToSyncRemote(dbOrganization.id, dbIntegration.id, sourceId)
+          }
+
           // send to findOrCreate with found organization's name, since we use the name field as the primary key
           await this.findOrCreate(tenantId, segmentId, {
             ...organization,
diff --git a/services/apps/integration_run_worker/src/repo/automation.repo.ts b/services/apps/integration_run_worker/src/repo/automation.repo.ts
index 95711fcadf..2786bd21ca 100644
--- a/services/apps/integration_run_worker/src/repo/automation.repo.ts
+++ b/services/apps/integration_run_worker/src/repo/automation.repo.ts
@@ -12,7 +12,7 @@ export class AutomationRepository extends RepositoryBase<AutomationRepository> {
     platform: string,
   ): Promise<IAutomation[] | null> {
     const results = await this.db().any(
-      `select * from automations where platform = $(platform) and "tenantId" = $(tenantId) and trigger in ($(syncAutomationTriggers:csv))`,
+      `select * from automations where type = $(platform) and "tenantId" = $(tenantId) and trigger in ($(syncAutomationTriggers:csv))`,
       {
         tenantId,
         platform,
diff --git a/services/apps/integration_sync_worker/src/queue/index.ts b/services/apps/integration_sync_worker/src/queue/index.ts
index 210b7ef968..fe0b5be4f7 100644
--- a/services/apps/integration_sync_worker/src/queue/index.ts
+++ b/services/apps/integration_sync_worker/src/queue/index.ts
@@ -9,7 +9,11 @@ import {
   SqsClient,
   SqsQueueReceiver,
 } from '@crowd/sqs'
-import { AutomationSyncTrigger, IQueueMessage, IntegrationSyncWorkerQueueMessageType } from '@crowd/types'
+import {
+  AutomationSyncTrigger,
+  IQueueMessage,
+  IntegrationSyncWorkerQueueMessageType,
+} from '@crowd/types'
 import { Client } from '@opensearch-project/opensearch'
 
 export class WorkerQueueReceiver extends SqsQueueReceiver {
@@ -56,6 +60,7 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
             data.tenantId,
             data.integrationId,
             data.memberId,
+            data.syncRemoteId,
           )
           break
         case IntegrationSyncWorkerQueueMessageType.SYNC_ORGANIZATION:
@@ -63,6 +68,7 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
             data.tenantId,
             data.integrationId,
             data.organizationId,
+            data.syncRemoteId,
           )
           break
         case IntegrationSyncWorkerQueueMessageType.SYNC_ALL_MARKED_ORGANIZATIONS:
@@ -72,27 +78,37 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
           )
           break
         case IntegrationSyncWorkerQueueMessageType.ONBOARD_AUTOMATION:
-
-            if (data.automationTrigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
-              await this.initMemberService().syncAllFilteredMembers(
+          if (data.automationTrigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
+            await this.initMemberService().syncAllFilteredMembers(
+              data.tenantId,
+              data.integrationId,
+              data.automationId,
+            )
+          } else if (
+            data.automationTrigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH
+          ) {
+            const organizationIds =
+              await this.initOrganizationService().syncAllFilteredOrganizations(
                 data.tenantId,
                 data.integrationId,
                 data.automationId,
               )
 
+            // also sync organization members if syncAllFilteredOrganizations return the ids
+            while (organizationIds.length > 0) {
+              const organizationId = organizationIds.shift()
+              await this.initMemberService().syncOrganizationMembers(
+                data.tenantId,
+                data.integrationId,
+                data.automationId,
+                organizationId,
+              )
             }
-            // else if (data.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH) {
-            //   await this.initOrganizationService().syncAllFilteredOrganizations(
-            //     data.tenantId,
-            //     data.integrationId,
-            //   )
-// 
-            // }
-            else {
-              const errorMessage = `Unsupported trigger for onboard automation message!`
-              this.log.error( { message }, errorMessage)
-              throw new Error(errorMessage)
-            }
+          } else {
+            const errorMessage = `Unsupported trigger for onboard automation message!`
+            this.log.error({ message }, errorMessage)
+            throw new Error(errorMessage)
+          }
           break
 
         default:
diff --git a/services/apps/integration_sync_worker/src/repo/member.repo.ts b/services/apps/integration_sync_worker/src/repo/member.repo.ts
index 07a2f6b073..466a44df61 100644
--- a/services/apps/integration_sync_worker/src/repo/member.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/member.repo.ts
@@ -1,13 +1,116 @@
 import { DbStore, RepositoryBase } from '@crowd/database'
+import { generateUUIDv1 as uuid } from '@crowd/common'
+
 import { Logger } from '@crowd/logging'
-import { IMember, IMemberAttribute, PlatformType } from '@crowd/types'
+import {
+  IMember,
+  IMemberAttribute,
+  IMemberSyncRemoteData,
+  PlatformType,
+  SyncStatus,
+} from '@crowd/types'
 import { IMemberIdWithAttributes } from './member.data'
 
+export interface IMemberIdObject {
+  memberId: string
+}
+
 export class MemberRepository extends RepositoryBase<MemberRepository> {
   constructor(dbStore: DbStore, parentLog: Logger) {
     super(dbStore, parentLog)
   }
 
+  public async findSyncRemoteByMemberId(memberId: string): Promise<IMemberSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `SELECT *
+      FROM "membersSyncRemote"
+      WHERE "memberId" = $(memberId)
+      and "sourceId" is not null
+      limit 1;`,
+      { memberId },
+    )
+  }
+
+  public async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
+    const existingSyncRemote = await this.findSyncRemoteByMemberId(data.memberId)
+
+    if (existingSyncRemote) {
+      data.sourceId = existingSyncRemote.sourceId
+    }
+
+    const id = await this.db()
+      .one(
+        `insert into "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+      values
+          ($(id), $(memberId), $(sourceId), $(integrationId), $(syncFrom), $(metaData), $(lastSyncedAt), $(status))
+      returning "id"
+    `,
+        {
+          id: uuid(),
+          memberId: data.memberId,
+          integrationId: data.integrationId,
+          syncFrom: data.syncFrom,
+          metaData: data.metaData || null,
+          lastSyncedAt: data.lastSyncedAt || null,
+          sourceId: data.sourceId || null,
+          status: SyncStatus.ACTIVE,
+        },
+      )
+      .then((data) => data.id)
+
+    return this.findSyncRemoteById(id)
+  }
+
+  public async findSyncRemoteById(syncRemoteId: string): Promise<IMemberSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `select * from "membersSyncRemote" where id = $(syncRemoteId)`,
+      { syncRemoteId },
+    )
+  }
+
+  public async findSyncRemote(
+    memberId: string,
+    integrationId: string,
+    syncFrom: string,
+  ): Promise<IMemberSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `select * from "membersSyncRemote" where "memberId" = $(memberId) and "integrationId" = $(integrationId) and "syncFrom" = $(syncFrom)`,
+      {
+        memberId,
+        integrationId,
+        syncFrom,
+      },
+    )
+  }
+
+  public async setLastSyncedAtBySyncRemoteId(syncRemoteId: string): Promise<void> {
+    this.log.debug(`Setting lastSyncedAt for id ${syncRemoteId}.`)
+
+    await this.db().none(
+      `update "membersSyncRemote" set "lastSyncedAt" = now(), "status" = $(status) where id = $(syncRemoteId)`,
+      {
+        syncRemoteId,
+        status: SyncStatus.ACTIVE,
+      },
+    )
+  }
+
+  public async setLastSyncedAt(memberId: string, integrationId: string): Promise<void> {
+    this.log.debug(
+      `Setting lastSyncedAt for member ${memberId} and integration ${integrationId} to now!`,
+    )
+
+    await this.db().none(
+      `update "membersSyncRemote" set "lastSyncedAt" = now(), "status" = $(status) where "memberId" = $(memberId) and "integrationId" = $(integrationId) and status <> $(neverStatus)`,
+      {
+        memberId,
+        integrationId,
+        status: SyncStatus.ACTIVE,
+        neverStatus: SyncStatus.NEVER,
+      },
+    )
+  }
+
   public async getTenantMemberAttributes(tenantId: string): Promise<IMemberAttribute[]> {
     const results = await this.db().any(
       `select type, "canDelete", show, label, name, options from "memberAttributeSettings" where "tenantId" = $(tenantId)`,
@@ -32,30 +135,31 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
 
   public async setIntegrationSourceId(
     memberId: string,
-    platform: string,
+    integrationId: string,
     sourceId: string,
   ): Promise<void> {
-    const member = await this.db().oneOrNone(
-      `select id, attributes from members where id = $(memberId)`,
-      { memberId },
+    this.log.debug(
+      `Updating member ${memberId} in integration ${integrationId} sourceId to ${sourceId}.`,
     )
 
-    if (member.attributes.sourceId) {
-      member.attributes.sourceId[platform] = sourceId
-      member.attributes.sourceId.default = sourceId
-    } else {
-      member.attributes.sourceId = {
-        [platform]: sourceId,
-        default: sourceId,
-      }
-    }
-
-    this.log.debug(`Updating member ${memberId} ${platform} sourceId to ${sourceId}.`)
     await this.db().none(
-      `update members set "attributes" = $(attributes)::jsonb where id = $(memberId)`,
+      `update "membersSyncRemote" set "sourceId" = $(sourceId) where "memberId" = $(memberId) and "integrationId" = $(integrationId)`,
       {
         memberId,
-        attributes: JSON.stringify(member.attributes),
+        integrationId,
+        sourceId,
+      },
+    )
+  }
+
+  public async setSyncRemoteSourceId(syncRemoteId: string, sourceId: string): Promise<void> {
+    this.log.debug(`Updating syncRemote ${syncRemoteId} sourceId to ${sourceId}.`)
+
+    await this.db().none(
+      `update "membersSyncRemote" set "sourceId" = $(sourceId) where id = $(syncRemoteId)`,
+      {
+        syncRemoteId,
+        sourceId,
       },
     )
   }
@@ -66,6 +170,47 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
     })
   }
 
+  public async findMarkedMembers(
+    integrationId: string,
+    limit: number,
+    offset: number,
+  ): Promise<IMemberSyncRemoteData[]> {
+    const results = await this.db().any(
+      `select distinct "memberId", "sourceId"
+        from "membersSyncRemote"
+        where status = $(status)
+        order by "memberId", "sourceId"
+        limit $(limit) offset $(offset)`,
+      {
+        integrationId,
+        limit,
+        offset,
+        status: SyncStatus.ACTIVE,
+      },
+    )
+    return results
+  }
+
+  public async findOrganizationMembers(
+    organizationId: string,
+    limit: number,
+    offset: number,
+  ): Promise<IMemberIdObject[]> {
+    const results = await this.db().any(
+      `select distinct "memberId"
+        from "memberOrganizations"
+        where "organizationId" = $(organizationId)
+        order by "memberId"
+        limit $(limit) offset $(offset)`,
+      {
+        organizationId,
+        limit,
+        offset,
+      },
+    )
+    return results
+  }
+
   public async findMember(id: string): Promise<IMember> {
     return await this.db().oneOrNone(
       `
diff --git a/services/apps/integration_sync_worker/src/repo/organization.repo.ts b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
index c13c26de57..5d85d9131b 100644
--- a/services/apps/integration_sync_worker/src/repo/organization.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
@@ -1,46 +1,47 @@
 import { DbStore, RepositoryBase } from '@crowd/database'
 import { Logger } from '@crowd/logging'
-import { IOrganization, PlatformType } from '@crowd/types'
+import { generateUUIDv1 as uuid } from '@crowd/common'
+import {
+  IOrganization,
+  IOrganizationSyncRemoteData,
+  JsonColumnInfo,
+  SyncStatus,
+} from '@crowd/types'
 import { IOrganizationIdWithAttributes } from './organization.data'
+import { RawQueryParser } from '@crowd/common'
 
 export class OrganizationRepository extends RepositoryBase<OrganizationRepository> {
   constructor(dbStore: DbStore, parentLog: Logger) {
     super(dbStore, parentLog)
   }
 
+  public static ORGANIZATION_QUERY_FILTER_COLUMN_MAP: Map<string, string> = new Map([
+    ['activityCount', 'oa."activityCount"'],
+    ['memberCount', 'oa."memberCount"'],
+    ['size', 'org.size'],
+    ['industry', 'org.industry'],
+    ['revenueRange', `(org."revenueRange" -> 'max')::integer`],
+  ])
+
+  public static replaceParametersWithDollarSign(inputString) {
+    return inputString.replace(/(?<!:):([\w.]+)/g, '$($1)')
+  }
+
   public async setIntegrationSourceId(
     organizationId: string,
-    platform: string,
+    integrationId: string,
     sourceId: string,
   ): Promise<void> {
-    const organization = await this.db().oneOrNone(
-      `select id, attributes from organizations where id = $(organizationId)`,
-      { organizationId },
+    this.log.debug(
+      `Updating organization ${organizationId} in integration ${integrationId} sourceId to ${sourceId}.`,
     )
 
-    if (
-      !organization.attributes ||
-      (organization.attributes && Object.keys(organization.attributes).length === 0)
-    ) {
-      organization.attributes = {
-        sourceId: {
-          [platform]: sourceId,
-        },
-      }
-    } else if (organization.attributes?.sourceId) {
-      organization.attributes.sourceId[platform] = sourceId
-    } else {
-      organization.attributes.sourceId = {
-        [platform]: sourceId,
-      }
-    }
-
-    this.log.debug(`Updating organization ${organization.id} ${platform} sourceId to ${sourceId}.`)
     await this.db().none(
-      `update organizations set "attributes" = $(attributes)::jsonb where id = $(organizationId)`,
+      `update "organizationsSyncRemote" set "sourceId" = $(sourceId) where "organizationId" = $(organizationId) and "integrationId" = $(integrationId)`,
       {
         organizationId,
-        attributes: JSON.stringify(organization.attributes),
+        integrationId,
+        sourceId,
       },
     )
   }
@@ -57,51 +58,23 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
   }
 
   public async findMarkedOrganizations(
-    tenantId: string,
-    platform: PlatformType,
-    segmentId: string,
+    integrationId: string,
     limit: number,
     offset: number,
-  ): Promise<IOrganization> {
-    const organizationAttribute = `COALESCE(((attributes -> 'syncRemote'::text) -> '${platform}'::text)::boolean, false)`
-
-    let results
-
-    if (segmentId) {
-      results = await this.db().any(
-        `
-        select o.id, o.attributes, o."createdAt"
-        from organizations o
-        left join "organizationSegments" os on os."organizationId" = o.id
-        where ${organizationAttribute} is true
-          and o."tenantId" = $(tenantId)
-        and os."segmentId" = $(segmentId)
-        group by o.id, o.attributes, o."createdAt"
-            order by "createdAt" desc
-        limit $(limit) offset $(offset)`,
-        {
-          tenantId,
-          segmentId,
-          limit,
-          offset,
-        },
-      )
-    } else {
-      results = await this.db().any(
-        `
-        select id, attributes, "createdAt" from organizations 
-        where ${organizationAttribute} is true
-        and "tenantId" = $(tenantId)
-        order by "createdAt" desc
+  ): Promise<IOrganizationSyncRemoteData[]> {
+    const results = await this.db().any(
+      `select distinct "organizationId", "sourceId"
+        from "organizationsSyncRemote"
+        where status = $(status)
+        order by "organizationId", "sourceId"
         limit $(limit) offset $(offset)`,
-        {
-          tenantId,
-          limit,
-          offset,
-        },
-      )
-    }
-
+      {
+        integrationId,
+        limit,
+        offset,
+        status: SyncStatus.ACTIVE,
+      },
+    )
     return results
   }
 
@@ -173,4 +146,172 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
       },
     )
   }
+
+  public async findFilteredOrganizations(
+    tenantId: string,
+    segmentIds: string[],
+    platform: string,
+    filter: any,
+    limit: number,
+    offset: number,
+  ) {
+    const params: any = {
+      tenantId,
+      segmentIds,
+      limit,
+      offset,
+    }
+
+    const jsonColumnInfos: JsonColumnInfo[] = []
+
+    let filterString = RawQueryParser.parseFilters(
+      filter,
+      OrganizationRepository.ORGANIZATION_QUERY_FILTER_COLUMN_MAP,
+      jsonColumnInfos,
+      params,
+    )
+
+    if (filterString.trim().length === 0) {
+      filterString = '1=1'
+    } else {
+      filterString = OrganizationRepository.replaceParametersWithDollarSign(filterString)
+    }
+
+    const query = `
+            with orgAggregates as (select memOrgs."organizationId",
+            count(actAgg.id)            as "memberCount",
+            SUM(actAgg."activityCount") as "activityCount"
+        from "memberActivityAggregatesMVs" actAgg
+              inner join "memberOrganizations" memOrgs on actAgg."id" = memOrgs."memberId"
+        group by memOrgs."organizationId")
+        select org.*,
+        oa."activityCount",
+        oa."memberCount"
+        from organizations as org
+        inner join orgAggregates oa on oa."organizationId" = org.id
+        where org."deletedAt" is null
+        and coalesce((org.attributes -> 'syncRemote' -> '${platform}')::boolean, false) = false 
+        and org."tenantId" = $(tenantId)
+        and ${filterString}
+        order by org.name desc
+        limit $(limit) offset $(offset);
+    `
+
+    this.log.trace({ query }, 'Generated sql query from advanced filters!')
+
+    const results = await this.db().any(query, params)
+
+    return results
+  }
+
+  public async findSyncRemoteById(syncRemoteId: string): Promise<IOrganizationSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `select * from "organizationsSyncRemote" where id = $(syncRemoteId)`,
+      { syncRemoteId },
+    )
+  }
+
+  public async setSyncRemoteSourceId(syncRemoteId: string, sourceId: string): Promise<void> {
+    this.log.debug(`Updating syncRemote ${syncRemoteId} sourceId to ${sourceId}.`)
+
+    await this.db().none(
+      `update "organizationsSyncRemote" set "sourceId" = $(sourceId) where id = $(syncRemoteId)`,
+      {
+        syncRemoteId,
+        sourceId,
+      },
+    )
+  }
+
+  public async setLastSyncedAtBySyncRemoteId(syncRemoteId: string): Promise<void> {
+    this.log.debug(`Setting lastSyncedAt for id ${syncRemoteId}.`)
+
+    await this.db().none(
+      `update "organizationsSyncRemote" set "lastSyncedAt" = now(), "status" = $(status) where id = $(syncRemoteId)`,
+      {
+        syncRemoteId,
+        status: SyncStatus.ACTIVE,
+      },
+    )
+  }
+
+  public async setLastSyncedAt(organizationId: string, integrationId: string): Promise<void> {
+    this.log.debug(
+      `Setting lastSyncedAt for organization ${organizationId} and integration ${integrationId} to now!`,
+    )
+
+    await this.db().none(
+      `update "organizationsSyncRemote" set "lastSyncedAt" = now(), "status" = $(status) where "organizationId" = $(organizationId) and "integrationId" = $(integrationId) and status <> $(neverStatus)`,
+      {
+        organizationId,
+        integrationId,
+        status: SyncStatus.ACTIVE,
+        neverStatus: SyncStatus.NEVER,
+      },
+    )
+  }
+
+  public async findSyncRemote(
+    organizationId: string,
+    integrationId: string,
+    syncFrom: string,
+  ): Promise<IOrganizationSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `select * from "organizationsSyncRemote" where "organizationId" = $(organizationId) and "integrationId" = $(integrationId) and "syncFrom" = $(syncFrom)`,
+      {
+        organizationId,
+        integrationId,
+        syncFrom,
+      },
+    )
+  }
+
+  public async findSyncRemoteByOrganizationId(
+    organizationId: string,
+  ): Promise<IOrganizationSyncRemoteData> {
+    return await this.db().oneOrNone(
+      `SELECT *
+      FROM "organizationsSyncRemote"
+      WHERE "organizationId" = $(organizationId)
+      and "sourceId" is not null
+      limit 1;`,
+      { organizationId },
+    )
+  }
+
+  public async markOrganizationForSyncing(
+    data: IOrganizationSyncRemoteData,
+  ): Promise<IOrganizationSyncRemoteData> {
+    const existingSyncRemote = await this.findSyncRemoteByOrganizationId(data.organizationId)
+
+    if (existingSyncRemote) {
+      data.sourceId = existingSyncRemote.sourceId
+    }
+
+    this.log.debug({ data }, 'Marking organization for sync! ')
+
+    const id = await this.db()
+      .one(
+        `insert into "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+      values
+          ($(id), $(organizationId), $(sourceId), $(integrationId), $(syncFrom), $(metaData), $(lastSyncedAt), $(status))
+      returning "id"
+    `,
+        {
+          id: uuid(),
+          organizationId: data.organizationId,
+          integrationId: data.integrationId,
+          syncFrom: data.syncFrom,
+          metaData: data.metaData || null,
+          lastSyncedAt: data.lastSyncedAt || null,
+          sourceId: data.sourceId || null,
+          status: SyncStatus.ACTIVE,
+        },
+      )
+      .then((data) => data.id)
+
+    this.log.debug(`Inserted organizationSyncRemote with id ${id}`)
+
+    return this.findSyncRemoteById(id)
+  }
 }
diff --git a/services/apps/integration_sync_worker/src/service/member.sync.service.ts b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
index 72eff6d4d6..23c56200e8 100644
--- a/services/apps/integration_sync_worker/src/service/member.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
@@ -40,15 +40,18 @@ export class MemberSyncService extends LoggerBase {
     tenantId: string,
     integrationId: string,
     memberId: string,
+    syncRemoteId: string,
   ): Promise<void> {
     const integration = await this.integrationRepo.findById(integrationId)
 
     const member = await this.memberRepo.findMember(memberId)
 
+    const syncRemote = await this.memberRepo.findSyncRemoteById(syncRemoteId)
+
     const membersToCreate = []
     const membersToUpdate = []
 
-    if (member.attributes?.sourceId?.[integration.platform]) {
+    if (syncRemote.sourceId) {
       membersToUpdate.push(member)
     } else {
       membersToCreate.push(member)
@@ -75,14 +78,11 @@ export class MemberSyncService extends LoggerBase {
         context,
       )
 
-      for (const newMember of newMembers as IBatchCreateMemberResult[]) {
-        await this.memberRepo.setIntegrationSourceId(
-          newMember.memberId,
-          integration.platform as PlatformType,
-          newMember.sourceId,
-        )
-        await this.searchSyncEmitter.triggerMemberSync(tenantId, newMember.memberId)
+      if (newMembers.length > 0) {
+        const memberCreated = newMembers[0] as IBatchCreateMemberResult
+        await this.memberRepo.setSyncRemoteSourceId(syncRemoteId, memberCreated.sourceId)
       }
+      await this.memberRepo.setLastSyncedAtBySyncRemoteId(syncRemoteId)
     } else {
       this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
     }
@@ -110,93 +110,74 @@ export class MemberSyncService extends LoggerBase {
       ...platforms,
     ])
 
-    // find all members that has attributes.syncRemote.[integration.platform] = true
-    const query = {
-      bool: {
-        must: [
-          {
-            term: {
-              [`uuid_tenantId`]: tenantId,
-            },
-          },
-          {
-            term: {
-              [`obj_attributes.obj_syncRemote.bool_${integration.platform}`]: true,
-            },
-          },
-        ],
-      },
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } as any
-
-    if (isMultiSegment) {
-      query.must.push({
-        term: {
-          uuid_segmentId: integration.segmentId,
-        },
-      })
-    }
-
     let markedMembers
-    let searchAfter
+    let offset
 
     do {
       const membersToCreate: IMember[] = []
       const membersToUpdate: IMember[] = []
-      searchAfter = markedMembers
-        ? markedMembers[markedMembers.length - 1]._source[`uuid_memberId`]
-        : undefined
-
-      markedMembers = (await this.openSearchService.search(
-        OpenSearchIndex.MEMBERS,
-        query,
-        undefined,
-        batchSize,
-        [
-          {
-            [`uuid_memberId`]: 'desc',
-          },
-        ],
-        searchAfter,
-      )) as ISearchHit<IMember>[]
 
-      const translatedMembers: IMember[] = markedMembers.reduce((acc, member) => {
-        const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
-        acc.push(membersWithCrowdFields)
-        return acc
-      }, [])
+      offset = markedMembers ? offset + batchSize : 0
+      markedMembers = await this.memberRepo.findMarkedMembers(integration.id, batchSize, offset)
 
-      while (translatedMembers.length > 0) {
-        const memberToSync = translatedMembers.shift()
+      while (markedMembers.length > 0) {
+        const memberToSync = markedMembers.shift()
 
-        this.log.trace(`Syncing member ${memberToSync.id} to ${integration.platform} remote!`)
+        this.log.trace(`Syncing member ${memberToSync.memberId} to ${integration.platform} remote!`)
 
-        const memberFromDb = await this.memberRepo.findMemberAttributes(memberToSync.id)
+        // find member in opensearch
+        const query = {
+          bool: {
+            must: [
+              {
+                term: {
+                  [`uuid_memberId`]: memberToSync.memberId,
+                },
+              },
+            ],
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any
 
-        // if sourceId doesn't exist in opensearch, but exists in db, use the sourceId in db and sync to opensearch again
-        if (
-          !memberToSync.attributes?.sourceId?.[integration.platform] &&
-          memberFromDb.attributes?.sourceId?.[integration.platform]
-        ) {
-          this.log.warn(
-            `${integration.platform} sourceId found in db but not in opensearch - using db value and sending trigger member sync to search-sync-worker!`,
-          )
-          if (memberToSync.attributes?.sourceId) {
-            memberToSync.attributes.sourceId[integration.platform] =
-              memberFromDb.attributes.sourceId[integration.platform]
-          } else {
-            memberToSync.attributes.sourceId = {
-              [integration.platform]: memberFromDb.attributes?.sourceId?.[integration.platform],
-            }
-          }
+        if (isMultiSegment) {
+          query.must.push({
+            term: {
+              uuid_segmentId: integration.segmentId,
+            },
+          })
+        }
 
-          await this.searchSyncEmitter.triggerMemberSync(tenantId, memberFromDb.id)
+        const memberFromOpensearch = (await this.openSearchService.search(
+          OpenSearchIndex.MEMBERS,
+          query,
+          undefined,
+          1,
+          undefined,
+          undefined,
+        )) as ISearchHit<IMember>[]
+
+        const translatedMembers: IMember[] = memberFromOpensearch.reduce((acc, member) => {
+          const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
+          acc.push(membersWithCrowdFields)
+          return acc
+        }, [])
+
+        if (translatedMembers.length !== 1) {
+          this.log.warn('Found more than one member matching the id from opensearch - exiting!')
+          return
         }
 
-        if (memberToSync.attributes?.sourceId?.[integration.platform]) {
-          membersToUpdate.push(memberToSync)
+        if (memberToSync.sourceId) {
+          // append sourceId to object - it'll be used for updating the remote counterpart
+          translatedMembers[0].attributes = {
+            ...translatedMembers[0].attributes,
+            sourceId: {
+              [integration.platform]: memberToSync.sourceId,
+            },
+          }
+          membersToUpdate.push(translatedMembers[0])
         } else {
-          membersToCreate.push(memberToSync)
+          membersToCreate.push(translatedMembers[0])
         }
       }
 
@@ -224,11 +205,14 @@ export class MemberSyncService extends LoggerBase {
         for (const newMember of newMembers as IBatchCreateMemberResult[]) {
           await this.memberRepo.setIntegrationSourceId(
             newMember.memberId,
-            integration.platform as PlatformType,
+            integration.id,
             newMember.sourceId,
           )
+          await this.memberRepo.setLastSyncedAt(newMember.memberId, integration.id)
+        }
 
-          await this.searchSyncEmitter.triggerMemberSync(tenantId, newMember.memberId)
+        for (const updatedMember of membersToUpdate) {
+          await this.memberRepo.setLastSyncedAt(updatedMember.id, integration.id)
         }
       } else {
         this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
@@ -236,7 +220,12 @@ export class MemberSyncService extends LoggerBase {
     } while (markedMembers.length > 0)
   }
 
-  public async syncAllFilteredMembers(tenantId: string, integrationId: string, automationId: string, batchSize: number = 50) {
+  public async syncAllFilteredMembers(
+    tenantId: string,
+    integrationId: string,
+    automationId: string,
+    batchSize = 50,
+  ) {
     const integration: IDbIntegration = await this.integrationRepo.findById(integrationId)
     const automation = await this.automationRepo.findById(automationId)
 
@@ -259,36 +248,39 @@ export class MemberSyncService extends LoggerBase {
       filter: automation.settings.filter,
       limit: batchSize,
       offset: 0,
-      orderBy: 'createdAt_DESC'
+      orderBy: 'createdAt_DESC',
     }
 
-    const parsed = OpensearchQueryParser.parse(
-      parseOptions,
-      OpenSearchIndex.MEMBERS,
-      translator,
-    )
+    const parsed = OpensearchQueryParser.parse(parseOptions, OpenSearchIndex.MEMBERS, translator)
 
     // only get members that aren't marked as sync yet
+    // parsed.query.bool.must.push({
+    //   bool: {
+    //     should: [
+    //       {
+    //         bool: {
+    //           must_not: {
+    //             exists: {
+    //               field: `obj_attributes.obj_syncRemote.bool_${integration.platform}`,
+    //             },
+    //           },
+    //         },
+    //       },
+    //       {
+    //         term: {
+    //           [`obj_attributes.obj_syncRemote.bool_${integration.platform}`]: false,
+    //         },
+    //       },
+    //     ],
+    //     minimum_should_match: 1,
+    //   },
+    // })
+
+    // add tenant filter
     parsed.query.bool.must.push({
-      bool: {
-        should: [
-          {
-            bool: {
-              must_not: {
-                exists: {
-                  field: `obj_attributes.obj_syncRemote.bool_${integration.platform}`
-                }
-              }
-            }
-          },
-          {
-            term: {
-              [`obj_attributes.obj_syncRemote.bool_${integration.platform}`]: false
-            }
-          }
-        ],
-        minimum_should_match: 1
-      }
+      term: {
+        [`uuid_tenantId`]: tenantId,
+      },
     })
 
     // discard team members, bots and organizations
@@ -299,31 +291,31 @@ export class MemberSyncService extends LoggerBase {
             bool: {
               must_not: {
                 term: {
-                  [`obj_attributes.obj_isTeamMember.bool_default`]: true
-                }
-              }
-            }
+                  [`obj_attributes.obj_isTeamMember.bool_default`]: true,
+                },
+              },
+            },
           },
           {
             bool: {
               must_not: {
                 term: {
-                  [`obj_attributes.obj_isBot.bool_default`]: true
-                }
-              }
-            }
+                  [`obj_attributes.obj_isBot.bool_default`]: true,
+                },
+              },
+            },
           },
           {
             bool: {
               must_not: {
                 term: {
-                  [`obj_attributes.obj_isOrganization.bool_default`]: true
-                }
-              }
-            }
+                  [`obj_attributes.obj_isOrganization.bool_default`]: true,
+                },
+              },
+            },
           },
         ],
-      }
+      },
     })
 
     if (isMultiSegment) {
@@ -337,7 +329,10 @@ export class MemberSyncService extends LoggerBase {
     let filteredMembers
     let offset
 
-    this.log.trace( { filter: automation.settings.filter }, 'Trying to sync members that conform to sent filter!')
+    this.log.trace(
+      { filter: automation.settings.filter },
+      'Trying to sync members that conform to sent filter!',
+    )
 
     do {
       const membersToCreate: IMember[] = []
@@ -348,46 +343,46 @@ export class MemberSyncService extends LoggerBase {
 
       filteredMembers = await this.openSearchService.client.search({
         index: OpenSearchIndex.MEMBERS,
-        body: parsed
+        body: parsed,
       })
 
-      this.log.trace("Found members: ")
+      this.log.trace('Found members: ')
       this.log.trace(filteredMembers)
-  
+
       const translatedMembers: IMember[] = filteredMembers.body.hits.hits.reduce((acc, member) => {
         const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
         acc.push(membersWithCrowdFields)
         return acc
       }, [])
-  
+
       while (translatedMembers.length > 0) {
         const memberToSync = translatedMembers.shift()
-  
+
         this.log.trace(`Syncing member ${memberToSync.id} to ${integration.platform} remote!`)
-  
-        const memberFromDb = await this.memberRepo.findMemberAttributes(memberToSync.id)
-  
-        // if sourceId doesn't exist in opensearch, but exists in db, use the sourceId in db and sync to opensearch again
-        if (
-          !memberToSync.attributes?.sourceId?.[integration.platform] &&
-          memberFromDb.attributes?.sourceId?.[integration.platform]
-        ) {
-          this.log.warn(
-            `${integration.platform} sourceId found in db but not in opensearch - using db value and sending trigger member sync to search-sync-worker!`,
-          )
-          if (memberToSync.attributes?.sourceId) {
-            memberToSync.attributes.sourceId[integration.platform] =
-              memberFromDb.attributes.sourceId[integration.platform]
-          } else {
-            memberToSync.attributes.sourceId = {
-              [integration.platform]: memberFromDb.attributes?.sourceId?.[integration.platform],
-            }
-          }
-  
-          await this.searchSyncEmitter.triggerMemberSync(tenantId, memberFromDb.id)
+
+        let syncRemote = await this.memberRepo.findSyncRemote(
+          memberToSync.id,
+          integration.id,
+          automation.id,
+        )
+
+        // member isn't marked yet, mark it
+        if (!syncRemote) {
+          syncRemote = await this.memberRepo.markMemberForSyncing({
+            integrationId: integration.id,
+            memberId: memberToSync.id,
+            metaData: null,
+            syncFrom: automation.id,
+          })
         }
-  
-        if (memberToSync.attributes?.sourceId?.[integration.platform]) {
+
+        if (syncRemote.sourceId) {
+          memberToSync.attributes = {
+            ...memberToSync.attributes,
+            sourceId: {
+              [integration.platform]: syncRemote.sourceId,
+            },
+          }
           membersToUpdate.push(memberToSync)
         } else {
           membersToCreate.push(memberToSync)
@@ -419,17 +414,118 @@ export class MemberSyncService extends LoggerBase {
         for (const newMember of newMembers as IBatchCreateMemberResult[]) {
           await this.memberRepo.setIntegrationSourceId(
             newMember.memberId,
-            integration.platform as PlatformType,
+            integration.id,
             newMember.sourceId,
           )
 
-          await this.searchSyncEmitter.triggerMemberSync(tenantId, newMember.memberId)
+          await this.memberRepo.setLastSyncedAt(newMember.memberId, integration.id)
+        }
+
+        for (const updatedMember of membersToUpdate) {
+          await this.memberRepo.setLastSyncedAt(updatedMember.id, integration.id)
         }
       } else {
         this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
       }
+    } while (filteredMembers.length > 0)
+  }
 
+  public async syncOrganizationMembers(
+    tenantId: string,
+    integrationId: string,
+    automationId: string,
+    organizationId: string,
+    batchSize = 100,
+  ) {
+    const integration: IDbIntegration = await this.integrationRepo.findById(integrationId)
 
-    } while (filteredMembers.length > 0)
+    const automation = await this.automationRepo.findById(automationId)
+
+    let organizationMembers
+    let offset
+
+    do {
+      const membersToCreate: IMember[] = []
+      const membersToUpdate: IMember[] = []
+
+      offset = organizationMembers ? offset + batchSize : 0
+      organizationMembers = await this.memberRepo.findOrganizationMembers(
+        organizationId,
+        batchSize,
+        offset,
+      )
+
+      while (organizationMembers.length > 0) {
+        const memberToSync = organizationMembers.shift()
+
+        this.log.trace(`Syncing member ${memberToSync.memberId} to ${integration.platform} remote!`)
+        const member = await this.memberRepo.findMember(memberToSync.memberId)
+
+        let syncRemote = await this.memberRepo.findSyncRemote(
+          member.id,
+          integration.id,
+          automation.id,
+        )
+
+        // member isn't marked yet, mark it
+        if (!syncRemote) {
+          syncRemote = await this.memberRepo.markMemberForSyncing({
+            integrationId: integration.id,
+            memberId: member.id,
+            metaData: null,
+            syncFrom: automation.id,
+          })
+        }
+
+        if (syncRemote.sourceId) {
+          member.attributes = {
+            ...member.attributes,
+            sourceId: {
+              [integration.platform]: syncRemote.sourceId,
+            },
+          }
+          membersToUpdate.push(member)
+        } else {
+          membersToCreate.push(member)
+        }
+      }
+
+      const service = singleOrDefault(INTEGRATION_SERVICES, (s) => s.type === integration.platform)
+
+      if (service.processSyncRemote) {
+        const context: IIntegrationProcessRemoteSyncContext = {
+          integration,
+          log: this.log,
+          serviceSettings: {
+            nangoId: `${tenantId}-${integration.platform}`,
+            nangoUrl: NANGO_CONFIG().url,
+            nangoSecretKey: NANGO_CONFIG().secretKey,
+          },
+          tenantId,
+        }
+
+        const newMembers = await service.processSyncRemote<IMember>(
+          membersToCreate,
+          membersToUpdate,
+          Entity.MEMBERS,
+          context,
+        )
+
+        for (const newMember of newMembers as IBatchCreateMemberResult[]) {
+          await this.memberRepo.setIntegrationSourceId(
+            newMember.memberId,
+            integration.id,
+            newMember.sourceId,
+          )
+          await this.memberRepo.setLastSyncedAt(newMember.memberId, integration.id)
+        }
+
+        for (const updatedMember of membersToUpdate) {
+          await this.memberRepo.setLastSyncedAt(updatedMember.id, integration.id)
+        }
+      } else {
+        this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
+      }
+    } while (organizationMembers.length > 0)
   }
 }
diff --git a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
index a5566e9d7d..62d2406db0 100644
--- a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
@@ -1,41 +1,48 @@
-import { NANGO_CONFIG, SERVICE_CONFIG } from '@/conf'
-import { Edition, Entity, IOrganization, PlatformType } from '@crowd/types'
+import { NANGO_CONFIG } from '@/conf'
+import { Entity, IOrganization, IOrganizationSyncRemoteData } from '@crowd/types'
 import { singleOrDefault } from '@crowd/common'
 import { DbStore } from '@crowd/database'
 import { Logger, LoggerBase } from '@crowd/logging'
 import { IntegrationRepository } from '@/repo/integration.repo'
 import {
+  IBatchCreateMemberResult,
   IBatchCreateOrganizationsResult,
   IIntegrationProcessRemoteSyncContext,
   INTEGRATION_SERVICES,
 } from '@crowd/integrations'
 import { OrganizationRepository } from '@/repo/organization.repo'
 import { IDbIntegration } from '@/repo/integration.data'
+import { AutomationRepository } from '@/repo/automation.repo'
 
 export class OrganizationSyncService extends LoggerBase {
   private readonly organizationRepo: OrganizationRepository
   private readonly integrationRepo: IntegrationRepository
+  private readonly automationRepo: AutomationRepository
 
   constructor(store: DbStore, parentLog: Logger) {
     super(parentLog)
 
     this.integrationRepo = new IntegrationRepository(store, this.log)
     this.organizationRepo = new OrganizationRepository(store, this.log)
+    this.automationRepo = new AutomationRepository(store, this.log)
   }
 
   public async syncOrganization(
     tenantId: string,
     integrationId: string,
     organizationId: string,
+    syncRemoteId: string,
   ): Promise<void> {
     const integration = await this.integrationRepo.findById(integrationId)
 
     const organization = await this.organizationRepo.findOrganization(organizationId, tenantId)
 
+    const syncRemote = await this.organizationRepo.findSyncRemoteById(syncRemoteId)
+
     const oranizationsToCreate = []
     const organizationsToUpdate = []
 
-    if (organization.attributes?.sourceId?.[integration.platform]) {
+    if (syncRemote.sourceId) {
       organizationsToUpdate.push(organization)
     } else {
       oranizationsToCreate.push(organization)
@@ -62,13 +69,11 @@ export class OrganizationSyncService extends LoggerBase {
         context,
       )
 
-      for (const newOrganization of newOrganizations as IBatchCreateOrganizationsResult[]) {
-        await this.organizationRepo.setIntegrationSourceId(
-          newOrganization.organizationId,
-          integration.platform as PlatformType,
-          newOrganization.sourceId,
-        )
+      if (newOrganizations.length > 0) {
+        const orgCreated = newOrganizations[0] as IBatchCreateMemberResult
+        await this.organizationRepo.setSyncRemoteSourceId(syncRemoteId, orgCreated.sourceId)
       }
+      await this.organizationRepo.setLastSyncedAtBySyncRemoteId(syncRemoteId)
     } else {
       this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
     }
@@ -81,11 +86,7 @@ export class OrganizationSyncService extends LoggerBase {
   ): Promise<void> {
     const integration: IDbIntegration = await this.integrationRepo.findById(integrationId)
 
-    const isMultiSegment = SERVICE_CONFIG().edition === Edition.LFX
-
-    const segmentId = isMultiSegment ? integration.segmentId : undefined
-
-    let markedOrganizations
+    let markedOrganizations: IOrganizationSyncRemoteData[]
     let offset
 
     do {
@@ -95,9 +96,7 @@ export class OrganizationSyncService extends LoggerBase {
       offset = markedOrganizations ? offset + batchSize : 0
 
       markedOrganizations = await this.organizationRepo.findMarkedOrganizations(
-        tenantId,
-        integration.platform as PlatformType,
-        segmentId,
+        integration.id,
         batchSize,
         offset,
       )
@@ -112,7 +111,14 @@ export class OrganizationSyncService extends LoggerBase {
           tenantId,
         )
 
-        if (organization.attributes?.sourceId?.[integration.platform]) {
+        if (organizationToSync.sourceId) {
+          // append sourceId to object - it'll be used for updating the remote counterpart
+          organization.attributes = {
+            ...organization.attributes,
+            sourceId: {
+              [integration.platform]: organizationToSync.sourceId,
+            },
+          }
           organizationsToUpdate.push(organization)
         } else {
           organizationsToCreate.push(organization)
@@ -143,13 +149,142 @@ export class OrganizationSyncService extends LoggerBase {
         for (const newOrganization of newOrganizations as IBatchCreateOrganizationsResult[]) {
           await this.organizationRepo.setIntegrationSourceId(
             newOrganization.organizationId,
-            integration.platform as PlatformType,
+            integration.id,
             newOrganization.sourceId,
           )
+
+          await this.organizationRepo.setLastSyncedAt(
+            newOrganization.organizationId,
+            integration.id,
+          )
+        }
+
+        for (const updatedOrganization of organizationsToUpdate) {
+          await this.organizationRepo.setLastSyncedAt(updatedOrganization.id, integration.id)
         }
       } else {
         this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
       }
     } while (markedOrganizations.length > 0)
   }
+
+  public async syncAllFilteredOrganizations(
+    tenantId: string,
+    integrationId: string,
+    automationId: string,
+    batchSize = 50,
+  ) {
+    const integration: IDbIntegration = await this.integrationRepo.findById(integrationId)
+    const automation = await this.automationRepo.findById(automationId)
+
+    const syncOrganizationMembers = automation.settings?.syncCompanyContacts === true
+
+    const organizationsIdsSyncedToReturn = []
+
+    let filteredOrganizations
+    let offset
+
+    do {
+      const organizationsToCreate: IOrganization[] = []
+      const organizationsToUpdate: IOrganization[] = []
+
+      offset = filteredOrganizations ? offset + batchSize : 0
+
+      filteredOrganizations = await this.organizationRepo.findFilteredOrganizations(
+        tenantId,
+        [integration.segmentId],
+        integration.platform,
+        automation.settings.filter,
+        batchSize,
+        offset,
+      )
+
+      for (const organizationToSync of filteredOrganizations) {
+        this.log.trace(
+          `Syncing organization ${organizationToSync.id} to ${integration.platform} remote!`,
+        )
+
+        let syncRemote = await this.organizationRepo.findSyncRemote(
+          organizationToSync.id,
+          integration.id,
+          automation.id,
+        )
+
+        // member isn't marked yet, mark it
+        if (!syncRemote) {
+          syncRemote = await this.organizationRepo.markOrganizationForSyncing({
+            integrationId: integration.id,
+            organizationId: organizationToSync.id,
+            metaData: null,
+            syncFrom: automation.id,
+          })
+        }
+
+        const organization = await this.organizationRepo.findOrganization(
+          organizationToSync.id,
+          tenantId,
+        )
+
+        if (syncRemote.sourceId) {
+          organization.attributes = {
+            ...organization.attributes,
+            sourceId: {
+              [integration.platform]: syncRemote.sourceId,
+            },
+          }
+          organizationsToUpdate.push(organization)
+        } else {
+          organizationsToCreate.push(organization)
+        }
+      }
+
+      const service = singleOrDefault(INTEGRATION_SERVICES, (s) => s.type === integration.platform)
+
+      if (service.processSyncRemote) {
+        const context: IIntegrationProcessRemoteSyncContext = {
+          integration,
+          log: this.log,
+          serviceSettings: {
+            nangoId: `${tenantId}-${integration.platform}`,
+            nangoUrl: NANGO_CONFIG().url,
+            nangoSecretKey: NANGO_CONFIG().secretKey,
+          },
+          tenantId,
+        }
+
+        const newOrganizations = await service.processSyncRemote<IOrganization>(
+          organizationsToCreate,
+          organizationsToUpdate,
+          Entity.ORGANIZATIONS,
+          context,
+        )
+
+        for (const newOrganization of newOrganizations as IBatchCreateOrganizationsResult[]) {
+          await this.organizationRepo.setIntegrationSourceId(
+            newOrganization.organizationId,
+            integration.id,
+            newOrganization.sourceId,
+          )
+
+          await this.organizationRepo.setLastSyncedAt(
+            newOrganization.organizationId,
+            integration.id,
+          )
+        }
+
+        for (const updatedOrganization of organizationsToUpdate) {
+          await this.organizationRepo.setLastSyncedAt(updatedOrganization.id, integration.id)
+        }
+
+        if (syncOrganizationMembers) {
+          organizationsIdsSyncedToReturn.push(...organizationsToCreate.map((o) => o.id))
+          organizationsIdsSyncedToReturn.push(...organizationsToUpdate.map((o) => o.id))
+        }
+      } else {
+        this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
+      }
+    } while (filteredOrganizations.length > 0)
+
+    return syncOrganizationMembers ? organizationsIdsSyncedToReturn : []
+  }
 }
diff --git a/services/libs/common/package-lock.json b/services/libs/common/package-lock.json
index 32de5e69ec..1e9f036d96 100644
--- a/services/libs/common/package-lock.json
+++ b/services/libs/common/package-lock.json
@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@crowd/logging": "file:../logging",
+        "@crowd/types": "file:../types",
         "uuid": "^9.0.0"
       },
       "devDependencies": {
@@ -43,6 +44,19 @@
         "typescript": "^5.0.4"
       }
     },
+    "../types": {
+      "version": "1.0.0",
+      "devDependencies": {
+        "@types/node": "^18.16.3",
+        "@typescript-eslint/eslint-plugin": "^5.59.2",
+        "@typescript-eslint/parser": "^5.59.2",
+        "eslint": "^8.39.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.8.8",
+        "typescript": "^5.0.4"
+      }
+    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@@ -56,6 +70,10 @@
       "resolved": "../logging",
       "link": true
     },
+    "node_modules/@crowd/types": {
+      "resolved": "../types",
+      "link": true
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -1728,6 +1746,19 @@
         "typescript": "^5.0.4"
       }
     },
+    "@crowd/types": {
+      "version": "file:../types",
+      "requires": {
+        "@types/node": "^18.16.3",
+        "@typescript-eslint/eslint-plugin": "^5.59.2",
+        "@typescript-eslint/parser": "^5.59.2",
+        "eslint": "^8.39.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.8.8",
+        "typescript": "^5.0.4"
+      }
+    },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
diff --git a/services/libs/common/package.json b/services/libs/common/package.json
index 9638842d5a..7e15b3f3d4 100644
--- a/services/libs/common/package.json
+++ b/services/libs/common/package.json
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@crowd/logging": "file:../logging",
+    "@crowd/types": "file:../types",
     "uuid": "^9.0.0"
   }
 }
diff --git a/services/libs/common/src/index.ts b/services/libs/common/src/index.ts
index f5f26e6d8b..a1f5a4a22a 100644
--- a/services/libs/common/src/index.ts
+++ b/services/libs/common/src/index.ts
@@ -8,3 +8,4 @@ export * from './validations'
 export * from './strings'
 export * from './types'
 export * from './requestThrottler'
+export * from './rawQueryParser'
diff --git a/services/libs/common/src/rawQueryParser.ts b/services/libs/common/src/rawQueryParser.ts
new file mode 100644
index 0000000000..1393df3901
--- /dev/null
+++ b/services/libs/common/src/rawQueryParser.ts
@@ -0,0 +1,354 @@
+import { MemberAttributeType } from '@crowd/types'
+import { JsonColumnInfo, Operator, ParsedJsonColumn } from '@crowd/types'
+import { singleOrDefault } from './array'
+
+export class RawQueryParser {
+  public static parseFilters(
+    filters: any,
+    columnMap: Map<string, string>,
+    jsonColumnInfos: JsonColumnInfo[],
+    params: any,
+  ): string {
+    const keys = Object.keys(filters)
+    if (keys.length === 0) {
+      return '(1=1)'
+    }
+
+    const results = []
+
+    for (const key of keys) {
+      if (this.isOperator(key)) {
+        const operands = []
+        for (const operand of filters[key]) {
+          operands.push(this.parseFilters(operand, columnMap, jsonColumnInfos, params))
+        }
+
+        const condition = operands.join(` ${key} `)
+        results.push(`(${condition})`)
+      } else if (key === Operator.NOT) {
+        const condition = this.parseFilters(filters[key], columnMap, jsonColumnInfos, params)
+        results.push(`(not ${condition})`)
+      } else {
+        const jsonColumnInfo = this.getJsonColumnInfo(key, jsonColumnInfos)
+
+        if (jsonColumnInfo === undefined && !columnMap.has(key)) {
+          throw new Error(`Unknown filter key: ${key}!`)
+        }
+
+        if (jsonColumnInfo) {
+          results.push(this.parseJsonColumnCondition(jsonColumnInfo, filters[key], params))
+        } else {
+          results.push(this.parseColumnCondition(key, columnMap.get(key), filters[key], params))
+        }
+      }
+    }
+
+    return results.join(' and ')
+  }
+
+  private static parseJsonColumnCondition(
+    property: ParsedJsonColumn,
+    filters: any,
+    params: any,
+  ): string {
+    const parts = property.parts.slice(1)
+
+    let jsonColumn: string
+    if (parts.length > 0) {
+      const attribute = parts[0]
+      const attributeInfo = singleOrDefault(
+        property.info.attributeInfos,
+        (a) => a.name === attribute,
+      )
+      if (attributeInfo === undefined) {
+        throw new Error(`Unknown ${property.info.property} attribute: ${attribute}!`)
+      }
+
+      const isText = this.isJsonPropertyText(attributeInfo.type)
+
+      let nestedProperty = ''
+      for (let i = 0; i < parts.length; i++) {
+        const part = parts[i]
+
+        if (isText && i === parts.length - 1) {
+          nestedProperty += ` ->> '${part}'`
+        } else {
+          nestedProperty += ` -> '${part}'`
+        }
+      }
+      jsonColumn = `(${property.info.column}${nestedProperty})`
+
+      if (attributeInfo.type === MemberAttributeType.BOOLEAN) {
+        jsonColumn = `${jsonColumn}::boolean`
+      } else if (attributeInfo.type === MemberAttributeType.NUMBER) {
+        jsonColumn = `${jsonColumn}::integer`
+      } else if (attributeInfo.type === MemberAttributeType.DATE) {
+        jsonColumn = `${jsonColumn}::timestamptz`
+      }
+    } else {
+      jsonColumn = `(${property.info.column})`
+    }
+
+    let value
+    let operator: Operator
+
+    if (Array.isArray(filters)) {
+      operator = Operator.CONTAINS
+      value = filters
+    } else {
+      const conditionKeys = Object.keys(filters)
+      if (conditionKeys.length !== 1) {
+        throw new Error(`Invalid condition! ${JSON.stringify(filters, undefined, 2)}`)
+      }
+
+      operator = conditionKeys[0] as Operator
+      value = filters[operator]
+    }
+
+    const actualOperator = this.getOperator(operator, true)
+
+    if (operator === Operator.BETWEEN || operator === Operator.NOT_BETWEEN) {
+      // we need two values
+      const firstParamName = this.getJsonParamName(property.info.property, parts, params)
+      params[firstParamName] = value[0]
+
+      const secondParamName = this.getJsonParamName(property.info.property, parts, params)
+      params[secondParamName] = value[1]
+
+      return `(${jsonColumn} ${actualOperator} :${firstParamName} and :${secondParamName})`
+    }
+    if (operator === Operator.CONTAINS || operator === Operator.OVERLAP) {
+      // we need an array of values
+      const paramNames: string[] = []
+
+      for (const val of value) {
+        const paramName = this.getJsonParamName(property.info.property, parts, params)
+        params[paramName] = val
+        paramNames.push(`:${paramName}`)
+      }
+
+      const paramNamesString = paramNames.join(', ')
+      return `(${jsonColumn} ${actualOperator} array[${paramNamesString}])`
+    }
+    if (operator === Operator.IN || operator === Operator.NOT_IN) {
+      // we need a list of values
+      const paramNames: string[] = []
+
+      for (const val of value) {
+        const paramName = this.getJsonParamName(property.info.property, parts, params)
+        params[paramName] = val
+        paramNames.push(`:${paramName}`)
+      }
+
+      const paramNamesString = paramNames.join(', ')
+      return `(${jsonColumn} ${actualOperator} (${paramNamesString}))`
+    }
+    const paramName = this.getJsonParamName(property.info.property, parts, params)
+    if (operator === Operator.LIKE || operator === Operator.NOT_LIKE) {
+      params[paramName] = `%${value}%`
+    } else {
+      params[paramName] = value
+    }
+
+    return `(${jsonColumn} ${actualOperator} :${paramName})`
+  }
+
+  private static parseColumnCondition(
+    key: string,
+    column: string,
+    filters: any,
+    params: any,
+  ): string {
+    const conditionKeys = Object.keys(filters)
+    if (conditionKeys.length !== 1) {
+      throw new Error(`Invalid condition! ${JSON.stringify(filters, undefined, 2)}`)
+    }
+
+    const operator = conditionKeys[0] as Operator
+    const actualOperator = this.getOperator(operator)
+    const value = filters[operator]
+
+    if (operator === Operator.BETWEEN || operator === Operator.NOT_BETWEEN) {
+      // we need two values
+      const firstParamName = this.getParamName(key, params)
+      params[firstParamName] = value[0]
+
+      const secondParamName = this.getParamName(key, params)
+      params[secondParamName] = value[1]
+
+      return `(${column} ${actualOperator} :${firstParamName} and :${secondParamName})`
+    }
+    if (operator === Operator.CONTAINS || operator === Operator.OVERLAP) {
+      // we need an array of values
+      const paramNames: string[] = []
+
+      for (const val of value) {
+        const paramName = this.getParamName(key, params)
+        params[paramName] = val
+        paramNames.push(`:${paramName}`)
+      }
+
+      const paramNamesString = paramNames.join(', ')
+      return `(${column} ${actualOperator} array[${paramNamesString}])`
+    }
+    if (operator === Operator.IN || operator === Operator.NOT_IN) {
+      // we need a list of values
+      const paramNames: string[] = []
+
+      for (const val of value) {
+        const paramName = this.getParamName(key, params)
+        params[paramName] = val
+        paramNames.push(`:${paramName}`)
+      }
+
+      const paramNamesString = paramNames.join(', ')
+      return `(${column} ${actualOperator} (${paramNamesString}))`
+    }
+
+    const paramName = this.getParamName(key, params)
+
+    if (
+      operator === Operator.EQUAL &&
+      (value === null || (typeof value === 'string' && value.toLowerCase() === 'null'))
+    ) {
+      params[paramName] = null
+      return `(${column} is :${paramName})`
+    }
+
+    if (
+      operator === Operator.NOT_EQUAL &&
+      (value === null || (typeof value === 'string' && value.toLowerCase() === 'null'))
+    ) {
+      params[paramName] = null
+      return `(${column} is not :${paramName})`
+    }
+
+    if (
+      operator === Operator.LIKE ||
+      operator === Operator.NOT_LIKE ||
+      operator === Operator.TEXT_CONTAINS ||
+      operator === Operator.NOT_TEXT_CONTAINS
+    ) {
+      params[paramName] = `%${value}%`
+    } else {
+      params[paramName] = value
+    }
+
+    return `(${column} ${actualOperator} :${paramName})`
+  }
+
+  private static getJsonColumnInfo(
+    column: string,
+    jsonColumnInfos: JsonColumnInfo[],
+  ): ParsedJsonColumn | undefined {
+    const parts = column.split('.')
+
+    const actualProperty = parts[0]
+    const info = singleOrDefault(
+      jsonColumnInfos,
+      (jsonColumnInfo) => jsonColumnInfo.property === actualProperty,
+    )
+
+    if (info) {
+      return {
+        info,
+        parts,
+      }
+    }
+
+    return undefined
+  }
+
+  private static getOperator(operator: Operator, json = false): string {
+    switch (operator) {
+      case Operator.GREATER_THAN:
+        return '>'
+      case Operator.GREATER_THAN_OR_EQUAL:
+        return '>='
+      case Operator.LESS_THAN:
+        return '<'
+      case Operator.LESS_THAN_OR_EQUAL:
+        return '<='
+      case Operator.NOT_EQUAL:
+      case Operator.NOT:
+        return '<>'
+      case Operator.EQUAL:
+        return '='
+      case Operator.LIKE:
+      case Operator.TEXT_CONTAINS:
+        return 'ilike'
+      case Operator.NOT_LIKE:
+      case Operator.NOT_TEXT_CONTAINS:
+        return 'not ilike'
+      case Operator.AND:
+        return 'and'
+      case Operator.OR:
+        return 'or'
+      case Operator.IN:
+        return 'in'
+      case Operator.NOT_IN:
+        return 'not in'
+      case Operator.BETWEEN:
+        return 'between'
+      case Operator.NOT_BETWEEN:
+        return 'not between'
+      case Operator.OVERLAP:
+        if (json) {
+          return '?|'
+        }
+        return '&&'
+      case Operator.CONTAINS:
+        if (json) {
+          return '?&'
+        }
+        return '@>'
+
+      default:
+        throw new Error(`Unknown operator: ${operator}!`)
+    }
+  }
+
+  private static isJsonPropertyText(type: MemberAttributeType): boolean {
+    return (
+      type === MemberAttributeType.STRING ||
+      type === MemberAttributeType.EMAIL ||
+      type === MemberAttributeType.URL
+    )
+  }
+
+  private static getParamName(column: string, params: any): string {
+    let index = 1
+    let value = params[`${column}_${index}`]
+
+    while (value !== undefined) {
+      index++
+      value = params[`${column}_${index}`]
+    }
+
+    return `${column}_${index}`
+  }
+
+  private static getJsonParamName(column: string, parts: string[], params: any): string {
+    let index = 1
+
+    let key: string
+    if (parts.length > 0) {
+      key = `${column}_${parts.join('_')}`
+    } else {
+      key = column
+    }
+
+    let value = params[`${key}_${index}`]
+    while (value !== undefined) {
+      index++
+      value = params[`${key}_${index}`]
+    }
+
+    return `${key}_${index}`
+  }
+
+  private static isOperator(opOrCondition: any): boolean {
+    const lower = opOrCondition.toLowerCase().trim()
+    return lower === 'and' || lower === 'or'
+  }
+}
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
index 8b62c79421..71fbda2ae6 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
@@ -6,6 +6,8 @@ import { IMember, PlatformType } from '@crowd/types'
 import { RequestThrottler } from '@crowd/common'
 import { HubspotMemberFieldMapper } from '../field-mapper/memberFieldMapper'
 import { IBatchCreateMemberResult } from './types'
+import { batchUpdateMembers } from './batchUpdateMembers'
+import { getContactById } from './contactById'
 
 export const batchCreateMembers = async (
   nangoId: string,
@@ -101,7 +103,43 @@ export const batchCreateMembers = async (
       return acc
     }, [])
   } catch (err) {
-    ctx.log.error({ err }, 'Error while batch create contacts to HubSpot')
-    throw err
+    // this means that member actually exists in hubspot but we tried re-creating it
+    // handle it gracefully
+    if (err.response?.data?.category === 'CONFLICT') {
+      ctx.log.warn(
+        { err },
+        'Conflict while batch create contacts in HubSpot. Trying to resolve the conflicts...',
+      )
+      const match = err.response?.data?.message.match(/ID: (\d+)/)
+      const id = match ? match[1] : null
+      if (id) {
+        const member = await getContactById(nangoId, id, memberMapper, ctx, throttler)
+
+        if (member) {
+          // exclude found member from batch payload
+          const createMembers = members.filter(
+            (m) => !m.emails.includes((member.properties as any).crowd_emails),
+          )
+
+          const updateMembers = members
+            .filter((m) => m.emails.includes((member.properties as any).crowd_emails))
+            .map((m) => {
+              m.attributes = {
+                ...m.attributes,
+                sourceId: {
+                  hubspot: id,
+                },
+              }
+              return m
+            })
+
+          await batchUpdateMembers(nangoId, updateMembers, memberMapper, ctx, throttler)
+          return await batchCreateMembers(nangoId, createMembers, memberMapper, ctx, throttler)
+        }
+      }
+    } else {
+      ctx.log.error({ err }, 'Error while batch create contacts to HubSpot')
+      throw err
+    }
   }
 }
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
index 376f9bb2c8..ac088c33e4 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
@@ -7,6 +7,8 @@ import { RequestThrottler } from '@crowd/common'
 import { HubspotOrganizationFieldMapper } from '../field-mapper/organizationFieldMapper'
 import { getOrganizationDomain } from './utils/getOrganizationDomain'
 import { IBatchCreateOrganizationsResult } from './types'
+import { getCompanyById } from './companyById'
+import { batchUpdateOrganizations } from './batchUpdateOrganizations'
 
 export const batchCreateOrganizations = async (
   nangoId: string,
@@ -90,7 +92,55 @@ export const batchCreateOrganizations = async (
       return acc
     }, [])
   } catch (err) {
-    ctx.log.error({ err }, 'Error while batch create companies in HubSpot!')
-    throw err
+    // this means that organization actually exists in hubspot but we tried re-creating it
+    // handle it gracefully
+    if (err.response?.data?.category === 'CONFLICT') {
+      ctx.log.warn(
+        { err },
+        'Conflict while batch create companies in HubSpot. Trying to resolve the conflicts...',
+      )
+      const match = err.response?.data?.message.match(/ID: (\d+)/)
+      const id = match ? match[1] : null
+      if (id) {
+        const organization = await getCompanyById(nangoId, id, organizationMapper, ctx, throttler)
+
+        if (organization) {
+          // exclude found organization from batch payload
+          const createOrganizations = organizations.filter(
+            (o) => !o.website.includes((organization.properties as any).domain),
+          )
+
+          const updateOrganizations = organizations
+            .filter((o) => o.website.includes((organization.properties as any).domain))
+            .map((o) => {
+              o.attributes = {
+                ...o.attributes,
+                sourceId: {
+                  hubspot: id,
+                },
+              }
+              return o
+            })
+
+          await batchUpdateOrganizations(
+            nangoId,
+            updateOrganizations,
+            organizationMapper,
+            ctx,
+            throttler,
+          )
+          return await batchCreateOrganizations(
+            nangoId,
+            createOrganizations,
+            organizationMapper,
+            ctx,
+            throttler,
+          )
+        }
+      }
+    } else {
+      ctx.log.error({ err }, 'Error while batch create companies to HubSpot')
+      throw err
+    }
   }
 }
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/contactById.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/contactById.ts
new file mode 100644
index 0000000000..e4880fde4e
--- /dev/null
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/contactById.ts
@@ -0,0 +1,50 @@
+import { IGenerateStreamsContext, IProcessStreamContext } from '@/types'
+import { IHubspotObject } from '../types'
+import axios, { AxiosRequestConfig } from 'axios'
+import { getNangoToken } from './../../../nango'
+import { PlatformType } from '@crowd/types'
+import { RequestThrottler } from '@crowd/common'
+import { HubspotMemberFieldMapper } from '../field-mapper/memberFieldMapper'
+
+export const getContactById = async (
+  nangoId: string,
+  contactId: string,
+  memberMapper: HubspotMemberFieldMapper,
+  ctx: IProcessStreamContext | IGenerateStreamsContext,
+  throttler: RequestThrottler,
+): Promise<IHubspotObject> => {
+  const config: AxiosRequestConfig<unknown> = {
+    method: 'get',
+    url: `https://api.hubapi.com/crm/v3/objects/contacts/${contactId}`,
+    params: {
+      limit: 1,
+      properties: `email,${memberMapper.getAllHubspotFields().join(',')}`,
+    },
+    headers: {
+      Authorization: '',
+    },
+  }
+
+  try {
+    ctx.log.debug({ nangoId, contactId }, 'Fetching contact by id from HubSpot')
+
+    // Get an access token from Nango
+    const accessToken = await getNangoToken(nangoId, PlatformType.HUBSPOT, ctx)
+
+    ctx.log.debug({ accessToken }, `nango token`)
+    config.headers.Authorization = `Bearer ${accessToken}`
+
+    const result = await throttler.throttle(() => axios(config))
+
+    const element = result.data
+
+    if (!element) {
+      return null
+    }
+
+    return element
+  } catch (err) {
+    ctx.log.error({ err }, 'Error while fetching contacts from HubSpot')
+    throw err
+  }
+}
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/index.ts b/services/libs/integrations/src/integrations/premium/hubspot/index.ts
index cedcce945b..32bf4227c3 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/index.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/index.ts
@@ -9,7 +9,8 @@ import { HUBSPOT_MEMBER_ATTRIBUTES } from './memberAttributes'
 const descriptor: IIntegrationDescriptor = {
   type: 'hubspot',
   memberAttributes: HUBSPOT_MEMBER_ATTRIBUTES,
-  checkEvery: 8 * 60, // 8 hours
+  // checkEvery: 8 * 60, // 8 hours
+  checkEvery: 2,
   generateStreams,
   processStream,
   processData,
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts b/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
index be42e74c04..7e6c360e2c 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/processSyncRemote.ts
@@ -39,7 +39,7 @@ const handler: ProcessIntegrationSyncHandler = async <T>(
 
   switch (entity) {
     case Entity.MEMBERS: {
-      let membersCreatedInHubspot
+      let membersCreatedInHubspot = []
 
       const memberMapper = HubspotFieldMapperFactory.getFieldMapper(
         HubspotEntity.MEMBERS,
@@ -73,7 +73,10 @@ const handler: ProcessIntegrationSyncHandler = async <T>(
       }
 
       // we should also add members to hubspot lists, if it's coming from an automation
-      if (ctx.automation.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH) {
+      if (
+        ctx.automation &&
+        ctx.automation.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH
+      ) {
         const vids: string[] = [
           ...membersCreatedInHubspot.map((m) => m.sourceId),
           ...(toUpdate as IMember[]).map((m) => m.attributes.sourceId.hubspot),
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts b/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
index 6da0db2aa3..1b92718ba9 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/startSyncRemote.ts
@@ -1,6 +1,6 @@
 import { StartIntegrationSyncHandler } from '@/types'
 import { HubspotEntity, IHubspotIntegrationSettings } from './types'
-import { AutomationSyncTrigger } from '@crowd/types'
+import { AutomationState, AutomationSyncTrigger } from '@crowd/types'
 
 const handler: StartIntegrationSyncHandler = async (ctx) => {
   const settings = ctx.integration.settings as IHubspotIntegrationSettings
@@ -12,7 +12,9 @@ const handler: StartIntegrationSyncHandler = async (ctx) => {
     )
 
     const memberSyncAutomations = ctx.automations.filter(
-      (a) => a.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
+      (a) =>
+        a.trigger === AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH &&
+        a.state === AutomationState.ACTIVE,
     )
 
     // sync filter automations
@@ -34,7 +36,9 @@ const handler: StartIntegrationSyncHandler = async (ctx) => {
     )
 
     const organizationSyncAutomations = ctx.automations.filter(
-      (a) => a.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
+      (a) =>
+        a.trigger === AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH &&
+        a.state === AutomationState.ACTIVE,
     )
 
     // sync filter automations
diff --git a/services/libs/integrations/src/types.ts b/services/libs/integrations/src/types.ts
index 1c40d0d686..06c7b84789 100644
--- a/services/libs/integrations/src/types.ts
+++ b/services/libs/integrations/src/types.ts
@@ -188,7 +188,6 @@ export interface IIntegrationDescriptor {
    * Function that will be called if defined, after an integration goes into done state.
    * Mainly responsible for sending queue messages to integration-sync-worker
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   startSyncRemote?: StartIntegrationSyncHandler
 
   /**
diff --git a/services/libs/sqs/src/instances/integrationSyncWorker.ts b/services/libs/sqs/src/instances/integrationSyncWorker.ts
index 97c74a718f..2b30b08e01 100644
--- a/services/libs/sqs/src/instances/integrationSyncWorker.ts
+++ b/services/libs/sqs/src/instances/integrationSyncWorker.ts
@@ -29,6 +29,7 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
     tenantId: string,
     integrationId: string,
     memberId: string,
+    syncRemoteId: string,
   ): Promise<void> {
     if (!tenantId) {
       throw new Error('tenantId is required!')
@@ -41,6 +42,10 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
       throw new Error('memberId is required!')
     }
 
+    if (!syncRemoteId) {
+      throw new Error('syncRemoteId is required!')
+    }
+
     await this.sendMessage(
       `integration-sync-member-${tenantId}`,
       {
@@ -48,6 +53,7 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
         tenantId,
         integrationId,
         memberId,
+        syncRemoteId,
       },
       `integration-sync-member-${memberId}`,
     )
@@ -106,6 +112,7 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
     tenantId: string,
     integrationId: string,
     organizationId: string,
+    syncRemoteId: string,
   ): Promise<void> {
     if (!tenantId) {
       throw new Error('tenantId is required!')
@@ -114,6 +121,10 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
       throw new Error('integrationId is required!')
     }
 
+    if (!syncRemoteId) {
+      throw new Error('syncRemoteId is required!')
+    }
+
     await this.sendMessage(
       `integration-sync-organization-${tenantId}`,
       {
@@ -121,6 +132,7 @@ export class IntegrationSyncWorkerEmitter extends SqsQueueEmitter {
         tenantId,
         integrationId,
         organizationId,
+        syncRemoteId,
       },
       `integration-sync-organization-${organizationId}`,
     )
diff --git a/services/libs/types/src/automations.ts b/services/libs/types/src/automations.ts
index 332f2e0a3d..9a68999103 100644
--- a/services/libs/types/src/automations.ts
+++ b/services/libs/types/src/automations.ts
@@ -9,6 +9,11 @@ export enum AutomationType {
   HUBSPOT = 'hubspot',
 }
 
+export enum AutomationState {
+  ACTIVE = 'active',
+  DISABLED = 'disabled',
+}
+
 export interface IAutomation {
   id: string
   name: string
diff --git a/services/libs/types/src/index.ts b/services/libs/types/src/index.ts
index a8f3eb60a0..ca1b31ed7a 100644
--- a/services/libs/types/src/index.ts
+++ b/services/libs/types/src/index.ts
@@ -42,3 +42,7 @@ export * from './tags'
 export * from './attributes'
 
 export * from './automations'
+
+export * from './query'
+
+export * from './sync'
diff --git a/services/libs/types/src/members.ts b/services/libs/types/src/members.ts
index 12d645b7ef..88f0120388 100644
--- a/services/libs/types/src/members.ts
+++ b/services/libs/types/src/members.ts
@@ -53,3 +53,13 @@ export interface IMember {
   username: any
   lastActivity: unknown
 }
+
+export interface IMemberSyncRemoteData {
+  id?: string
+  memberId: string
+  sourceId?: string
+  integrationId: string
+  syncFrom: string
+  metaData: string
+  lastSyncedAt?: string
+}
diff --git a/services/libs/types/src/opensearch.ts b/services/libs/types/src/opensearch.ts
index 2c5d399df8..3890df284a 100644
--- a/services/libs/types/src/opensearch.ts
+++ b/services/libs/types/src/opensearch.ts
@@ -56,38 +56,3 @@ export interface IOpenSearchConfig {
   accessKeyId?: string
   secretAccessKey?: string
 }
-
-export enum Operator {
-  GREATER_THAN = 'gt',
-  GREATER_THAN_OR_EQUAL = 'gte',
-  LESS_THAN = 'lt',
-  LESS_THAN_OR_EQUAL = 'lte',
-  NOT_EQUAL = 'ne',
-  EQUAL = 'eq',
-
-  // case insensitive ilike
-  LIKE = 'like',
-  NOT_LIKE = 'notLike',
-
-  TEXT_CONTAINS = 'textContains',
-  NOT_TEXT_CONTAINS = 'notContains',
-
-  REGEX = 'regexp',
-  NOT_REGEX = 'notRegexp',
-
-  AND = 'and',
-  OR = 'or',
-
-  IN = 'in',
-  NOT_IN = 'notIn',
-
-  BETWEEN = 'between',
-  NOT_BETWEEN = 'notBetween',
-
-  OVERLAP = 'overlap',
-  CONTAINS = 'contains',
-
-  NOT = 'not',
-
-  ARRAY_LENGTH = 'arrayLength',
-}
diff --git a/services/libs/types/src/organizations.ts b/services/libs/types/src/organizations.ts
index dcd4942a9d..c187ba375f 100644
--- a/services/libs/types/src/organizations.ts
+++ b/services/libs/types/src/organizations.ts
@@ -33,3 +33,13 @@ export interface IOrganizationOpensearch {
   logo: string
   displayName: string
 }
+
+export interface IOrganizationSyncRemoteData {
+  id?: string
+  organizationId: string
+  sourceId?: string
+  integrationId: string
+  syncFrom: string
+  metaData: string
+  lastSyncedAt?: string
+}
diff --git a/services/libs/types/src/query.ts b/services/libs/types/src/query.ts
new file mode 100644
index 0000000000..2525ae17cc
--- /dev/null
+++ b/services/libs/types/src/query.ts
@@ -0,0 +1,52 @@
+import { MemberAttributeType } from './enums/members'
+
+export enum Operator {
+  GREATER_THAN = 'gt',
+  GREATER_THAN_OR_EQUAL = 'gte',
+  LESS_THAN = 'lt',
+  LESS_THAN_OR_EQUAL = 'lte',
+  NOT_EQUAL = 'ne',
+  EQUAL = 'eq',
+
+  // case insensitive ilike
+  LIKE = 'like',
+  NOT_LIKE = 'notLike',
+
+  TEXT_CONTAINS = 'textContains',
+  NOT_TEXT_CONTAINS = 'notContains',
+
+  REGEX = 'regexp',
+  NOT_REGEX = 'notRegexp',
+
+  AND = 'and',
+  OR = 'or',
+
+  IN = 'in',
+  NOT_IN = 'notIn',
+
+  BETWEEN = 'between',
+  NOT_BETWEEN = 'notBetween',
+
+  OVERLAP = 'overlap',
+  CONTAINS = 'contains',
+
+  NOT = 'not',
+
+  ARRAY_LENGTH = 'arrayLength',
+}
+
+export interface ParsedJsonColumn {
+  parts: string[]
+  info: JsonColumnInfo
+}
+
+export interface JsonColumnInfo {
+  property: string
+  column: string
+  attributeInfos: AttributeInfo[]
+}
+
+export interface AttributeInfo {
+  name: string
+  type: MemberAttributeType
+}
diff --git a/services/libs/types/src/sync.ts b/services/libs/types/src/sync.ts
new file mode 100644
index 0000000000..bd8bb34c14
--- /dev/null
+++ b/services/libs/types/src/sync.ts
@@ -0,0 +1,5 @@
+export enum SyncStatus {
+  NEVER = 'never',
+  ACTIVE = 'active',
+  STOPPED = 'stopped',
+}
diff --git a/services/scripts/build_libs.sh b/services/scripts/build_libs.sh
index f0bc859d7b..1fb5824ea7 100755
--- a/services/scripts/build_libs.sh
+++ b/services/scripts/build_libs.sh
@@ -6,8 +6,8 @@ CLI_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $CLI_HOME/utils.sh
 
 LIBRARIES=(
-  "common"
   "types"
+  "common"
   "logging"
   "database"
   "redis"

From 78ba20b0bc65629ac9f4f1f717733354aeffd363 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 12:30:36 +0200
Subject: [PATCH 24/42] mappable fields identities problem fixed

---
 backend/src/services/integrationService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index 08cb948479..cf76639cdf 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -841,7 +841,7 @@ export default class IntegrationService {
       HubspotEntity.MEMBERS,
       null,
       memberAttributeSettings,
-      identities,
+      identities.map((i) => i.platform),
     )
     const organizationMapper = HubspotFieldMapperFactory.getFieldMapper(
       HubspotEntity.ORGANIZATIONS,

From 3743b7ba3a21ad54c724c75653e7426cb0b94518 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 13:58:51 +0200
Subject: [PATCH 25/42] linting, added automationExecution rows for hubspot

---
 .../apps/integration_sync_worker/src/main.ts  |   6 +-
 .../src/queue/index.ts                        |   9 +-
 .../src/repo/automation.repo.ts               |   4 +-
 .../src/repo/automationExecution.repo.ts      |  29 +++
 .../src/repo/organization.repo.ts             |   2 +
 .../src/service/member.sync.service.ts        | 218 ++++++++++--------
 .../src/service/organization.sync.service.ts  | 199 +++++++++-------
 services/libs/common/src/rawQueryParser.ts    |   1 +
 services/libs/types/src/automations.ts        |  15 ++
 9 files changed, 283 insertions(+), 200 deletions(-)
 create mode 100644 services/apps/integration_sync_worker/src/repo/automationExecution.repo.ts

diff --git a/services/apps/integration_sync_worker/src/main.ts b/services/apps/integration_sync_worker/src/main.ts
index 946ca40490..afe90c676e 100644
--- a/services/apps/integration_sync_worker/src/main.ts
+++ b/services/apps/integration_sync_worker/src/main.ts
@@ -1,6 +1,6 @@
 import { getDbConnection } from '@crowd/database'
 import { getServiceLogger } from '@crowd/logging'
-import { SearchSyncWorkerEmitter, getSqsClient } from '@crowd/sqs'
+import { getSqsClient } from '@crowd/sqs'
 import { DB_CONFIG, OPENSEARCH_CONFIG, SQS_CONFIG } from './conf'
 import { WorkerQueueReceiver } from './queue'
 import { getOpensearchClient } from '@crowd/opensearch'
@@ -18,19 +18,15 @@ setImmediate(async () => {
 
   const opensearchClient = getOpensearchClient(OPENSEARCH_CONFIG())
 
-  const searchSyncWorkerEmitter = new SearchSyncWorkerEmitter(sqsClient, log)
-
   const worker = new WorkerQueueReceiver(
     sqsClient,
     dbConnection,
     opensearchClient,
-    searchSyncWorkerEmitter,
     log,
     MAX_CONCURRENT_PROCESSING,
   )
 
   try {
-    await searchSyncWorkerEmitter.init()
     await worker.start()
   } catch (err) {
     log.error(err, 'Failed to start!')
diff --git a/services/apps/integration_sync_worker/src/queue/index.ts b/services/apps/integration_sync_worker/src/queue/index.ts
index fe0b5be4f7..1f9c9bf4fc 100644
--- a/services/apps/integration_sync_worker/src/queue/index.ts
+++ b/services/apps/integration_sync_worker/src/queue/index.ts
@@ -3,12 +3,7 @@ import { OpenSearchService } from '@/service/opensearch.service'
 import { OrganizationSyncService } from '@/service/organization.sync.service'
 import { DbConnection, DbStore } from '@crowd/database'
 import { Logger } from '@crowd/logging'
-import {
-  INTEGRATION_SYNC_WORKER_QUEUE_SETTINGS,
-  SearchSyncWorkerEmitter,
-  SqsClient,
-  SqsQueueReceiver,
-} from '@crowd/sqs'
+import { INTEGRATION_SYNC_WORKER_QUEUE_SETTINGS, SqsClient, SqsQueueReceiver } from '@crowd/sqs'
 import {
   AutomationSyncTrigger,
   IQueueMessage,
@@ -21,7 +16,6 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
     client: SqsClient,
     private readonly dbConn: DbConnection,
     private readonly openSearchClient: Client,
-    private readonly searchSyncEmitter: SearchSyncWorkerEmitter,
     parentLog: Logger,
     maxConcurrentProcessing: number,
   ) {
@@ -32,7 +26,6 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
     return new MemberSyncService(
       new DbStore(this.log, this.dbConn),
       new OpenSearchService(this.log, this.openSearchClient),
-      this.searchSyncEmitter,
       this.log,
     )
   }
diff --git a/services/apps/integration_sync_worker/src/repo/automation.repo.ts b/services/apps/integration_sync_worker/src/repo/automation.repo.ts
index 0275d58303..48e6224b14 100644
--- a/services/apps/integration_sync_worker/src/repo/automation.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/automation.repo.ts
@@ -1,6 +1,5 @@
 import { DbStore, RepositoryBase } from '@crowd/database'
 import { Logger } from '@crowd/logging'
-import { IDbIntegration } from './integration.data'
 import { IAutomation } from '@crowd/types'
 
 export class AutomationRepository extends RepositoryBase<AutomationRepository> {
@@ -8,8 +7,7 @@ export class AutomationRepository extends RepositoryBase<AutomationRepository> {
     super(dbStore, parentLog)
   }
 
-  public async findById(id: string): Promise< IAutomation | null> {
+  public async findById(id: string): Promise<IAutomation | null> {
     return await this.db().oneOrNone(`select * from automations where id = $(id)`, { id })
   }
-
 }
diff --git a/services/apps/integration_sync_worker/src/repo/automationExecution.repo.ts b/services/apps/integration_sync_worker/src/repo/automationExecution.repo.ts
new file mode 100644
index 0000000000..cda6f1e182
--- /dev/null
+++ b/services/apps/integration_sync_worker/src/repo/automationExecution.repo.ts
@@ -0,0 +1,29 @@
+import { DbStore, RepositoryBase } from '@crowd/database'
+import { Logger } from '@crowd/logging'
+import { IAutomationExecution } from '@crowd/types'
+import { generateUUIDv1 as uuid } from '@crowd/common'
+
+export class AutomationExecutionRepository extends RepositoryBase<AutomationExecutionRepository> {
+  constructor(dbStore: DbStore, parentLog: Logger) {
+    super(dbStore, parentLog)
+  }
+
+  public async addExecution(data: IAutomationExecution): Promise<void> {
+    await this.db().none(
+      `insert into "automationExecutions" ("id", "automationId", "type", "tenantId", "trigger", "state", "error", "executedAt", "eventId", "payload")
+        values
+            ($(id), $(automationId), $(type), $(tenantId), $(trigger), $(state), $(error), now(), $(eventId), $(payload))`,
+      {
+        id: uuid(),
+        automationId: data.automationId,
+        type: data.type,
+        tenantId: data.tenantId,
+        trigger: data.trigger,
+        state: data.state,
+        error: data.error || null,
+        eventId: data.eventId || uuid(),
+        payload: JSON.stringify(data.payload) || JSON.stringify({}),
+      },
+    )
+  }
+}
diff --git a/services/apps/integration_sync_worker/src/repo/organization.repo.ts b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
index 5d85d9131b..2324366be2 100644
--- a/services/apps/integration_sync_worker/src/repo/organization.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
@@ -151,10 +151,12 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
     tenantId: string,
     segmentIds: string[],
     platform: string,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     filter: any,
     limit: number,
     offset: number,
   ) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const params: any = {
       tenantId,
       segmentIds,
diff --git a/services/apps/integration_sync_worker/src/service/member.sync.service.ts b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
index 23c56200e8..86a49f8b50 100644
--- a/services/apps/integration_sync_worker/src/service/member.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/member.sync.service.ts
@@ -1,6 +1,6 @@
 import { NANGO_CONFIG, SERVICE_CONFIG } from '@/conf'
 import { MemberRepository } from '../repo/member.repo'
-import { Entity, IMember, OpenSearchIndex, PlatformType } from '@crowd/types'
+import { Entity, IMember, OpenSearchIndex } from '@crowd/types'
 import { singleOrDefault } from '@crowd/common'
 import { DbStore } from '@crowd/database'
 import { Logger, LoggerBase } from '@crowd/logging'
@@ -15,18 +15,18 @@ import {
   INTEGRATION_SERVICES,
 } from '@crowd/integrations'
 import { IDbIntegration } from '@/repo/integration.data'
-import { SearchSyncWorkerEmitter } from '@crowd/sqs'
 import { AutomationRepository } from '@/repo/automation.repo'
+import { AutomationExecutionRepository } from '@/repo/automationExecution.repo'
 
 export class MemberSyncService extends LoggerBase {
   private readonly memberRepo: MemberRepository
   private readonly integrationRepo: IntegrationRepository
   private readonly automationRepo: AutomationRepository
+  private readonly automationExecutionRepo: AutomationExecutionRepository
 
   constructor(
     store: DbStore,
     private readonly openSearchService: OpenSearchService,
-    private readonly searchSyncEmitter: SearchSyncWorkerEmitter,
     parentLog: Logger,
   ) {
     super(parentLog)
@@ -34,6 +34,7 @@ export class MemberSyncService extends LoggerBase {
     this.memberRepo = new MemberRepository(store, this.log)
     this.integrationRepo = new IntegrationRepository(store, this.log)
     this.automationRepo = new AutomationRepository(store, this.log)
+    this.automationExecutionRepo = new AutomationExecutionRepository(store, this.log)
   }
 
   public async syncMember(
@@ -253,29 +254,6 @@ export class MemberSyncService extends LoggerBase {
 
     const parsed = OpensearchQueryParser.parse(parseOptions, OpenSearchIndex.MEMBERS, translator)
 
-    // only get members that aren't marked as sync yet
-    // parsed.query.bool.must.push({
-    //   bool: {
-    //     should: [
-    //       {
-    //         bool: {
-    //           must_not: {
-    //             exists: {
-    //               field: `obj_attributes.obj_syncRemote.bool_${integration.platform}`,
-    //             },
-    //           },
-    //         },
-    //       },
-    //       {
-    //         term: {
-    //           [`obj_attributes.obj_syncRemote.bool_${integration.platform}`]: false,
-    //         },
-    //       },
-    //     ],
-    //     minimum_should_match: 1,
-    //   },
-    // })
-
     // add tenant filter
     parsed.query.bool.must.push({
       term: {
@@ -334,100 +312,136 @@ export class MemberSyncService extends LoggerBase {
       'Trying to sync members that conform to sent filter!',
     )
 
-    do {
-      const membersToCreate: IMember[] = []
-      const membersToUpdate: IMember[] = []
+    try {
+      do {
+        const membersToCreate: IMember[] = []
+        const membersToUpdate: IMember[] = []
 
-      offset = filteredMembers ? offset + batchSize : 0
-      parsed.from = offset
+        offset = filteredMembers ? offset + batchSize : 0
+        parsed.from = offset
 
-      filteredMembers = await this.openSearchService.client.search({
-        index: OpenSearchIndex.MEMBERS,
-        body: parsed,
-      })
+        filteredMembers = await this.openSearchService.client.search({
+          index: OpenSearchIndex.MEMBERS,
+          body: parsed,
+        })
 
-      this.log.trace('Found members: ')
-      this.log.trace(filteredMembers)
+        this.log.trace('Found members: ')
+        this.log.trace(filteredMembers)
 
-      const translatedMembers: IMember[] = filteredMembers.body.hits.hits.reduce((acc, member) => {
-        const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
-        acc.push(membersWithCrowdFields)
-        return acc
-      }, [])
+        const translatedMembers: IMember[] = filteredMembers.body.hits.hits.reduce(
+          (acc, member) => {
+            const membersWithCrowdFields = translator.translateObjectToCrowd(member._source)
+            acc.push(membersWithCrowdFields)
+            return acc
+          },
+          [],
+        )
 
-      while (translatedMembers.length > 0) {
-        const memberToSync = translatedMembers.shift()
+        while (translatedMembers.length > 0) {
+          const memberToSync = translatedMembers.shift()
 
-        this.log.trace(`Syncing member ${memberToSync.id} to ${integration.platform} remote!`)
+          this.log.trace(`Syncing member ${memberToSync.id} to ${integration.platform} remote!`)
 
-        let syncRemote = await this.memberRepo.findSyncRemote(
-          memberToSync.id,
-          integration.id,
-          automation.id,
-        )
-
-        // member isn't marked yet, mark it
-        if (!syncRemote) {
-          syncRemote = await this.memberRepo.markMemberForSyncing({
-            integrationId: integration.id,
-            memberId: memberToSync.id,
-            metaData: null,
-            syncFrom: automation.id,
-          })
-        }
+          let syncRemote = await this.memberRepo.findSyncRemote(
+            memberToSync.id,
+            integration.id,
+            automation.id,
+          )
 
-        if (syncRemote.sourceId) {
-          memberToSync.attributes = {
-            ...memberToSync.attributes,
-            sourceId: {
-              [integration.platform]: syncRemote.sourceId,
-            },
+          // member isn't marked yet, mark it
+          if (!syncRemote) {
+            syncRemote = await this.memberRepo.markMemberForSyncing({
+              integrationId: integration.id,
+              memberId: memberToSync.id,
+              metaData: null,
+              syncFrom: automation.id,
+            })
           }
-          membersToUpdate.push(memberToSync)
-        } else {
-          membersToCreate.push(memberToSync)
-        }
-      }
-
-      const service = singleOrDefault(INTEGRATION_SERVICES, (s) => s.type === integration.platform)
 
-      if (service.processSyncRemote) {
-        const context: IIntegrationProcessRemoteSyncContext = {
-          integration,
-          log: this.log,
-          serviceSettings: {
-            nangoId: `${tenantId}-${integration.platform}`,
-            nangoUrl: NANGO_CONFIG().url,
-            nangoSecretKey: NANGO_CONFIG().secretKey,
-          },
-          tenantId,
-          automation,
+          if (syncRemote.sourceId) {
+            memberToSync.attributes = {
+              ...memberToSync.attributes,
+              sourceId: {
+                [integration.platform]: syncRemote.sourceId,
+              },
+            }
+            membersToUpdate.push(memberToSync)
+          } else {
+            membersToCreate.push(memberToSync)
+          }
         }
 
-        const newMembers = await service.processSyncRemote<IMember>(
-          membersToCreate,
-          membersToUpdate,
-          Entity.MEMBERS,
-          context,
+        const service = singleOrDefault(
+          INTEGRATION_SERVICES,
+          (s) => s.type === integration.platform,
         )
 
-        for (const newMember of newMembers as IBatchCreateMemberResult[]) {
-          await this.memberRepo.setIntegrationSourceId(
-            newMember.memberId,
-            integration.id,
-            newMember.sourceId,
+        if (service.processSyncRemote) {
+          const context: IIntegrationProcessRemoteSyncContext = {
+            integration,
+            log: this.log,
+            serviceSettings: {
+              nangoId: `${tenantId}-${integration.platform}`,
+              nangoUrl: NANGO_CONFIG().url,
+              nangoSecretKey: NANGO_CONFIG().secretKey,
+            },
+            tenantId,
+            automation,
+          }
+
+          const newMembers = await service.processSyncRemote<IMember>(
+            membersToCreate,
+            membersToUpdate,
+            Entity.MEMBERS,
+            context,
           )
 
-          await this.memberRepo.setLastSyncedAt(newMember.memberId, integration.id)
-        }
+          for (const newMember of newMembers as IBatchCreateMemberResult[]) {
+            await this.memberRepo.setIntegrationSourceId(
+              newMember.memberId,
+              integration.id,
+              newMember.sourceId,
+            )
 
-        for (const updatedMember of membersToUpdate) {
-          await this.memberRepo.setLastSyncedAt(updatedMember.id, integration.id)
+            await this.memberRepo.setLastSyncedAt(newMember.memberId, integration.id)
+          }
+
+          for (const updatedMember of membersToUpdate) {
+            await this.memberRepo.setLastSyncedAt(updatedMember.id, integration.id)
+          }
+        } else {
+          this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
         }
-      } else {
-        this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
-      }
-    } while (filteredMembers.length > 0)
+      } while (filteredMembers.length > 0)
+
+      await this.automationExecutionRepo.addExecution({
+        automationId: automation.id,
+        type: automation.type,
+        trigger: automation.trigger,
+        tenantId: automation.tenantId,
+        state: 'success',
+        payload: {
+          type: automation.type,
+          trigger: automation.trigger,
+        },
+        error: null,
+      })
+    } catch (e) {
+      await this.automationExecutionRepo.addExecution({
+        automationId: automation.id,
+        type: automation.type,
+        trigger: automation.trigger,
+        tenantId: automation.tenantId,
+        state: 'error',
+        payload: {
+          type: automation.type,
+          trigger: automation.trigger,
+        },
+        error: JSON.stringify(e),
+      })
+
+      throw e
+    }
   }
 
   public async syncOrganizationMembers(
diff --git a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
index 62d2406db0..56e54f4c97 100644
--- a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
@@ -13,11 +13,13 @@ import {
 import { OrganizationRepository } from '@/repo/organization.repo'
 import { IDbIntegration } from '@/repo/integration.data'
 import { AutomationRepository } from '@/repo/automation.repo'
+import { AutomationExecutionRepository } from '@/repo/automationExecution.repo'
 
 export class OrganizationSyncService extends LoggerBase {
   private readonly organizationRepo: OrganizationRepository
   private readonly integrationRepo: IntegrationRepository
   private readonly automationRepo: AutomationRepository
+  private readonly automationExecutionRepo: AutomationExecutionRepository
 
   constructor(store: DbStore, parentLog: Logger) {
     super(parentLog)
@@ -25,6 +27,7 @@ export class OrganizationSyncService extends LoggerBase {
     this.integrationRepo = new IntegrationRepository(store, this.log)
     this.organizationRepo = new OrganizationRepository(store, this.log)
     this.automationRepo = new AutomationRepository(store, this.log)
+    this.automationExecutionRepo = new AutomationExecutionRepository(store, this.log)
   }
 
   public async syncOrganization(
@@ -184,106 +187,138 @@ export class OrganizationSyncService extends LoggerBase {
     let filteredOrganizations
     let offset
 
-    do {
-      const organizationsToCreate: IOrganization[] = []
-      const organizationsToUpdate: IOrganization[] = []
+    try {
+      do {
+        const organizationsToCreate: IOrganization[] = []
+        const organizationsToUpdate: IOrganization[] = []
 
-      offset = filteredOrganizations ? offset + batchSize : 0
-
-      filteredOrganizations = await this.organizationRepo.findFilteredOrganizations(
-        tenantId,
-        [integration.segmentId],
-        integration.platform,
-        automation.settings.filter,
-        batchSize,
-        offset,
-      )
+        offset = filteredOrganizations ? offset + batchSize : 0
 
-      for (const organizationToSync of filteredOrganizations) {
-        this.log.trace(
-          `Syncing organization ${organizationToSync.id} to ${integration.platform} remote!`,
-        )
-
-        let syncRemote = await this.organizationRepo.findSyncRemote(
-          organizationToSync.id,
-          integration.id,
-          automation.id,
+        filteredOrganizations = await this.organizationRepo.findFilteredOrganizations(
+          tenantId,
+          [integration.segmentId],
+          integration.platform,
+          automation.settings.filter,
+          batchSize,
+          offset,
         )
 
-        // member isn't marked yet, mark it
-        if (!syncRemote) {
-          syncRemote = await this.organizationRepo.markOrganizationForSyncing({
-            integrationId: integration.id,
-            organizationId: organizationToSync.id,
-            metaData: null,
-            syncFrom: automation.id,
-          })
-        }
+        for (const organizationToSync of filteredOrganizations) {
+          this.log.trace(
+            `Syncing organization ${organizationToSync.id} to ${integration.platform} remote!`,
+          )
 
-        const organization = await this.organizationRepo.findOrganization(
-          organizationToSync.id,
-          tenantId,
-        )
+          let syncRemote = await this.organizationRepo.findSyncRemote(
+            organizationToSync.id,
+            integration.id,
+            automation.id,
+          )
 
-        if (syncRemote.sourceId) {
-          organization.attributes = {
-            ...organization.attributes,
-            sourceId: {
-              [integration.platform]: syncRemote.sourceId,
-            },
+          // member isn't marked yet, mark it
+          if (!syncRemote) {
+            syncRemote = await this.organizationRepo.markOrganizationForSyncing({
+              integrationId: integration.id,
+              organizationId: organizationToSync.id,
+              metaData: null,
+              syncFrom: automation.id,
+            })
           }
-          organizationsToUpdate.push(organization)
-        } else {
-          organizationsToCreate.push(organization)
-        }
-      }
 
-      const service = singleOrDefault(INTEGRATION_SERVICES, (s) => s.type === integration.platform)
+          const organization = await this.organizationRepo.findOrganization(
+            organizationToSync.id,
+            tenantId,
+          )
 
-      if (service.processSyncRemote) {
-        const context: IIntegrationProcessRemoteSyncContext = {
-          integration,
-          log: this.log,
-          serviceSettings: {
-            nangoId: `${tenantId}-${integration.platform}`,
-            nangoUrl: NANGO_CONFIG().url,
-            nangoSecretKey: NANGO_CONFIG().secretKey,
-          },
-          tenantId,
+          if (syncRemote.sourceId) {
+            organization.attributes = {
+              ...organization.attributes,
+              sourceId: {
+                [integration.platform]: syncRemote.sourceId,
+              },
+            }
+            organizationsToUpdate.push(organization)
+          } else {
+            organizationsToCreate.push(organization)
+          }
         }
 
-        const newOrganizations = await service.processSyncRemote<IOrganization>(
-          organizationsToCreate,
-          organizationsToUpdate,
-          Entity.ORGANIZATIONS,
-          context,
+        const service = singleOrDefault(
+          INTEGRATION_SERVICES,
+          (s) => s.type === integration.platform,
         )
 
-        for (const newOrganization of newOrganizations as IBatchCreateOrganizationsResult[]) {
-          await this.organizationRepo.setIntegrationSourceId(
-            newOrganization.organizationId,
-            integration.id,
-            newOrganization.sourceId,
-          )
+        if (service.processSyncRemote) {
+          const context: IIntegrationProcessRemoteSyncContext = {
+            integration,
+            log: this.log,
+            serviceSettings: {
+              nangoId: `${tenantId}-${integration.platform}`,
+              nangoUrl: NANGO_CONFIG().url,
+              nangoSecretKey: NANGO_CONFIG().secretKey,
+            },
+            tenantId,
+          }
 
-          await this.organizationRepo.setLastSyncedAt(
-            newOrganization.organizationId,
-            integration.id,
+          const newOrganizations = await service.processSyncRemote<IOrganization>(
+            organizationsToCreate,
+            organizationsToUpdate,
+            Entity.ORGANIZATIONS,
+            context,
           )
-        }
 
-        for (const updatedOrganization of organizationsToUpdate) {
-          await this.organizationRepo.setLastSyncedAt(updatedOrganization.id, integration.id)
-        }
+          for (const newOrganization of newOrganizations as IBatchCreateOrganizationsResult[]) {
+            await this.organizationRepo.setIntegrationSourceId(
+              newOrganization.organizationId,
+              integration.id,
+              newOrganization.sourceId,
+            )
+
+            await this.organizationRepo.setLastSyncedAt(
+              newOrganization.organizationId,
+              integration.id,
+            )
+          }
+
+          for (const updatedOrganization of organizationsToUpdate) {
+            await this.organizationRepo.setLastSyncedAt(updatedOrganization.id, integration.id)
+          }
 
-        if (syncOrganizationMembers) {
-          organizationsIdsSyncedToReturn.push(...organizationsToCreate.map((o) => o.id))
-          organizationsIdsSyncedToReturn.push(...organizationsToUpdate.map((o) => o.id))
+          if (syncOrganizationMembers) {
+            organizationsIdsSyncedToReturn.push(...organizationsToCreate.map((o) => o.id))
+            organizationsIdsSyncedToReturn.push(...organizationsToUpdate.map((o) => o.id))
+          }
+        } else {
+          this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
         }
-      } else {
-        this.log.warn(`Integration ${integration.platform} has no processSyncRemote function!`)
-      }
-    } while (filteredOrganizations.length > 0)
+      } while (filteredOrganizations.length > 0)
+
+      await this.automationExecutionRepo.addExecution({
+        automationId: automation.id,
+        type: automation.type,
+        trigger: automation.trigger,
+        tenantId: automation.tenantId,
+        state: 'success',
+        payload: {
+          type: automation.type,
+          trigger: automation.trigger,
+        },
+        error: null,
+      })
+    } catch (e) {
+      await this.automationExecutionRepo.addExecution({
+        automationId: automation.id,
+        type: automation.type,
+        trigger: automation.trigger,
+        tenantId: automation.tenantId,
+        state: 'error',
+        payload: {
+          type: automation.type,
+          trigger: automation.trigger,
+        },
+        error: JSON.stringify(e),
+      })
+      throw e
+    }
 
     return syncOrganizationMembers ? organizationsIdsSyncedToReturn : []
   }
diff --git a/services/libs/common/src/rawQueryParser.ts b/services/libs/common/src/rawQueryParser.ts
index 1393df3901..be2a13d367 100644
--- a/services/libs/common/src/rawQueryParser.ts
+++ b/services/libs/common/src/rawQueryParser.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { MemberAttributeType } from '@crowd/types'
 import { JsonColumnInfo, Operator, ParsedJsonColumn } from '@crowd/types'
 import { singleOrDefault } from './array'
diff --git a/services/libs/types/src/automations.ts b/services/libs/types/src/automations.ts
index 9a68999103..64bda74514 100644
--- a/services/libs/types/src/automations.ts
+++ b/services/libs/types/src/automations.ts
@@ -20,6 +20,7 @@ export interface IAutomation {
   type: AutomationType
   tenantId: string
   trigger: string
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   settings: any
   state: string
   createdAt: string
@@ -27,3 +28,17 @@ export interface IAutomation {
   createdById: string
   updatedById: string
 }
+
+export interface IAutomationExecution {
+  id?: string
+  automationId: string
+  type: string
+  tenantId: string
+  trigger: string
+  state: string
+  error: string
+  executedAt?: string
+  eventId?: string
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  payload: any
+}

From 0a5c028e0b41be3935ca0c3eb2fb1e381c3ab59c Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 14:34:50 +0200
Subject: [PATCH 26/42] index migrations for syncRemote tables

---
 .../U1691152131__syncRemoteTablesMissingIndexes.sql   |  0
 .../V1691152131__syncRemoteTablesMissingIndexes.sql   | 11 +++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 backend/src/database/migrations/U1691152131__syncRemoteTablesMissingIndexes.sql
 create mode 100644 backend/src/database/migrations/V1691152131__syncRemoteTablesMissingIndexes.sql

diff --git a/backend/src/database/migrations/U1691152131__syncRemoteTablesMissingIndexes.sql b/backend/src/database/migrations/U1691152131__syncRemoteTablesMissingIndexes.sql
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/backend/src/database/migrations/V1691152131__syncRemoteTablesMissingIndexes.sql b/backend/src/database/migrations/V1691152131__syncRemoteTablesMissingIndexes.sql
new file mode 100644
index 0000000000..cb57cb04c4
--- /dev/null
+++ b/backend/src/database/migrations/V1691152131__syncRemoteTablesMissingIndexes.sql
@@ -0,0 +1,11 @@
+create index if not exists "ix_membersSyncRemote_memberId" on "membersSyncRemote" ("memberId");
+create index if not exists "ix_membersSyncRemote_integrationId" on "membersSyncRemote" ("integrationId");
+create index if not exists "ix_membersSyncRemote_syncFrom" on "membersSyncRemote" ("syncFrom");
+create index if not exists "ix_membersSyncRemote_sourceId" on "membersSyncRemote" ("sourceId");
+create index if not exists "ix_membersSyncRemote_status" on "membersSyncRemote" ("status");
+
+create index if not exists "ix_organizationsSyncRemote_organizationId" on "organizationsSyncRemote" ("organizationId");
+create index if not exists "ix_organizationsSyncRemote_integrationId" on "organizationsSyncRemote" ("integrationId");
+create index if not exists "ix_organizationsSyncRemote_syncFrom" on "organizationsSyncRemote" ("syncFrom");
+create index if not exists "ix_organizationsSyncRemote_sourceId" on "organizationsSyncRemote" ("sourceId");
+create index if not exists "ix_organizationsSyncRemote_status" on "organizationsSyncRemote" ("status");
\ No newline at end of file

From d906d6f622a378e3eb919e79ef708c4cad85c1fe Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 14:40:02 +0200
Subject: [PATCH 27/42] linting for automation executions

---
 backend/src/database/repositories/types/automationTypes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/database/repositories/types/automationTypes.ts b/backend/src/database/repositories/types/automationTypes.ts
index 67126b474c..a066d8d98d 100644
--- a/backend/src/database/repositories/types/automationTypes.ts
+++ b/backend/src/database/repositories/types/automationTypes.ts
@@ -26,7 +26,7 @@ export interface DbAutomationExecutionInsertData {
   automationId: string
   type: AutomationType
   tenantId: string
-  trigger: AutomationTrigger
+  trigger: AutomationTrigger | AutomationSyncTrigger
   state: AutomationExecutionState
   error: any | null
   executedAt: Date

From 0fa3c2a03bc9c3deb3ed85cfb1a161279d4c4d22 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 14:46:47 +0200
Subject: [PATCH 28/42] stop manual sync endpoints update remoteSync tables

---
 .../repositories/memberSyncRemoteRepository.ts    | 15 +++++++++++++++
 .../organizationSyncRemoteRepository.ts           | 15 +++++++++++++++
 backend/src/services/integrationService.ts        |  6 ++++++
 3 files changed, 36 insertions(+)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 1df8300462..029ec81501 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -29,6 +29,21 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     )
   }
 
+  async stopMemberManualSync(memberId: string) {
+    await this.options.database.sequelize.query(
+      `update "membersSyncRemote" set status = :status where "memberId" = :memberId and "syncFrom" = :manualSync
+        `,
+      {
+        replacements: {
+          status: SyncStatus.STOPPED,
+          memberId,
+          manualSync: 'manual',
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
   async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
     const existingSyncRemote = await this.findByMemberId(data.memberId)
 
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index f120c298a4..1cbdffa63c 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -29,6 +29,21 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     )
   }
 
+  async stopOrganizationManualSync(organizationId: string) {
+    await this.options.database.sequelize.query(
+      `update "organizationsSyncRemote" set status = :status where "organizationId" = :organizationId and "syncFrom" = :manualSync
+        `,
+      {
+        replacements: {
+          status: SyncStatus.STOPPED,
+          organizationId,
+          manualSync: 'manual',
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
   async markOrganizationForSyncing(
     data: IOrganizationSyncRemoteData,
   ): Promise<IOrganizationSyncRemoteData> {
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index cf76639cdf..dcf2d37d46 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -487,6 +487,9 @@ export default class IntegrationService {
     }
 
     await memberService.update(payload.memberId, { attributes: member.attributes })
+
+    const memberSyncRemoteRepository = new MemberSyncRemoteRepository(this.options)
+    await memberSyncRemoteRepository.stopMemberManualSync(member.id)
   }
 
   async hubspotSyncMember(payload: IHubspotManualSyncPayload) {
@@ -585,6 +588,9 @@ export default class IntegrationService {
     await organizationService.update(payload.organizationId, {
       attributes: organization.attributes,
     })
+
+    const organizationSyncRemoteRepository = new OrganizationSyncRemoteRepository(this.options)
+    await organizationSyncRemoteRepository.stopOrganizationManualSync(organization.id)
   }
 
   async hubspotSyncOrganization(payload: IHubspotManualSyncPayload) {

From 2bb41c9c5886240d4fcb0d2bb5010cb14157ced5 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 23:04:56 +0200
Subject: [PATCH 29/42] review points, manual sync endpoints fix

---
 backend/src/database/repositories/memberSyncRemoteRepository.ts | 1 +
 .../database/repositories/organizationSyncRemoteRepository.ts   | 1 +
 services/scripts/watch_libs.sh                                  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 029ec81501..bf10235cc0 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -55,6 +55,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
       `INSERT INTO "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
+              conflict do nothing
           RETURNING "id"
         `,
       {
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 1cbdffa63c..7bc54893ba 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -57,6 +57,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
       `INSERT INTO "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
+              conflict do nothing
           RETURNING "id"
         `,
       {
diff --git a/services/scripts/watch_libs.sh b/services/scripts/watch_libs.sh
index d4faa3a3a0..7e04e71a9b 100755
--- a/services/scripts/watch_libs.sh
+++ b/services/scripts/watch_libs.sh
@@ -22,7 +22,7 @@ $(npx --yes chokidar-cli --version >/dev/null 2>&1)
 declare -A DEPENDENCIES
 
 DEPENDENCIES=(
-  ["common"]=""
+  ["common"]="types"
   ["types"]=""
   ["logging"]="common"
   ["redis"]="common logging types"

From d56f90ec353bb21e8080edd6465b6b8c6170026b Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 23:15:34 +0200
Subject: [PATCH 30/42] syntax error fixed on syncing sqls

---
 backend/src/database/repositories/memberSyncRemoteRepository.ts | 2 +-
 .../database/repositories/organizationSyncRemoteRepository.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index bf10235cc0..2d0bfcad6f 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -55,7 +55,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
       `INSERT INTO "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-              conflict do nothing
+              on conflict do nothing
           RETURNING "id"
         `,
       {
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 7bc54893ba..3c93a4dcab 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -57,7 +57,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
       `INSERT INTO "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-              conflict do nothing
+              on conflict do nothing
           RETURNING "id"
         `,
       {

From a53260f819d6181aaf58c5b6d7aca2047009fb8d Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 23:29:20 +0200
Subject: [PATCH 31/42] fix returning id on conflict

---
 .../repositories/memberSyncRemoteRepository.ts         | 10 ++++++----
 .../repositories/organizationSyncRemoteRepository.ts   |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 2d0bfcad6f..aff87e8684 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -52,11 +52,13 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     }
 
     const memberSyncRemoteInserted = await this.options.database.sequelize.query(
-      `INSERT INTO "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
-          VALUES
+      `insert into "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+          values
               (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-              on conflict do nothing
-          RETURNING "id"
+          on conflict ("integrationId", "memberId", "syncFrom")
+          do update 
+              set "id" = membersSyncRemote."id" 
+          returning "id"
         `,
       {
         replacements: {
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 3c93a4dcab..62e073355c 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -54,11 +54,13 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     }
 
     const organizationSyncRemoteInserted = await this.options.database.sequelize.query(
-      `INSERT INTO "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
+      `insert into "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-              on conflict do nothing
-          RETURNING "id"
+              on conflict ("organizationId", "integrationId", "syncFrom")
+              do update 
+              set "id" = organizationsSyncRemote."id" 
+          returning "id"
         `,
       {
         replacements: {

From 156bcaa61bab0210da6b07e3412220eea40eee23 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Fri, 4 Aug 2023 23:42:59 +0200
Subject: [PATCH 32/42] on conflict using excluded to return the ids

---
 backend/src/database/repositories/memberSyncRemoteRepository.ts | 2 +-
 .../database/repositories/organizationSyncRemoteRepository.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index aff87e8684..87b30ec545 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -57,7 +57,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
               (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
           on conflict ("integrationId", "memberId", "syncFrom")
           do update 
-              set "id" = membersSyncRemote."id" 
+              set "id" = EXCLUDED."id" 
           returning "id"
         `,
       {
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 62e073355c..5fa00bd7fc 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -59,7 +59,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
               (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
               on conflict ("organizationId", "integrationId", "syncFrom")
               do update 
-              set "id" = organizationsSyncRemote."id" 
+              set "id" = EXCLUDED."id" 
           returning "id"
         `,
       {

From ebc4ec459a2b6a4c51837832b9c1210e81ce6435 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sat, 5 Aug 2023 00:16:16 +0200
Subject: [PATCH 33/42] removed on conflict query with proper checks

---
 .../memberSyncRemoteRepository.ts             | 49 +++++++++++++++++
 .../organizationSyncRemoteRepository.ts       | 52 +++++++++++++++++--
 2 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 87b30ec545..69a6557fbd 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -29,6 +29,44 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     )
   }
 
+  async findRemoteSync(integrationId: string, memberId: string, syncFrom: string) {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "membersSyncRemote"
+             WHERE "integrationId" = :integrationId and "memberId" = :memberId and "syncFrom" = :syncFrom;
+            `,
+      {
+        replacements: {
+          integrationId,
+          memberId,
+          syncFrom,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+
+  async startManualSync(id: string, sourceId: string) {
+    await this.options.database.sequelize.query(
+      `update "membersSyncRemote" set status = :status, "sourceId" = :sourceId where "id" = :id
+        `,
+      {
+        replacements: {
+          status: SyncStatus.ACTIVE,
+          id,
+          sourceId,
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
   async stopMemberManualSync(memberId: string) {
     await this.options.database.sequelize.query(
       `update "membersSyncRemote" set status = :status where "memberId" = :memberId and "syncFrom" = :manualSync
@@ -51,6 +89,17 @@ class MemberSyncRemoteRepository extends RepositoryBase<
       data.sourceId = existingSyncRemote.sourceId
     }
 
+    const existingManualSyncRemote = await this.findRemoteSync(
+      data.integrationId,
+      data.memberId,
+      data.syncFrom,
+    )
+
+    if (existingManualSyncRemote) {
+      await this.startManualSync(existingManualSyncRemote.id, data.sourceId)
+      return existingManualSyncRemote.id
+    }
+
     const memberSyncRemoteInserted = await this.options.database.sequelize.query(
       `insert into "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           values
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 5fa00bd7fc..dbc6ed08e1 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -44,6 +44,44 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     )
   }
 
+  async startManualSync(id: string, sourceId: string) {
+    await this.options.database.sequelize.query(
+      `update "organizationsSyncRemote" set status = :status, "sourceId" = :sourceId where "id" = :id
+        `,
+      {
+        replacements: {
+          status: SyncStatus.ACTIVE,
+          id,
+          sourceId,
+        },
+        type: QueryTypes.UPDATE,
+      },
+    )
+  }
+
+  async findRemoteSync(integrationId: string, organizationId: string, syncFrom: string) {
+    const records = await this.options.database.sequelize.query(
+      `SELECT *
+             FROM "organizationsSyncRemote"
+             WHERE "integrationId" = :integrationId and "organizationId" = :organizationId and "syncFrom" = :syncFrom;
+            `,
+      {
+        replacements: {
+          integrationId,
+          organizationId,
+          syncFrom,
+        },
+        type: QueryTypes.SELECT,
+      },
+    )
+
+    if (records.length === 0) {
+      return null
+    }
+
+    return records[0]
+  }
+
   async markOrganizationForSyncing(
     data: IOrganizationSyncRemoteData,
   ): Promise<IOrganizationSyncRemoteData> {
@@ -53,13 +91,21 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
       data.sourceId = existingSyncRemote.sourceId
     }
 
+    const existingManualSyncRemote = await this.findRemoteSync(
+      data.integrationId,
+      data.organizationId,
+      data.syncFrom,
+    )
+
+    if (existingManualSyncRemote) {
+      await this.startManualSync(existingManualSyncRemote.id, data.sourceId)
+      return existingManualSyncRemote.id
+    }
+
     const organizationSyncRemoteInserted = await this.options.database.sequelize.query(
       `insert into "organizationsSyncRemote" ("id", "organizationId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           VALUES
               (:id, :organizationId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-              on conflict ("organizationId", "integrationId", "syncFrom")
-              do update 
-              set "id" = EXCLUDED."id" 
           returning "id"
         `,
       {

From 483926bcf670d9fa7656ea7f5a2e12577f299f9a Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sat, 5 Aug 2023 00:38:56 +0200
Subject: [PATCH 34/42] on conflict check also removed from members sync remote
 repo

---
 .../src/database/repositories/memberSyncRemoteRepository.ts    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 69a6557fbd..296acc483b 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -104,9 +104,6 @@ class MemberSyncRemoteRepository extends RepositoryBase<
       `insert into "membersSyncRemote" ("id", "memberId", "sourceId", "integrationId", "syncFrom", "metaData", "lastSyncedAt", "status")
           values
               (:id, :memberId, :sourceId, :integrationId, :syncFrom, :metaData, :lastSyncedAt, :status)
-          on conflict ("integrationId", "memberId", "syncFrom")
-          do update 
-              set "id" = EXCLUDED."id" 
           returning "id"
         `,
       {

From cdf030a960b88b106d00bae5b0188a803c9c63c2 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sat, 5 Aug 2023 01:07:23 +0200
Subject: [PATCH 35/42] null sourceIds handled on syncRemote repo

---
 backend/src/database/repositories/memberSyncRemoteRepository.ts | 2 +-
 .../database/repositories/organizationSyncRemoteRepository.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 296acc483b..c655a42b99 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -60,7 +60,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
         replacements: {
           status: SyncStatus.ACTIVE,
           id,
-          sourceId,
+          sourceId: sourceId || null,
         },
         type: QueryTypes.UPDATE,
       },
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index dbc6ed08e1..43b6794565 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -52,7 +52,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
         replacements: {
           status: SyncStatus.ACTIVE,
           id,
-          sourceId,
+          sourceId: sourceId || null,
         },
         type: QueryTypes.UPDATE,
       },

From 322d8013d0d8c6a505f0f81c4e6eb53089b6275c Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sat, 5 Aug 2023 21:19:32 +0200
Subject: [PATCH 36/42] transaction management with hubspot sync endpoints

---
 .../memberSyncRemoteRepository.ts             |  16 ++
 .../organizationSyncRemoteRepository.ts       |  16 ++
 backend/src/services/integrationService.ts    | 239 ++++++++++--------
 backend/src/services/memberService.ts         |  12 +-
 backend/src/services/organizationService.ts   |   9 +-
 5 files changed, 184 insertions(+), 108 deletions(-)

diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index c655a42b99..ddd131abcb 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -3,6 +3,7 @@ import { IMemberSyncRemoteData, SyncStatus } from '@crowd/types'
 import { QueryTypes } from 'sequelize'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import { RepositoryBase } from './repositoryBase'
+import SequelizeRepository from './sequelizeRepository'
 
 class MemberSyncRemoteRepository extends RepositoryBase<
   IMemberSyncRemoteData,
@@ -30,6 +31,8 @@ class MemberSyncRemoteRepository extends RepositoryBase<
   }
 
   async findRemoteSync(integrationId: string, memberId: string, syncFrom: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "membersSyncRemote"
@@ -42,6 +45,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
           syncFrom,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
@@ -53,6 +57,8 @@ class MemberSyncRemoteRepository extends RepositoryBase<
   }
 
   async startManualSync(id: string, sourceId: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     await this.options.database.sequelize.query(
       `update "membersSyncRemote" set status = :status, "sourceId" = :sourceId where "id" = :id
         `,
@@ -63,6 +69,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
           sourceId: sourceId || null,
         },
         type: QueryTypes.UPDATE,
+        transaction,
       },
     )
   }
@@ -83,6 +90,8 @@ class MemberSyncRemoteRepository extends RepositoryBase<
   }
 
   async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const existingSyncRemote = await this.findByMemberId(data.memberId)
 
     if (existingSyncRemote) {
@@ -118,6 +127,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
           status: SyncStatus.ACTIVE,
         },
         type: QueryTypes.INSERT,
+        transaction,
       },
     )
 
@@ -126,6 +136,8 @@ class MemberSyncRemoteRepository extends RepositoryBase<
   }
 
   async findByMemberId(memberId: string): Promise<IMemberSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "membersSyncRemote"
@@ -138,6 +150,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
           memberId,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
@@ -149,6 +162,8 @@ class MemberSyncRemoteRepository extends RepositoryBase<
   }
 
   async findById(id: string): Promise<IMemberSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "membersSyncRemote"
@@ -159,6 +174,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
           id,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 43b6794565..05f94f66e1 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -3,6 +3,7 @@ import { IOrganizationSyncRemoteData, SyncStatus } from '@crowd/types'
 import { QueryTypes } from 'sequelize'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import { RepositoryBase } from './repositoryBase'
+import SequelizeRepository from './sequelizeRepository'
 
 class OrganizationSyncRemoteRepository extends RepositoryBase<
   IOrganizationSyncRemoteData,
@@ -45,6 +46,8 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
   }
 
   async startManualSync(id: string, sourceId: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     await this.options.database.sequelize.query(
       `update "organizationsSyncRemote" set status = :status, "sourceId" = :sourceId where "id" = :id
         `,
@@ -55,11 +58,14 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
           sourceId: sourceId || null,
         },
         type: QueryTypes.UPDATE,
+        transaction,
       },
     )
   }
 
   async findRemoteSync(integrationId: string, organizationId: string, syncFrom: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "organizationsSyncRemote"
@@ -72,6 +78,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
           syncFrom,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
@@ -85,6 +92,8 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
   async markOrganizationForSyncing(
     data: IOrganizationSyncRemoteData,
   ): Promise<IOrganizationSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const existingSyncRemote = await this.findByOrganizationId(data.organizationId)
 
     if (existingSyncRemote) {
@@ -120,6 +129,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
           status: SyncStatus.ACTIVE,
         },
         type: QueryTypes.INSERT,
+        transaction,
       },
     )
 
@@ -128,6 +138,8 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
   }
 
   async findByOrganizationId(organizationId: string): Promise<IOrganizationSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "organizationsSyncRemote"
@@ -140,6 +152,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
           organizationId,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
@@ -151,6 +164,8 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
   }
 
   async findById(id: string): Promise<IOrganizationSyncRemoteData> {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
     const records = await this.options.database.sequelize.query(
       `SELECT *
              FROM "organizationsSyncRemote"
@@ -161,6 +176,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
           id,
         },
         type: QueryTypes.SELECT,
+        transaction,
       },
     )
 
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index dcf2d37d46..4f0598c0a2 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -35,6 +35,7 @@ import { IntegrationRunState } from '../types/integrationRunTypes'
 import {
   getIntegrationRunWorkerEmitter,
   getIntegrationSyncWorkerEmitter,
+  getSearchSyncWorkerEmitter,
 } from '../serverless/utils/serviceSQS'
 import MemberAttributeSettingsRepository from '../database/repositories/memberAttributeSettingsRepository'
 import TenantRepository from '../database/repositories/tenantRepository'
@@ -42,6 +43,7 @@ import MemberService from './memberService'
 import OrganizationService from './organizationService'
 import MemberSyncRemoteRepository from '@/database/repositories/memberSyncRemoteRepository'
 import OrganizationSyncRemoteRepository from '@/database/repositories/organizationSyncRemoteRepository'
+import MemberRepository from '@/database/repositories/memberRepository'
 
 const discordToken = DISCORD_CONFIG.token2 || DISCORD_CONFIG.token
 
@@ -471,25 +473,38 @@ export default class IntegrationService {
       throw new Error('memberId is required in the payload while syncing member to hubspot!')
     }
 
-    // update member.attributes.syncRemote.hubspot to false
-    const memberService = new MemberService(this.options)
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+
+    try {
+      // update member.attributes.syncRemote.hubspot to false
+      const memberService = new MemberService(this.options)
 
-    const member = await memberService.findById(payload.memberId)
+      const member = await memberService.findById(payload.memberId)
 
-    if (!member.attributes.syncRemote) {
-      member.attributes.syncRemote = {
-        default: false,
-        [PlatformType.HUBSPOT]: false,
+      if (!member.attributes.syncRemote) {
+        member.attributes.syncRemote = {
+          default: false,
+          [PlatformType.HUBSPOT]: false,
+        }
+      } else {
+        member.attributes.syncRemote[PlatformType.HUBSPOT] = false
+        member.attributes.syncRemote.default = false
       }
-    } else {
-      member.attributes.syncRemote[PlatformType.HUBSPOT] = false
-      member.attributes.syncRemote.default = false
-    }
 
-    await memberService.update(payload.memberId, { attributes: member.attributes })
+      await memberService.update(payload.memberId, { attributes: member.attributes }, transaction)
 
-    const memberSyncRemoteRepository = new MemberSyncRemoteRepository(this.options)
-    await memberSyncRemoteRepository.stopMemberManualSync(member.id)
+      const memberSyncRemoteRepository = new MemberSyncRemoteRepository({
+        ...this.options,
+        transaction,
+      })
+      await memberSyncRemoteRepository.stopMemberManualSync(member.id)
+
+      await SequelizeRepository.commitTransaction(transaction)
+    } catch (err) {
+      this.options.log.error(err, 'Error while stopping hubspot member sync!')
+      await SequelizeRepository.rollbackTransaction(transaction)
+      throw err
+    }
   }
 
   async hubspotSyncMember(payload: IHubspotManualSyncPayload) {
@@ -497,45 +512,42 @@ export default class IntegrationService {
       throw new Error('memberId is required in the payload while syncing member to hubspot!')
     }
 
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+
     let integration
+    let member
+    let memberSyncRemote
 
     try {
       integration = await IntegrationRepository.findByPlatform(PlatformType.HUBSPOT, {
         ...this.options,
+        transaction,
       })
-    } catch (err) {
-      this.options.log.error(err, 'Error while fetching HubSpot integration from DB!')
-      throw new Error404()
-    }
-    // update member.attributes.syncRemote.hubspot to true
-    const memberService = new MemberService(this.options)
 
-    const member = await memberService.findById(payload.memberId)
+      member = await MemberRepository.findById(payload.memberId, { ...this.options, transaction })
 
-    if (!member.attributes.syncRemote) {
-      member.attributes.syncRemote = {
-        default: true,
-        [PlatformType.HUBSPOT]: true,
+      if (!member.attributes.syncRemote) {
+        member.attributes.syncRemote = {
+          default: true,
+          [PlatformType.HUBSPOT]: true,
+        }
+      } else {
+        member.attributes.syncRemote[PlatformType.HUBSPOT] = true
+        member.attributes.syncRemote.default = true
       }
-    } else {
-      member.attributes.syncRemote[PlatformType.HUBSPOT] = true
-      member.attributes.syncRemote.default = true
-    }
 
-    const memberSyncRemoteRepo = new MemberSyncRemoteRepository(this.options)
+      const memberSyncRemoteRepo = new MemberSyncRemoteRepository({ ...this.options, transaction })
 
-    const memberSyncRemote = await memberSyncRemoteRepo.markMemberForSyncing({
-      integrationId: integration.id,
-      memberId: member.id,
-      metaData: null,
-      syncFrom: 'manual',
-      lastSyncedAt: null,
-    })
+      memberSyncRemote = await memberSyncRemoteRepo.markMemberForSyncing({
+        integrationId: integration.id,
+        memberId: member.id,
+        metaData: null,
+        syncFrom: 'manual',
+        lastSyncedAt: null,
+      })
 
-    const transaction = await SequelizeRepository.createTransaction(this.options)
+      const memberService = new MemberService(this.options)
 
-    // set integration.settings.syncRemoteEnabled to true, and mark member as syncRemote
-    try {
       integration = await this.createOrUpdate(
         {
           platform: PlatformType.HUBSPOT,
@@ -546,10 +558,12 @@ export default class IntegrationService {
         },
         transaction,
       )
-      await memberService.update(payload.memberId, { attributes: member.attributes })
+
+      await memberService.update(payload.memberId, { attributes: member.attributes }, transaction)
 
       await SequelizeRepository.commitTransaction(transaction)
     } catch (err) {
+      this.options.log.error(err, 'Error while starting Hubspot member sync!')
       await SequelizeRepository.rollbackTransaction(transaction)
       throw err
     }
@@ -561,6 +575,10 @@ export default class IntegrationService {
       payload.memberId,
       memberSyncRemote.id,
     )
+
+    // send it to opensearch because in member.update we bypass while passing transactions
+    const searchSyncEmitter = await getSearchSyncWorkerEmitter()
+    await searchSyncEmitter.triggerMemberSync(this.options.currentTenant.id, member.id)
   }
 
   async hubspotStopSyncOrganization(payload: IHubspotManualSyncPayload) {
@@ -570,27 +588,42 @@ export default class IntegrationService {
       )
     }
 
-    // update organization.attributes.syncRemote.hubspot to false
-    const organizationService = new OrganizationService(this.options)
+    const transaction = await SequelizeRepository.createTransaction(this.options)
 
-    const organization = await organizationService.findById(payload.organizationId)
+    try {
+      // update organization.attributes.syncRemote.hubspot to false
+      const organizationService = new OrganizationService(this.options)
+
+      const organization = await organizationService.findById(payload.organizationId)
 
-    if (!organization.attributes.syncRemote) {
-      organization.attributes.syncRemote = {
-        default: false,
-        [PlatformType.HUBSPOT]: false,
+      if (!organization.attributes.syncRemote) {
+        organization.attributes.syncRemote = {
+          default: false,
+          [PlatformType.HUBSPOT]: false,
+        }
+      } else {
+        organization.attributes.syncRemote[PlatformType.HUBSPOT] = false
+        organization.attributes.syncRemote.default = false
       }
-    } else {
-      organization.attributes.syncRemote[PlatformType.HUBSPOT] = false
-      organization.attributes.syncRemote.default = false
-    }
 
-    await organizationService.update(payload.organizationId, {
-      attributes: organization.attributes,
-    })
+      await organizationService.update(
+        payload.organizationId,
+        {
+          attributes: organization.attributes,
+        },
+        transaction,
+      )
 
-    const organizationSyncRemoteRepository = new OrganizationSyncRemoteRepository(this.options)
-    await organizationSyncRemoteRepository.stopOrganizationManualSync(organization.id)
+      const organizationSyncRemoteRepository = new OrganizationSyncRemoteRepository({
+        ...this.options,
+        transaction,
+      })
+      await organizationSyncRemoteRepository.stopOrganizationManualSync(organization.id)
+    } catch (err) {
+      this.options.log.error(err, 'Error while stopping Hubspot organization sync!')
+      await SequelizeRepository.rollbackTransaction(transaction)
+      throw err
+    }
   }
 
   async hubspotSyncOrganization(payload: IHubspotManualSyncPayload) {
@@ -600,52 +633,53 @@ export default class IntegrationService {
       )
     }
 
+    const transaction = await SequelizeRepository.createTransaction(this.options)
+
     let integration
+    let organization
+    let organizationSyncRemote
 
     try {
       integration = await IntegrationRepository.findByPlatform(PlatformType.HUBSPOT, {
         ...this.options,
+        transaction,
       })
-    } catch (err) {
-      this.options.log.error(err, 'Error while fetching HubSpot integration from DB!')
-      throw new Error404()
-    }
-    // update organization.attributes.syncRemote.hubspot to true
-    const organizationService = new OrganizationService(this.options)
 
-    const organization = await organizationService.findById(payload.organizationId)
+      // update organization.attributes.syncRemote.hubspot to true
+      const organizationService = new OrganizationService(this.options)
+
+      organization = await organizationService.findById(payload.organizationId)
 
-    if (!organization.attributes) {
-      organization.attributes = {
-        syncRemote: {
+      if (!organization.attributes) {
+        organization.attributes = {
+          syncRemote: {
+            default: true,
+            [PlatformType.HUBSPOT]: true,
+          },
+        }
+      } else if (!organization.attributes.syncRemote) {
+        organization.attributes.syncRemote = {
           default: true,
           [PlatformType.HUBSPOT]: true,
-        },
-      }
-    } else if (!organization.attributes.syncRemote) {
-      organization.attributes.syncRemote = {
-        default: true,
-        [PlatformType.HUBSPOT]: true,
+        }
+      } else {
+        organization.attributes.syncRemote[PlatformType.HUBSPOT] = true
+        organization.attributes.syncRemote.default = true
       }
-    } else {
-      organization.attributes.syncRemote[PlatformType.HUBSPOT] = true
-      organization.attributes.syncRemote.default = true
-    }
-
-    const organizationSyncRemoteRepo = new OrganizationSyncRemoteRepository(this.options)
 
-    const organizationSyncRemote = await organizationSyncRemoteRepo.markOrganizationForSyncing({
-      integrationId: integration.id,
-      organizationId: organization.id,
-      metaData: null,
-      syncFrom: 'manual',
-      lastSyncedAt: null,
-    })
+      const organizationSyncRemoteRepo = new OrganizationSyncRemoteRepository({
+        ...this.options,
+        transaction,
+      })
 
-    const transaction = await SequelizeRepository.createTransaction(this.options)
+      organizationSyncRemote = await organizationSyncRemoteRepo.markOrganizationForSyncing({
+        integrationId: integration.id,
+        organizationId: organization.id,
+        metaData: null,
+        syncFrom: 'manual',
+        lastSyncedAt: null,
+      })
 
-    // set integration.settings.syncRemoteEnabled to true, and mark organization as syncRemote
-    try {
       integration = await this.createOrUpdate(
         {
           platform: PlatformType.HUBSPOT,
@@ -656,23 +690,28 @@ export default class IntegrationService {
         },
         transaction,
       )
-      await organizationService.update(payload.organizationId, {
-        attributes: organization.attributes,
-      })
+      await organizationService.update(
+        payload.organizationId,
+        {
+          attributes: organization.attributes,
+        },
+        transaction,
+      )
 
       await SequelizeRepository.commitTransaction(transaction)
+
+      const integrationSyncWorkerEmitter = await getIntegrationSyncWorkerEmitter()
+      await integrationSyncWorkerEmitter.triggerSyncOrganization(
+        this.options.currentTenant.id,
+        integration.id,
+        payload.organizationId,
+        organizationSyncRemote.id,
+      )
     } catch (err) {
+      this.options.log.error(err, 'Error while starting Hubspot organization sync!')
       await SequelizeRepository.rollbackTransaction(transaction)
       throw err
     }
-
-    const integrationSyncWorkerEmitter = await getIntegrationSyncWorkerEmitter()
-    await integrationSyncWorkerEmitter.triggerSyncOrganization(
-      this.options.currentTenant.id,
-      integration.id,
-      payload.organizationId,
-      organizationSyncRemote.id,
-    )
   }
 
   async hubspotOnboard(onboardSettings: IHubspotOnboardingSettings) {
diff --git a/backend/src/services/memberService.ts b/backend/src/services/memberService.ts
index c8fd293d3d..989c5c8200 100644
--- a/backend/src/services/memberService.ts
+++ b/backend/src/services/memberService.ts
@@ -834,8 +834,9 @@ export default class MemberService extends LoggerBase {
     }
   }
 
-  async update(id, data) {
-    const transaction = await SequelizeRepository.createTransaction(this.options)
+  async update(id, data, passedTransaction?) {
+    const transaction =
+      passedTransaction || (await SequelizeRepository.createTransaction(this.options))
     const searchSyncEmitter = await getSearchSyncWorkerEmitter()
 
     try {
@@ -905,9 +906,10 @@ export default class MemberService extends LoggerBase {
         transaction,
       })
 
-      await SequelizeRepository.commitTransaction(transaction)
-
-      await searchSyncEmitter.triggerMemberSync(this.options.currentTenant.id, record.id)
+      if (!passedTransaction) {
+        await SequelizeRepository.commitTransaction(transaction)
+        await searchSyncEmitter.triggerMemberSync(this.options.currentTenant.id, record.id)
+      }
 
       return record
     } catch (error) {
diff --git a/backend/src/services/organizationService.ts b/backend/src/services/organizationService.ts
index ade9b550c2..a52e05d126 100644
--- a/backend/src/services/organizationService.ts
+++ b/backend/src/services/organizationService.ts
@@ -130,8 +130,9 @@ export default class OrganizationService extends LoggerBase {
     }
   }
 
-  async update(id, data) {
-    const transaction = await SequelizeRepository.createTransaction(this.options)
+  async update(id, data, passedTransaction?) {
+    const transaction =
+      passedTransaction || (await SequelizeRepository.createTransaction(this.options))
 
     try {
       if (data.members) {
@@ -146,7 +147,9 @@ export default class OrganizationService extends LoggerBase {
         transaction,
       })
 
-      await SequelizeRepository.commitTransaction(transaction)
+      if (!passedTransaction) {
+        await SequelizeRepository.commitTransaction(transaction)
+      }
 
       return record
     } catch (error) {

From cda06b8feabb8e575ce83372f359e9f31ced64d3 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sun, 6 Aug 2023 00:12:36 +0200
Subject: [PATCH 37/42] core review points, automation deletion fixes,, bug
 fixes

---
 .../automationExecutionRepository.ts          | 23 +++++++++++
 .../memberSyncRemoteRepository.ts             | 19 +++++++++
 .../organizationSyncRemoteRepository.ts       | 19 +++++++++
 backend/src/services/automationService.ts     | 24 +++++++++++-
 .../src/repo/automation.repo.ts               | 39 +++++++++++++------
 .../src/repo/member.repo.ts                   |  2 +
 .../src/repo/organization.repo.ts             |  2 +
 .../src/service/organization.sync.service.ts  |  6 ++-
 .../premium/hubspot/api/batchCreateMembers.ts |  4 +-
 .../hubspot/api/batchCreateOrganizations.ts   |  4 +-
 .../hubspot/field-mapper/memberFieldMapper.ts |  1 +
 11 files changed, 123 insertions(+), 20 deletions(-)

diff --git a/backend/src/database/repositories/automationExecutionRepository.ts b/backend/src/database/repositories/automationExecutionRepository.ts
index 0cdacdfd60..a2482c0d88 100644
--- a/backend/src/database/repositories/automationExecutionRepository.ts
+++ b/backend/src/database/repositories/automationExecutionRepository.ts
@@ -137,6 +137,29 @@ export default class AutomationExecutionRepository extends RepositoryBase<
     throw new Error('Method not implemented.')
   }
 
+  async destroyAllAutomation(automationIds: string[]): Promise<void> {
+    const transaction = this.transaction
+
+    const seq = this.seq
+
+    const currentTenant = this.currentTenant
+
+    const query = `
+    delete 
+    from "automationExecutions"
+    where "automationId" in (:automationIds)
+      and "tenantId" = :tenantId;`
+
+    await seq.query(query, {
+      replacements: {
+        automationIds,
+        tenantId: currentTenant.id,
+      },
+      type: QueryTypes.DELETE,
+      transaction,
+    })
+  }
+
   override async destroyAll(ids: string[]): Promise<void> {
     throw new Error('Method not implemented.')
   }
diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index ddd131abcb..e774de5d2c 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -89,6 +89,25 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     )
   }
 
+  async destroyAllAutomation(automationIds: string[]): Promise<void> {
+    const transaction = this.transaction
+
+    const seq = this.seq
+
+    const query = `
+    delete 
+    from "membersSyncRemote"
+    where "syncFrom" in (:automationIds);`
+
+    await seq.query(query, {
+      replacements: {
+        automationIds,
+      },
+      type: QueryTypes.DELETE,
+      transaction,
+    })
+  }
+
   async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 05f94f66e1..e013ae7bc5 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -137,6 +137,25 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     return organizationSyncRemote
   }
 
+  async destroyAllAutomation(automationIds: string[]): Promise<void> {
+    const transaction = this.transaction
+
+    const seq = this.seq
+
+    const query = `
+    delete 
+    from "organizationsSyncRemote"
+    where "syncFrom" in (:automationIds);`
+
+    await seq.query(query, {
+      replacements: {
+        automationIds,
+      },
+      type: QueryTypes.DELETE,
+      transaction,
+    })
+  }
+
   async findByOrganizationId(organizationId: string): Promise<IOrganizationSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 
diff --git a/backend/src/services/automationService.ts b/backend/src/services/automationService.ts
index 54a79a0bfc..fcd6aca4ee 100644
--- a/backend/src/services/automationService.ts
+++ b/backend/src/services/automationService.ts
@@ -17,6 +17,7 @@ import IntegrationRepository from '@/database/repositories/integrationRepository
 import Error404 from '@/errors/Error404'
 import MemberSyncRemoteRepository from '@/database/repositories/memberSyncRemoteRepository'
 import OrganizationSyncRemoteRepository from '@/database/repositories/organizationSyncRemoteRepository'
+import AutomationExecutionRepository from '@/database/repositories/automationExecutionRepository'
 
 export default class AutomationService extends ServiceBase<
   AutomationData,
@@ -44,8 +45,6 @@ export default class AutomationService extends ServiceBase<
         state: AutomationState.ACTIVE,
       })
 
-      await SequelizeRepository.commitTransaction(txOptions.transaction)
-
       // check automation type, if hubspot trigger an automation onboard
       if (req.type === AutomationType.HUBSPOT) {
         let integration
@@ -59,6 +58,18 @@ export default class AutomationService extends ServiceBase<
           throw new Error404()
         }
 
+        // enable sync remote for integration
+        integration = await IntegrationRepository.update(
+          integration.id,
+          {
+            settings: {
+              ...integration.settings,
+              syncRemoteEnabled: true,
+            },
+          },
+          txOptions,
+        )
+
         const integrationSyncWorkerEmitter = await getIntegrationSyncWorkerEmitter()
         await integrationSyncWorkerEmitter.triggerOnboardAutomation(
           this.options.currentTenant.id,
@@ -68,6 +79,8 @@ export default class AutomationService extends ServiceBase<
         )
       }
 
+      await SequelizeRepository.commitTransaction(txOptions.transaction)
+
       return result
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(txOptions.transaction)
@@ -160,6 +173,13 @@ export default class AutomationService extends ServiceBase<
     const txOptions = await this.getTxRepositoryOptions()
 
     try {
+      // delete automation executions
+      await new AutomationExecutionRepository(txOptions).destroyAllAutomation(ids)
+
+      // delete syncRemote rows coming from automations
+      await new MemberSyncRemoteRepository(txOptions).destroyAllAutomation(ids)
+      await new OrganizationSyncRemoteRepository(txOptions).destroyAllAutomation(ids)
+
       const result = await new AutomationRepository(txOptions).destroyAll(ids)
       await SequelizeRepository.commitTransaction(txOptions.transaction)
       return result
diff --git a/services/apps/integration_run_worker/src/repo/automation.repo.ts b/services/apps/integration_run_worker/src/repo/automation.repo.ts
index 2786bd21ca..a5888171b6 100644
--- a/services/apps/integration_run_worker/src/repo/automation.repo.ts
+++ b/services/apps/integration_run_worker/src/repo/automation.repo.ts
@@ -11,18 +11,33 @@ export class AutomationRepository extends RepositoryBase<AutomationRepository> {
     tenantId: string,
     platform: string,
   ): Promise<IAutomation[] | null> {
-    const results = await this.db().any(
-      `select * from automations where type = $(platform) and "tenantId" = $(tenantId) and trigger in ($(syncAutomationTriggers:csv))`,
-      {
-        tenantId,
-        platform,
-        syncAutomationTriggers: [
-          AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
-          AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
-        ],
-      },
-    )
+    const pageSize = 10
+    const syncAutomations: IAutomation[] = []
 
-    return results
+    let results
+    let offset
+
+    do {
+      offset = results ? pageSize + offset : 0
+      results = await this.db().any(
+        `select * from automations 
+         where type = $(platform) and "tenantId" = $(tenantId) and trigger in ($(syncAutomationTriggers:csv))
+         limit $(limit) offset $(offset)`,
+        {
+          tenantId,
+          platform,
+          syncAutomationTriggers: [
+            AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
+            AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
+          ],
+          limit: pageSize,
+          offset,
+        },
+      )
+
+      syncAutomations.push(...results)
+    } while (results.length > 0)
+
+    return syncAutomations
   }
 }
diff --git a/services/apps/integration_sync_worker/src/repo/member.repo.ts b/services/apps/integration_sync_worker/src/repo/member.repo.ts
index 466a44df61..594fbda738 100644
--- a/services/apps/integration_sync_worker/src/repo/member.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/member.repo.ts
@@ -179,6 +179,8 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
       `select distinct "memberId", "sourceId"
         from "membersSyncRemote"
         where status = $(status)
+        and "integrationId" = $(integrationId)
+        and "memberId" is not null
         order by "memberId", "sourceId"
         limit $(limit) offset $(offset)`,
       {
diff --git a/services/apps/integration_sync_worker/src/repo/organization.repo.ts b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
index 2324366be2..21113d8ff7 100644
--- a/services/apps/integration_sync_worker/src/repo/organization.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
@@ -66,6 +66,8 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
       `select distinct "organizationId", "sourceId"
         from "organizationsSyncRemote"
         where status = $(status)
+        and "integrationId" = $(integrationId)
+        and "organizationId" is not null
         order by "organizationId", "sourceId"
         limit $(limit) offset $(offset)`,
       {
diff --git a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
index 56e54f4c97..8405c02a40 100644
--- a/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
+++ b/services/apps/integration_sync_worker/src/service/organization.sync.service.ts
@@ -106,16 +106,18 @@ export class OrganizationSyncService extends LoggerBase {
 
       for (const organizationToSync of markedOrganizations) {
         this.log.trace(
-          `Syncing organization ${organizationToSync.id} to ${integration.platform} remote!`,
+          `Syncing organization ${organizationToSync.organizationId} to ${integration.platform} remote!`,
         )
 
         const organization = await this.organizationRepo.findOrganization(
-          organizationToSync.id,
+          organizationToSync.organizationId,
           tenantId,
         )
 
         if (organizationToSync.sourceId) {
           // append sourceId to object - it'll be used for updating the remote counterpart
+          organization.attributes = organization.attributes || {}
+
           organization.attributes = {
             ...organization.attributes,
             sourceId: {
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
index 71fbda2ae6..35e72de4d0 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
@@ -106,9 +106,9 @@ export const batchCreateMembers = async (
     // this means that member actually exists in hubspot but we tried re-creating it
     // handle it gracefully
     if (err.response?.data?.category === 'CONFLICT') {
-      ctx.log.warn(
+      ctx.log.info(
         { err },
-        'Conflict while batch create contacts in HubSpot. Trying to resolve the conflicts...',
+        'Conflict while batch create contacts in HubSpot. Trying to resolve the conflicts.',
       )
       const match = err.response?.data?.message.match(/ID: (\d+)/)
       const id = match ? match[1] : null
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
index ac088c33e4..6f2873d7e0 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateOrganizations.ts
@@ -31,7 +31,7 @@ export const batchCreateOrganizations = async (
 
     for (const organization of organizations) {
       if (!organization.website || !getOrganizationDomain(organization.website)) {
-        ctx.log.warn(
+        ctx.log.info(
           `Organization ${organization.id} can't be created in hubspot! Organization doesn't have any associated website or domain can't be derived from existing website.`,
         )
       } else {
@@ -97,7 +97,7 @@ export const batchCreateOrganizations = async (
     if (err.response?.data?.category === 'CONFLICT') {
       ctx.log.warn(
         { err },
-        'Conflict while batch create companies in HubSpot. Trying to resolve the conflicts...',
+        'Conflict while batch create companies in HubSpot. Trying to resolve the conflicts.',
       )
       const match = err.response?.data?.message.match(/ID: (\d+)/)
       const id = match ? match[1] : null
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/memberFieldMapper.ts b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/memberFieldMapper.ts
index 0717b2383b..27574131bf 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/memberFieldMapper.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/field-mapper/memberFieldMapper.ts
@@ -162,6 +162,7 @@ export class HubspotMemberFieldMapper extends HubspotFieldMapper {
         {
           platform: PlatformType.HUBSPOT,
           username: contactProperties.email,
+          sourceId: hubspotContact.id,
         },
       ],
       attributes: {

From fee1737fc9e869d7fccde9b08ab068871a0c6328 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sun, 6 Aug 2023 12:05:59 +0200
Subject: [PATCH 38/42] 409 conflict resolve filtering wrong field fixed

---
 .../integrations/premium/hubspot/api/batchCreateMembers.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
index 35e72de4d0..083488a227 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
@@ -118,11 +118,11 @@ export const batchCreateMembers = async (
         if (member) {
           // exclude found member from batch payload
           const createMembers = members.filter(
-            (m) => !m.emails.includes((member.properties as any).crowd_emails),
+            (m) => !m.emails.includes((member.properties as any).email),
           )
 
           const updateMembers = members
-            .filter((m) => m.emails.includes((member.properties as any).crowd_emails))
+            .filter((m) => m.emails.includes((member.properties as any).email))
             .map((m) => {
               m.attributes = {
                 ...m.attributes,

From 69a85e0e13da6a0b981a1e433767de91935a993b Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sun, 6 Aug 2023 12:29:00 +0200
Subject: [PATCH 39/42] case insensitive conflict handle

---
 .../premium/hubspot/api/batchCreateMembers.ts         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
index 083488a227..d37bff60ce 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/api/batchCreateMembers.ts
@@ -118,11 +118,18 @@ export const batchCreateMembers = async (
         if (member) {
           // exclude found member from batch payload
           const createMembers = members.filter(
-            (m) => !m.emails.includes((member.properties as any).email),
+            (m) =>
+              !m.emails
+                .map((email) => email.toLowerCase())
+                .includes((member.properties as any).email.toLowerCase()),
           )
 
           const updateMembers = members
-            .filter((m) => m.emails.includes((member.properties as any).email))
+            .filter((m) =>
+              m.emails
+                .map((email) => email.toLowerCase())
+                .includes((member.properties as any).email.toLowerCase()),
+            )
             .map((m) => {
               m.attributes = {
                 ...m.attributes,

From c2c43684f75c7da0ed2e2455865e914144d7552a Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Sun, 6 Aug 2023 17:05:39 +0200
Subject: [PATCH 40/42] empty filter fix for organization filters

---
 .../apps/integration_sync_worker/src/repo/organization.repo.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/apps/integration_sync_worker/src/repo/organization.repo.ts b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
index 21113d8ff7..9a5356f23c 100644
--- a/services/apps/integration_sync_worker/src/repo/organization.repo.ts
+++ b/services/apps/integration_sync_worker/src/repo/organization.repo.ts
@@ -175,7 +175,7 @@ export class OrganizationRepository extends RepositoryBase<OrganizationRepositor
       params,
     )
 
-    if (filterString.trim().length === 0) {
+    if (filterString.trim().length === 0 || filterString === '()') {
       filterString = '1=1'
     } else {
       filterString = OrganizationRepository.replaceParametersWithDollarSign(filterString)

From 1bfee55a78e1436641ae0fea75eb49cc6ea922ce Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Mon, 7 Aug 2023 17:07:06 +0200
Subject: [PATCH 41/42] disconnecting integration also deletes related sync
 automations, executions and syncRemote rows

---
 .../repositories/automationRepository.ts      | 43 +++++++++++++++++++
 .../repositories/integrationRepository.ts     | 28 ++++++++++++
 .../memberSyncRemoteRepository.ts             | 19 ++++++++
 .../organizationSyncRemoteRepository.ts       | 19 ++++++++
 4 files changed, 109 insertions(+)

diff --git a/backend/src/database/repositories/automationRepository.ts b/backend/src/database/repositories/automationRepository.ts
index 45b90469f1..b6a10812bd 100644
--- a/backend/src/database/repositories/automationRepository.ts
+++ b/backend/src/database/repositories/automationRepository.ts
@@ -1,4 +1,5 @@
 import Sequelize, { QueryTypes } from 'sequelize'
+import { AutomationSyncTrigger, IAutomation } from '@crowd/types'
 import AuditLogRepository from './auditLogRepository'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import Error404 from '../../errors/Error404'
@@ -246,4 +247,46 @@ export default class AutomationRepository extends RepositoryBase<
 
     return automationCount
   }
+
+  public async findSyncAutomations(
+    tenantId: string,
+    platform: string,
+  ): Promise<IAutomation[] | null> {
+    const seq = this.seq
+
+    const transaction = this.transaction
+
+    const pageSize = 10
+    const syncAutomations: IAutomation[] = []
+
+    let results
+    let offset
+
+    do {
+      offset = results ? pageSize + offset : 0
+
+      results = await seq.query(
+        `select * from automations 
+      where type = :platform and "tenantId" = :tenantId and trigger in (:syncAutomationTriggers)
+      limit :limit offset :offset`,
+        {
+          replacements: {
+            tenantId,
+            platform,
+            syncAutomationTriggers: [
+              AutomationSyncTrigger.MEMBER_ATTRIBUTES_MATCH,
+              AutomationSyncTrigger.ORGANIZATION_ATTRIBUTES_MATCH,
+            ],
+            limit: pageSize,
+            offset,
+          },
+          type: QueryTypes.SELECT,
+          transaction,
+        },
+      )
+      syncAutomations.push(...results)
+    } while (results.length > 0)
+
+    return syncAutomations
+  }
 }
diff --git a/backend/src/database/repositories/integrationRepository.ts b/backend/src/database/repositories/integrationRepository.ts
index 09d5a580a3..4e48104eee 100644
--- a/backend/src/database/repositories/integrationRepository.ts
+++ b/backend/src/database/repositories/integrationRepository.ts
@@ -8,6 +8,10 @@ import Error404 from '../../errors/Error404'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import QueryParser from './filters/queryParser'
 import { QueryOutput } from './filters/queryTypes'
+import AutomationRepository from './automationRepository'
+import AutomationExecutionRepository from './automationExecutionRepository'
+import MemberSyncRemoteRepository from './memberSyncRemoteRepository'
+import OrganizationSyncRemoteRepository from './organizationSyncRemoteRepository'
 
 const { Op } = Sequelize
 const log: boolean = false
@@ -152,6 +156,30 @@ class IntegrationRepository {
       },
     )
 
+    // destroy existing automations for outgoing integrations
+    const syncAutomationIds = (
+      await new AutomationRepository({ ...options, transaction }).findSyncAutomations(
+        currentTenant.id,
+        record.platform,
+      )
+    ).map((a) => a.id)
+
+    if (syncAutomationIds.length > 0) {
+      await new AutomationExecutionRepository({ ...options, transaction }).destroyAllAutomation(
+        syncAutomationIds,
+      )
+
+      // delete syncRemote rows coming from integration
+      await new MemberSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration([
+        record.id,
+      ])
+      await new OrganizationSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration(
+        [record.id],
+      )
+    }
+
+    await new AutomationRepository({ ...options, transaction }).destroyAll(syncAutomationIds)
+
     await this._createAuditLog(AuditLogRepository.DELETE, record, record, options)
   }
 
diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index e774de5d2c..2003a19e01 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -108,6 +108,25 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     })
   }
 
+  async destroyAllIntegration(integrationIds: string[]): Promise<void> {
+    const transaction = this.transaction
+
+    const seq = this.seq
+
+    const query = `
+    delete 
+    from "membersSyncRemote"
+    where "integrationId" in (:integrationIds);`
+
+    await seq.query(query, {
+      replacements: {
+        integrationIds,
+      },
+      type: QueryTypes.DELETE,
+      transaction,
+    })
+  }
+
   async markMemberForSyncing(data: IMemberSyncRemoteData): Promise<IMemberSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index e013ae7bc5..2749abffe9 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -156,6 +156,25 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     })
   }
 
+  async destroyAllIntegration(integrationIds: string[]): Promise<void> {
+    const transaction = this.transaction
+
+    const seq = this.seq
+
+    const query = `
+    delete 
+    from "organizationsSyncRemote"
+    where "integrationId" in (:integrationIds);`
+
+    await seq.query(query, {
+      replacements: {
+        integrationIds,
+      },
+      type: QueryTypes.DELETE,
+      transaction,
+    })
+  }
+
   async findByOrganizationId(organizationId: string): Promise<IOrganizationSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 

From 5f0667ca17445889e32d3ea01e5992314610f4d4 Mon Sep 17 00:00:00 2001
From: anil <epipav@gmail.com>
Date: Mon, 7 Aug 2023 20:24:56 +0200
Subject: [PATCH 42/42] handling re-connecting outgoing integrations, few
 bugfixes and cleaning

---
 .../repositories/integrationRepository.ts     | 16 ++---
 .../database/repositories/memberRepository.ts | 22 ++++++
 .../memberSyncRemoteRepository.ts             | 23 +++++-
 .../repositories/organizationRepository.ts    | 26 ++++++-
 .../organizationSyncRemoteRepository.ts       | 23 +++++-
 backend/src/services/integrationService.ts    | 71 -------------------
 .../premium/hubspot/memberAttributes.ts       |  7 --
 7 files changed, 99 insertions(+), 89 deletions(-)

diff --git a/backend/src/database/repositories/integrationRepository.ts b/backend/src/database/repositories/integrationRepository.ts
index 4e48104eee..fceb29a80a 100644
--- a/backend/src/database/repositories/integrationRepository.ts
+++ b/backend/src/database/repositories/integrationRepository.ts
@@ -156,6 +156,14 @@ class IntegrationRepository {
       },
     )
 
+    // delete syncRemote rows coming from integration
+    await new MemberSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration([
+      record.id,
+    ])
+    await new OrganizationSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration([
+      record.id,
+    ])
+
     // destroy existing automations for outgoing integrations
     const syncAutomationIds = (
       await new AutomationRepository({ ...options, transaction }).findSyncAutomations(
@@ -168,14 +176,6 @@ class IntegrationRepository {
       await new AutomationExecutionRepository({ ...options, transaction }).destroyAllAutomation(
         syncAutomationIds,
       )
-
-      // delete syncRemote rows coming from integration
-      await new MemberSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration([
-        record.id,
-      ])
-      await new OrganizationSyncRemoteRepository({ ...options, transaction }).destroyAllIntegration(
-        [record.id],
-      )
     }
 
     await new AutomationRepository({ ...options, transaction }).destroyAll(syncAutomationIds)
diff --git a/backend/src/database/repositories/memberRepository.ts b/backend/src/database/repositories/memberRepository.ts
index c21e057506..1d4df30500 100644
--- a/backend/src/database/repositories/memberRepository.ts
+++ b/backend/src/database/repositories/memberRepository.ts
@@ -4,6 +4,7 @@ import {
   MemberAttributeType,
   OpenSearchIndex,
   PlatformType,
+  SyncStatus,
 } from '@crowd/types'
 import lodash, { chunk } from 'lodash'
 import Sequelize, { QueryTypes } from 'sequelize'
@@ -45,6 +46,7 @@ import {
 } from './types/memberTypes'
 import Error400 from '../../errors/Error400'
 import OrganizationRepository from './organizationRepository'
+import MemberSyncRemoteRepository from './memberSyncRemoteRepository'
 
 const { Op } = Sequelize
 
@@ -628,6 +630,11 @@ class MemberRepository {
       throw new Error404()
     }
 
+    // exclude syncRemote attributes, since these are populated from memberSyncRemote table
+    if (data.attributes?.syncRemote) {
+      delete data.attributes.syncRemote
+    }
+
     record = await record.update(
       {
         ...lodash.pick(data, [
@@ -3215,6 +3222,21 @@ class MemberRepository {
 
     output.affiliations = await this.getAffiliations(record.id, options)
 
+    const manualSyncRemote = await new MemberSyncRemoteRepository({
+      ...options,
+      transaction,
+    }).findMemberManualSync(record.id)
+
+    for (const syncRemote of manualSyncRemote) {
+      if (output.attributes?.syncRemote) {
+        output.attributes.syncRemote[syncRemote.platform] = syncRemote.status === SyncStatus.ACTIVE
+      } else {
+        output.attributes.syncRemote = {
+          [syncRemote.platform]: syncRemote.status === SyncStatus.ACTIVE,
+        }
+      }
+    }
+
     return output
   }
 
diff --git a/backend/src/database/repositories/memberSyncRemoteRepository.ts b/backend/src/database/repositories/memberSyncRemoteRepository.ts
index 2003a19e01..8d70daa232 100644
--- a/backend/src/database/repositories/memberSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/memberSyncRemoteRepository.ts
@@ -144,7 +144,7 @@ class MemberSyncRemoteRepository extends RepositoryBase<
 
     if (existingManualSyncRemote) {
       await this.startManualSync(existingManualSyncRemote.id, data.sourceId)
-      return existingManualSyncRemote.id
+      return existingManualSyncRemote
     }
 
     const memberSyncRemoteInserted = await this.options.database.sequelize.query(
@@ -173,6 +173,27 @@ class MemberSyncRemoteRepository extends RepositoryBase<
     return memberSyncRemote
   }
 
+  async findMemberManualSync(memberId: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
+    const records = await this.options.database.sequelize.query(
+      `select i.platform, msr.status from "membersSyncRemote" msr
+      inner join integrations i on msr."integrationId" = i.id
+      where msr."syncFrom" = :syncFrom and msr."memberId" = :memberId;
+            `,
+      {
+        replacements: {
+          memberId,
+          syncFrom: 'manual',
+        },
+        type: QueryTypes.SELECT,
+        transaction,
+      },
+    )
+
+    return records
+  }
+
   async findByMemberId(memberId: string): Promise<IMemberSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 
diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index cbda4fbf37..3753ad6285 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -1,4 +1,5 @@
 import lodash from 'lodash'
+import { SyncStatus } from '@crowd/types'
 import Sequelize, { QueryTypes } from 'sequelize'
 import SequelizeRepository from './sequelizeRepository'
 import AuditLogRepository from './auditLogRepository'
@@ -7,6 +8,7 @@ import Error404 from '../../errors/Error404'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import QueryParser from './filters/queryParser'
 import { QueryOutput } from './filters/queryTypes'
+import OrganizationSyncRemoteRepository from './organizationSyncRemoteRepository'
 
 const { Op } = Sequelize
 
@@ -222,6 +224,11 @@ class OrganizationRepository {
       throw new Error404()
     }
 
+    // exclude syncRemote attributes, since these are populated from organizationSyncRemote table
+    if (data.attributes?.syncRemote) {
+      delete data.attributes.syncRemote
+    }
+
     record = await record.update(
       {
         ...lodash.pick(data, [
@@ -436,7 +443,24 @@ class OrganizationRepository {
       throw new Error404()
     }
 
-    return results[0] as any
+    const result = results[0] as any
+
+    const manualSyncRemote = await new OrganizationSyncRemoteRepository({
+      ...options,
+      transaction,
+    }).findOrganizationManualSync(result.id)
+
+    for (const syncRemote of manualSyncRemote) {
+      if (result.attributes?.syncRemote) {
+        result.attributes.syncRemote[syncRemote.platform] = syncRemote.status === SyncStatus.ACTIVE
+      } else {
+        result.attributes.syncRemote = {
+          [syncRemote.platform]: syncRemote.status === SyncStatus.ACTIVE,
+        }
+      }
+    }
+
+    return result
   }
 
   static async findByName(name, options: IRepositoryOptions) {
diff --git a/backend/src/database/repositories/organizationSyncRemoteRepository.ts b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
index 2749abffe9..da2db18882 100644
--- a/backend/src/database/repositories/organizationSyncRemoteRepository.ts
+++ b/backend/src/database/repositories/organizationSyncRemoteRepository.ts
@@ -108,7 +108,7 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
 
     if (existingManualSyncRemote) {
       await this.startManualSync(existingManualSyncRemote.id, data.sourceId)
-      return existingManualSyncRemote.id
+      return existingManualSyncRemote
     }
 
     const organizationSyncRemoteInserted = await this.options.database.sequelize.query(
@@ -175,6 +175,27 @@ class OrganizationSyncRemoteRepository extends RepositoryBase<
     })
   }
 
+  async findOrganizationManualSync(organizationId: string) {
+    const transaction = SequelizeRepository.getTransaction(this.options)
+
+    const records = await this.options.database.sequelize.query(
+      `select i.platform, osr.status from "organizationsSyncRemote" osr
+      inner join integrations i on osr."integrationId" = i.id
+      where osr."syncFrom" = :syncFrom and osr."organizationId" = :organizationId;
+            `,
+      {
+        replacements: {
+          organizationId,
+          syncFrom: 'manual',
+        },
+        type: QueryTypes.SELECT,
+        transaction,
+      },
+    )
+
+    return records
+  }
+
   async findByOrganizationId(organizationId: string): Promise<IOrganizationSyncRemoteData> {
     const transaction = SequelizeRepository.getTransaction(this.options)
 
diff --git a/backend/src/services/integrationService.ts b/backend/src/services/integrationService.ts
index 4f0598c0a2..f4b5c49beb 100644
--- a/backend/src/services/integrationService.ts
+++ b/backend/src/services/integrationService.ts
@@ -476,23 +476,10 @@ export default class IntegrationService {
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     try {
-      // update member.attributes.syncRemote.hubspot to false
       const memberService = new MemberService(this.options)
 
       const member = await memberService.findById(payload.memberId)
 
-      if (!member.attributes.syncRemote) {
-        member.attributes.syncRemote = {
-          default: false,
-          [PlatformType.HUBSPOT]: false,
-        }
-      } else {
-        member.attributes.syncRemote[PlatformType.HUBSPOT] = false
-        member.attributes.syncRemote.default = false
-      }
-
-      await memberService.update(payload.memberId, { attributes: member.attributes }, transaction)
-
       const memberSyncRemoteRepository = new MemberSyncRemoteRepository({
         ...this.options,
         transaction,
@@ -526,16 +513,6 @@ export default class IntegrationService {
 
       member = await MemberRepository.findById(payload.memberId, { ...this.options, transaction })
 
-      if (!member.attributes.syncRemote) {
-        member.attributes.syncRemote = {
-          default: true,
-          [PlatformType.HUBSPOT]: true,
-        }
-      } else {
-        member.attributes.syncRemote[PlatformType.HUBSPOT] = true
-        member.attributes.syncRemote.default = true
-      }
-
       const memberSyncRemoteRepo = new MemberSyncRemoteRepository({ ...this.options, transaction })
 
       memberSyncRemote = await memberSyncRemoteRepo.markMemberForSyncing({
@@ -546,8 +523,6 @@ export default class IntegrationService {
         lastSyncedAt: null,
       })
 
-      const memberService = new MemberService(this.options)
-
       integration = await this.createOrUpdate(
         {
           platform: PlatformType.HUBSPOT,
@@ -559,8 +534,6 @@ export default class IntegrationService {
         transaction,
       )
 
-      await memberService.update(payload.memberId, { attributes: member.attributes }, transaction)
-
       await SequelizeRepository.commitTransaction(transaction)
     } catch (err) {
       this.options.log.error(err, 'Error while starting Hubspot member sync!')
@@ -591,29 +564,10 @@ export default class IntegrationService {
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     try {
-      // update organization.attributes.syncRemote.hubspot to false
       const organizationService = new OrganizationService(this.options)
 
       const organization = await organizationService.findById(payload.organizationId)
 
-      if (!organization.attributes.syncRemote) {
-        organization.attributes.syncRemote = {
-          default: false,
-          [PlatformType.HUBSPOT]: false,
-        }
-      } else {
-        organization.attributes.syncRemote[PlatformType.HUBSPOT] = false
-        organization.attributes.syncRemote.default = false
-      }
-
-      await organizationService.update(
-        payload.organizationId,
-        {
-          attributes: organization.attributes,
-        },
-        transaction,
-      )
-
       const organizationSyncRemoteRepository = new OrganizationSyncRemoteRepository({
         ...this.options,
         transaction,
@@ -645,28 +599,10 @@ export default class IntegrationService {
         transaction,
       })
 
-      // update organization.attributes.syncRemote.hubspot to true
       const organizationService = new OrganizationService(this.options)
 
       organization = await organizationService.findById(payload.organizationId)
 
-      if (!organization.attributes) {
-        organization.attributes = {
-          syncRemote: {
-            default: true,
-            [PlatformType.HUBSPOT]: true,
-          },
-        }
-      } else if (!organization.attributes.syncRemote) {
-        organization.attributes.syncRemote = {
-          default: true,
-          [PlatformType.HUBSPOT]: true,
-        }
-      } else {
-        organization.attributes.syncRemote[PlatformType.HUBSPOT] = true
-        organization.attributes.syncRemote.default = true
-      }
-
       const organizationSyncRemoteRepo = new OrganizationSyncRemoteRepository({
         ...this.options,
         transaction,
@@ -690,13 +626,6 @@ export default class IntegrationService {
         },
         transaction,
       )
-      await organizationService.update(
-        payload.organizationId,
-        {
-          attributes: organization.attributes,
-        },
-        transaction,
-      )
 
       await SequelizeRepository.commitTransaction(transaction)
 
diff --git a/services/libs/integrations/src/integrations/premium/hubspot/memberAttributes.ts b/services/libs/integrations/src/integrations/premium/hubspot/memberAttributes.ts
index fa12294c64..da7d4ef728 100644
--- a/services/libs/integrations/src/integrations/premium/hubspot/memberAttributes.ts
+++ b/services/libs/integrations/src/integrations/premium/hubspot/memberAttributes.ts
@@ -20,11 +20,4 @@ export const HUBSPOT_MEMBER_ATTRIBUTES: IMemberAttribute[] = [
     canDelete: false,
     show: false,
   },
-  {
-    name: MemberAttributes[MemberAttributeName.SYNC_REMOTE].name,
-    label: MemberAttributes[MemberAttributeName.SYNC_REMOTE].label,
-    type: MemberAttributeType.BOOLEAN,
-    canDelete: false,
-    show: false,
-  },
 ]