Merge remote-tracking branch 'origin/crowd-linux' into lf-staging-main

.github/workflows/lf-production-deploy-new.yaml

@@ -27,10 +27,6 @@ on:
         description: Deploy emails-worker service?
         required: true
         type: boolean
-      deploy_members_enrichment_worker:
-        description: Deploy members-enrichment-worker service?
-        required: true
-        type: boolean
       deploy_merge_suggestions_worker:
         description: Deploy merge-suggestions-worker service?
         required: true
@@ -39,6 +35,10 @@ on:
         description: Deploy entity-merging-worker service?
         required: true
         type: boolean
+      deploy_members_enrichment_worker:
+        description: Deploy members-enrichment-worker service?
+        required: true
+        type: boolean
       deploy_script_executor:
         description: Deploy script-executor service?
         required: true
@@ -243,7 +243,7 @@ jobs:
 
       - name: Set docker image output
         id: image
-        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPU
 
   build-and-push-script-executor:
     runs-on: ubuntu-latest

.github/workflows/lf-staging-deploy-entity-merging-worker.yml

@@ -0,0 +1,61 @@
+name: LF Staging Deploy Entity Merging Worker
+
+on:
+  push:
+    branches:
+      - 'lf-staging/**'
+      - 'lf-staging-**'
+    paths:
+      - 'services/libs/**'
+      - 'services/apps/entity_merging_worker/**'
+
+env:
+  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  CROWD_CLUSTER: ${{ secrets.LF_STAGING_CLUSTER_NAME }}
+  CROWD_ROLE_ARN: ${{ secrets.LF_STAGING_CLUSTER_ROLE_ARN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.LF_AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.LF_AWS_SECRET_ACCESS_KEY }}
+  AWS_REGION: ${{ secrets.LF_AWS_REGION }}
+  SLACK_CHANNEL: deploys-lf-staging
+  SLACK_WEBHOOK: ${{ secrets.LF_STAGING_SLACK_CHANNEL_HOOK }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: entity-merging-worker
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
+  deploy-entity-merging-worker:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: entity-merging-worker
+          image: ${{ needs.build-and-push.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}
+

.github/workflows/production-deploy-new.yaml

@@ -27,18 +27,18 @@ on:
         description: Deploy emails-worker service?
         required: true
         type: boolean
-      deploy_members_enrichment_worker:
-        description: Deploy members-enrichment-worker service?
-        required: true
-        type: boolean
       deploy_merge_suggestions_worker:
-        description: Deploy members-enrichment-worker service?
+        description: Deploy merge-suggestions-worker service?
         required: true
         type: boolean
       deploy_entity_merging_worker:
         description: Deploy entity-merging-worker service?
         required: true
         type: boolean
+      deploy_members_enrichment_worker:
+        description: Deploy members-enrichment-worker service?
+        required: true
+        type: boolean
       deploy_script_executor:
         description: Deploy script-executor service?
         required: true

.github/workflows/staging-deploy-entity-merging-worker.yml

@@ -0,0 +1,60 @@
+name: Staging Deploy Entity Merging Worker
+
+on:
+  push:
+    branches:
+      - 'staging/**'
+      - 'staging-**'
+    paths:
+      - 'services/libs/**'
+      - 'services/apps/entity_merging_worker/**'
+
+env:
+  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  CROWD_CLUSTER: ${{ secrets.STAGING_CLUSTER_NAME }}
+  CROWD_ROLE_ARN: ${{ secrets.STAGING_CLUSTER_ROLE_ARN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_REGION: ${{ secrets.AWS_REGION }}
+  SLACK_CHANNEL: deploys-staging
+  SLACK_WEBHOOK: ${{ secrets.STAGING_SLACK_CHANNEL_HOOK }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: entity-merging-worker
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
+  deploy-entity-merging-worker:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: entity-merging-worker
+          image: ${{ needs.build-and-push.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}

backend/src/api/organization/organizationMerge.ts

@@ -14,7 +14,7 @@ export default async (req, res) => {
     secondary: secondaryOrgId,
   }
 
-  await new OrganizationService(req).mergeAsync(primaryOrgId, secondaryOrgId)
+  await new OrganizationService(req).mergeSync(primaryOrgId, secondaryOrgId)
 
   track('Merge organizations', requestPayload, { ...req })
 

backend/src/database/migrations/U1704395824__memberMergeSuggestionsLastGeneratedAt.sql

@@ -0,0 +1 @@
+alter table "tenants" drop column "memberMergeSuggestionsLastGeneratedAt";

backend/src/database/migrations/V1704365919__fix-member-joined-at.sql

@@ -0,0 +1,36 @@
+DO $$
+DECLARE
+    _member_id UUID;
+    _first_acitivity TIMESTAMP;
+BEGIN
+    FOR _member_id IN
+        SELECT id
+        FROM members
+        WHERE EXTRACT(YEAR FROM "joinedAt") = 1970 -- those who have the wrong joinedAt
+          AND EXISTS ( -- yet have at least one activity with a non-1970 timestamp
+            SELECT 1
+            FROM activities a
+            WHERE a."memberId" = members.id
+              AND EXTRACT(YEAR FROM a.timestamp) != 1970
+        )
+    LOOP
+        RAISE NOTICE 'member_id: %', _member_id;
+
+        -- find the actual first non-1970 activity timestamp
+        SELECT MIN(a.timestamp) INTO _first_acitivity
+        FROM activities a
+        WHERE EXTRACT(YEAR FROM a.timestamp) != 1970
+          AND a."memberId" = _member_id;
+
+        IF _first_acitivity IS NULL THEN
+            CONTINUE;
+        END IF;
+
+        RAISE NOTICE 'first_acitivity: %', _first_acitivity;
+
+        UPDATE members
+        SET "joinedAt" = _first_acitivity
+        WHERE id = _member_id;
+    END LOOP;
+END;
+$$;

backend/src/database/migrations/V1704395824__memberMergeSuggestionsLastGeneratedAt.sql

@@ -0,0 +1,2 @@
+alter table "tenants"
+add column "memberMergeSuggestionsLastGeneratedAt" timestamp with time zone null;

backend/src/database/repositories/memberEnrichmentCacheRepository.ts

@@ -1,5 +1,5 @@
 import { QueryTypes } from 'sequelize'
-import { EnrichmentCache } from '../../services/premium/enrichment/types/memberEnrichmentTypes'
+import { EnrichmentCache } from '@crowd/types/premium'
 import { IRepositoryOptions } from './IRepositoryOptions'
 import SequelizeRepository from './sequelizeRepository'