Merge branch 'main' into improvement/tenant-removal

CrowdDotDev · Jan 15, 2025 · bb79476 · bb79476
2 parents 5c521ee + 0341e55
commit bb79476
Show file tree

Hide file tree

Showing 130 changed files with 1,086 additions and 11,134 deletions.
diff --git a/.github/workflows/CI-node.yaml b/.github/workflows/CI-node.yaml
@@ -58,51 +58,3 @@ jobs:
 
       - name: Check app linting, format and typescript
         run: ./scripts/lint_apps.sh
-
-  ##tests-main:
-  ##  needs: lint-format
-  ##  runs-on: ubuntu-latest
-  ##  defaults:
-  ##    run:
-  ##      shell: bash
-  ##      working-directory: ./backend
-##
-  ##  steps:
-  ##    - name: Check out repository code
-  ##      uses: actions/checkout@v2
-##
-  ##    - name: Setup Node
-  ##      uses: actions/setup-node@v3
-  ##      with:
-  ##        node-version: 20
-##
-  ##    - name: Install dependencies
-  ##      run: cd .. && corepack enable && pnpm i --frozen-lockfile
-##
-  ##    - name: Run tests
-  ##      working-directory: ./backend
-  ##      run: SERVICE=test pnpm test -- --testPathIgnorePatterns=serverless
-
-  ## tests-serverless:
-  ##   needs: lint-format
-  ##   runs-on: ubuntu-latest
-  ##   defaults:
-  ##     run:
-  ##       shell: bash
-  ##       working-directory: ./backend
-## 
-  ##   steps:
-  ##     - name: Check out repository code
-  ##       uses: actions/checkout@v2
-## 
-  ##     - name: Setup Node
-  ##       uses: actions/setup-node@v3
-  ##       with:
-  ##         node-version: 20
-## 
-  ##     - name: Install dependencies
-  ##       run: cd .. && corepack enable && pnpm i --frozen-lockfile
-## 
-  ##     - name: Run tests
-  ##       working-directory: ./backend
-  ##       run: SERVICE=test pnpm test -- --testPathPattern="serverless\/"
diff --git a/.github/workflows/api-docs.yaml b/.github/workflows/api-docs.yaml
diff --git a/backend/.env.test b/backend/.env.test
diff --git a/backend/config/test.json b/backend/config/test.json
diff --git a/backend/docker-compose.test.yaml b/backend/docker-compose.test.yaml
diff --git a/backend/jest.config.js b/backend/jest.config.js
diff --git a/backend/package.json b/backend/package.json
@@ -8,6 +8,9 @@
     "start:job-generator": "SERVICE=job-generator TS_NODE_TRANSPILE_ONLY=true tsx src/bin/job-generator.ts",
     "start:job-generator:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:job-generator\"",
     "start:job-generator:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:job-generator:dev",
+    "start:discord-ws": "SERVICE=discord-ws TS_NODE_TRANSPILE_ONLY=true tsx src/bin/discord-ws.ts",
+    "start:discord-ws:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:discord-ws\"",
+    "start:discord-ws:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:discord-ws:dev",
     "build": "tsc && cp package*json dist/ && cp .sequelizerc dist/.sequelizerc ",
     "test": "../scripts/cli scaffold up-test && jest --clearCache && set -a && . ./.env.dist.local && . ./.env.test && set +a && NODE_ENV=test SERVICE=test jest --runInBand --verbose --forceExit",
     "sequelize-cli:source": "pnpm run build && npx sequelize --config src/database/sequelize-cli-config.ts --migrations-source-path src/database/migrations",
@@ -136,7 +139,6 @@
     "@types/config": "^3.3.0",
     "@types/cron": "^2.0.0",
     "@types/html-to-text": "^8.1.1",
-    "@types/jest": "^29.5.1",
     "@types/node": "~18.0.4",
     "@types/sanitize-html": "^2.6.2",
     "@types/superagent": "^4.1.15",
@@ -151,13 +153,11 @@
     "eslint-config-airbnb-typescript": "^16.1.4",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
-    "jest": "^29.5.0",
     "node-mocks-http": "1.9.0",
     "nodemon": "2.0.4",
     "prettier": "^3.3.3",
     "rdme": "^7.2.0",
     "supertest": "^6.2.2",
-    "ts-jest": "^29.1.0",
     "tsx": "^4.7.1",
     "typescript": "^5.6.3"
   },

diff --git a/backend/src/api/index.ts b/backend/src/api/index.ts
@@ -151,6 +151,12 @@ setImmediate(async () => {
   // increase security.
   app.use(helmet())
 
+  app.use(
+    bodyParser.json({
+      limit: '5mb',
+    }),
+  )
+
   app.use(bodyParser.urlencoded({ limit: '5mb', extended: true }))
 
   app.use((req, res, next) => {

diff --git a/backend/src/conf/configTypes.ts b/backend/src/conf/configTypes.ts
@@ -162,18 +162,10 @@ export interface SlackAlertingConfiguration {
   url: string
 }
 
-export interface SampleDataConfiguration {
-  tenantId: string
-}
-
 export interface IntegrationProcessingConfiguration {
   maxRetries: number
 }
 
-export interface WeeklyEmailsConfiguration {
-  enabled: string // true - enabled, anything else - disabled
-}
-
 export interface IOpenSearchConfig {
   node: string
   username: string

diff --git a/backend/src/conf/index.ts b/backend/src/conf/index.ts
@@ -30,7 +30,6 @@ import {
   OrganizationEnrichmentConfiguration,
   S3Configuration,
   SSOConfiguration,
-  SampleDataConfiguration,
   SegmentConfiguration,
   ServiceType,
   SlackAlertingConfiguration,
@@ -40,7 +39,6 @@ import {
   StackExchangeConfiguration,
   TenantMode,
   TwitterConfiguration,
-  WeeklyEmailsConfiguration,
 } from './configTypes'
 
 // TODO-kube
@@ -140,15 +138,9 @@ export const STACKEXCHANGE_CONFIG: StackExchangeConfiguration =
 export const SLACK_ALERTING_CONFIG: SlackAlertingConfiguration =
   config.get<SlackAlertingConfiguration>('slackAlerting')
 
-export const SAMPLE_DATA_CONFIG: SampleDataConfiguration =
-  config.get<SampleDataConfiguration>('sampleData')
-
 export const INTEGRATION_PROCESSING_CONFIG: IntegrationProcessingConfiguration =
   config.get<IntegrationProcessingConfiguration>('integrationProcessing')
 
-export const WEEKLY_EMAILS_CONFIG: WeeklyEmailsConfiguration =
-  config.get<WeeklyEmailsConfiguration>('weeklyEmails')
-
 export const CROWD_ANALYTICS_CONFIG: CrowdAnalyticsConfiguration =
   config.get<CrowdAnalyticsConfiguration>('crowdAnalytics')
 

diff --git a/backend/src/database/models/index.ts b/backend/src/database/models/index.ts
@@ -135,7 +135,6 @@ async function models(queryTimeoutMilliseconds: number, databaseHostnameOverride
     require('./automationExecution').default,
     require('./organization').default,
     require('./memberAttributeSettings').default,
-    require('./note').default,
     require('./segment').default,
     require('./customView').default,
     require('./customViewOrder').default,

diff --git a/backend/src/database/models/note.ts b/backend/src/database/models/note.ts