[pull] next from novuhq:next

.github/workflows/on-pr.yml

@@ -138,6 +138,8 @@ jobs:
         with:
           slim: 'true'
       - uses: mansagroup/nrwl-nx-action@v3
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: lint,build,test
           parallel: 5
@@ -168,6 +170,7 @@ jobs:
         uses: mansagroup/nrwl-nx-action@v3
         env:
           LOG_LEVEL: 'info'
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: build
           projects: '@novu/api'
@@ -176,6 +179,7 @@ jobs:
         uses: mansagroup/nrwl-nx-action@v3
         env:
           LOG_LEVEL: 'info'
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: lint,build,test
           projects: ${{join(fromJson(needs.get-affected.outputs.test-packages), ',')}}
@@ -195,6 +199,8 @@ jobs:
 
       - name: Run Lint, Build, Test
         uses: mansagroup/nrwl-nx-action@v3
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: lint,build,test
           projects: ${{join(fromJson(needs.get-affected.outputs.test-libs), ',')}}
@@ -230,13 +236,17 @@ jobs:
       - uses: ./.github/actions/setup-redis-cluster
       - uses: mansagroup/nrwl-nx-action@v3
         name: Lint and build and test
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: build
           projects: '@novu/api'
           args: ''
 
       - uses: mansagroup/nrwl-nx-action@v3
         name: Lint and build and test
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: lint,build,test
           projects: ${{matrix.projectName}}

.github/workflows/preview-packages.yml

@@ -41,6 +41,8 @@ jobs:
         run: pnpm run packages:set-latest
 
       - name: Build
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: pnpm run preview:pkg:build
 
       - name: Release package previews to pkg.pr.new

.github/workflows/prod-deploy-inbound-mail.yml

@@ -36,6 +36,8 @@ jobs:
       - uses: ./.github/actions/setup-project
 
       - name: build api
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: pnpm build:inbound-mail
 
       - uses: crazy-max/ghaction-setup-docker@v2

.github/workflows/release-packages.yml

@@ -120,6 +120,8 @@ jobs:
           fi
 
       - name: Build packages
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: |
           if [ "${{ github.event.inputs.release_type }}" != "stable" ]; then
             pnpm run build:packages
@@ -236,6 +238,8 @@ jobs:
           pnpm install --frozen-lockfile
 
       - name: Build packages
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: pnpm run build:packages
 
       - name: Publish packages to NPM

.github/workflows/reusable-api-e2e.yml

@@ -45,6 +45,8 @@ jobs:
         name: Start localstack
 
       - name: Build API & Worker
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm nx run-many --target=build --all --projects=@novu/api-service,@novu/worker
 
       - name: Start Worker

.github/workflows/reusable-dashboard-deploy.yml

@@ -54,6 +54,8 @@ jobs:
           submodules: true
 
       - name: Build
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm build:dashboard --skip-nx-cache
 
       - name: Deploy Dashboard to Netlify

.github/workflows/reusable-dashboard-e2e.yml

@@ -93,6 +93,8 @@ jobs:
           echo NODE_ENV=test >> .env.playwright
 
       - uses: mansagroup/nrwl-nx-action@v3
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         with:
           targets: build
           projects: '@novu/dashboard,@novu/api-service,@novu/worker'

.github/workflows/reusable-inbound-mail-e2e.yml

@@ -50,6 +50,8 @@ jobs:
 
         # Runs a single command using the runners shell
       - name: Build Inbound Mail
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm build:inbound-mail
 
       - name: Run unit tests

.github/workflows/reusable-webhook-e2e.yml

@@ -25,6 +25,8 @@ jobs:
 
         # Runs a single command using the runners shell
       - name: Build Webhook
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm build:webhook
 
       # Runs a set of commands using the runners shell

.github/workflows/reusable-worker-e2e.yml

@@ -54,6 +54,8 @@ jobs:
 
         # Runs a single command using the runners shell
       - name: Build worker
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm build:worker
 
       # Runs a set of commands using the runners shell

.github/workflows/reusable-ws-e2e.yml

@@ -49,6 +49,8 @@ jobs:
 
         # Runs a single command using the runners shell
       - name: Build WS
+        env:
+          NX_NO_CLOUD: ${{ secrets.NX_CLOUD_ACCESS_TOKEN == '' && 'true' || 'false' }}
         run: CI='' pnpm build:ws
 
       - name: Run unit tests

apps/api/src/app/subscriptions/usecases/create-subscription-preferences/create-subscription-preferences.usecase.ts

@@ -48,16 +48,35 @@ export class CreateSubscriptionPreferencesUsecase {
         continue;
       }
 
-      const createdPreference = await this.preferencesRepository.create({
-        _environmentId: command.environmentId,
-        _organizationId: command.organizationId,
-        _subscriberId: command._subscriberId,
-        _templateId: workflow._id,
-        _topicSubscriptionId: command._topicSubscriptionId,
-        type: PreferencesTypeEnum.SUBSCRIPTION_SUBSCRIBER_WORKFLOW,
-        preferences: workflowPreferences,
-        contextKeys: command.contextKeys,
-      });
+      let createdPreference;
+      try {
+        createdPreference = await this.preferencesRepository.create({
+          _environmentId: command.environmentId,
+          _organizationId: command.organizationId,
+          _subscriberId: command._subscriberId,
+          _templateId: workflow._id,
+          _topicSubscriptionId: command._topicSubscriptionId,
+          type: PreferencesTypeEnum.SUBSCRIPTION_SUBSCRIBER_WORKFLOW,
+          preferences: workflowPreferences,
+          contextKeys: command.contextKeys,
+        });
+      } catch (error) {
+        const isDuplicateKeyError = error && typeof error === 'object' && 'code' in error && error.code === 11000;
+
+        if (isDuplicateKeyError) {
+          createdPreference = await this.preferencesRepository.findOne({
+            _environmentId: command.environmentId,
+            _subscriberId: command._subscriberId,
+            _templateId: workflow._id,
+            _topicSubscriptionId: command._topicSubscriptionId,
+            type: PreferencesTypeEnum.SUBSCRIPTION_SUBSCRIBER_WORKFLOW,
+          });
+        }
+
+        if (!isDuplicateKeyError || !createdPreference) {
+          throw error;
+        }
+      }
 
       if (createdPreference) {
         preferencesResult.push({

libs/application-generic/src/usecases/upsert-preferences/upsert-preferences.usecase.ts

@@ -180,18 +180,31 @@ export class UpsertPreferences {
       PreferencesTypeEnum.SUBSCRIBER_GLOBAL,
     ].includes(command.type);
 
-    return await this.preferencesRepository.create({
-      _subscriberId: command._subscriberId,
-      _userId: command.userId,
-      _environmentId: command.environmentId,
-      _organizationId: command.organizationId,
-      _templateId: command.templateId,
-      _topicSubscriptionId: command.topicSubscriptionId,
-      preferences: command.preferences,
-      type: command.type,
-      schedule: command.schedule,
-      contextKeys: useContextFiltering && isContextScoped ? (command.contextKeys ?? []) : undefined,
-    });
+    try {
+      return await this.preferencesRepository.create({
+        _subscriberId: command._subscriberId,
+        _userId: command.userId,
+        _environmentId: command.environmentId,
+        _organizationId: command.organizationId,
+        _templateId: command.templateId,
+        _topicSubscriptionId: command.topicSubscriptionId,
+        preferences: command.preferences,
+        type: command.type,
+        schedule: command.schedule,
+        contextKeys: useContextFiltering && isContextScoped ? (command.contextKeys ?? []) : undefined,
+      });
+    } catch (error) {
+      const isDuplicateKeyError = error && typeof error === 'object' && 'code' in error && error.code === 11000;
+
+      if (isDuplicateKeyError) {
+        const existingPreference = await this.getPreference(command);
+        if (existingPreference) {
+          return existingPreference;
+        }
+      }
+
+      throw error;
+    }
   }
 
   private async updatePreferences(