Skip to content

Commit 0ddb7f6

Browse files
epipavepipav
committed
Merge branch 'main' into feature/unmerge-contact
2 parents 37956c3 + 8ad7bb8 commit 0ddb7f6

File tree

208 files changed

+4150
-3418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+4150
-3418
lines changed

‎backend/package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"name": "app-backend",
33
"description": "Backend",
44
"scripts": {
5-
"start:api": "SERVICE=api TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/api.ts",
5+
"start:api": "SERVICE=api TS_NODE_TRANSPILE_ONLY=true tsx src/bin/api.ts",
66
"start:api:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:api\"",
77
"start:api:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:api:dev",
8-
"start:job-generator": "SERVICE=job-generator TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/job-generator.ts",
8+
"start:job-generator": "SERVICE=job-generator TS_NODE_TRANSPILE_ONLY=true tsx src/bin/job-generator.ts",
99
"start:job-generator:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:job-generator\"",
1010
"start:job-generator:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:job-generator:dev",
11-
"start:nodejs-worker": "SERVICE=nodejs-worker TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/nodejs-worker",
11+
"start:nodejs-worker": "SERVICE=nodejs-worker TS_NODE_TRANSPILE_ONLY=true tsx src/bin/nodejs-worker",
1212
"start:nodejs-worker:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:nodejs-worker\"",
1313
"start:nodejs-worker:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:nodejs-worker:dev",
14-
"start:discord-ws": "SERVICE=discord-ws TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/discord-ws.ts",
14+
"start:discord-ws": "SERVICE=discord-ws TS_NODE_TRANSPILE_ONLY=true tsx src/bin/discord-ws.ts",
1515
"start:discord-ws:dev": "nodemon --watch \"src/**/*.ts\" --watch ../services/libs -e ts,json --exec \"pnpm run start:discord-ws\"",
1616
"start:discord-ws:dev:local": "set -a && . ./.env.dist.local && . ./.env.override.local && set +a && pnpm run start:discord-ws:dev",
1717
"build": "tsc && pnpm run build:documentation && cp package*json dist/ && cp .sequelizerc dist/.sequelizerc ",
1818
"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",
1919
"build:documentation": "copyfiles --flat ./src/documentation/openapi.json ./dist/documentation/",
20-
"db:create:test": "npx ts-node ./src/database/initializers/create test",
21-
"db:create:dev:source": "ts-node ./src/database/initializers/create dev",
22-
"db:seed:test": "npx ts-node ./src/database/initializers/seed test",
23-
"db:seed:dev": "npx ts-node ./src/database/initializers/seed dev",
20+
"db:create:test": "tsx ./src/database/initializers/create test",
21+
"db:create:dev:source": "tsx ./src/database/initializers/create dev",
22+
"db:seed:test": "tsx ./src/database/initializers/seed test",
23+
"db:seed:dev": "tsx ./src/database/initializers/seed dev",
2424
"db:publish": "bash ./util/publish-db.sh",
2525
"docs": "bash ./util/publish-docs.sh",
2626
"sequelize-cli:source": "pnpm run build && npx sequelize --config src/database/sequelize-cli-config.ts --migrations-source-path src/database/migrations",
@@ -31,24 +31,24 @@
3131
"format": "prettier --write .",
3232
"format-check": "prettier --check .",
3333
"tsc-check": "tsc --noEmit",
34-
"script:continue-run": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/continue-run.ts",
35-
"script:change-tenant-plan": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/change-tenant-plan.ts",
36-
"script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/trigger-webhook.ts",
37-
"script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/send-weekly-analytics-email.ts",
38-
"script:unleash-init": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/unleash-init.ts",
39-
"script:enrich-members-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/enrich-members-and-organizations.ts",
40-
"script:enrich-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/enrich-organizations-synchronous.ts",
41-
"script:generate-merge-suggestions": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/generate-merge-suggestions.ts",
42-
"script:generate-merge-suggestions-synchronous": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/generate-merge-suggestions-synchronous.ts",
43-
"script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/merge-organizations.ts",
44-
"script:get-member-enrichment-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/get-member-enrichment-data.ts",
45-
"script:get-organization-enrichment-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/get-organization-enrichment-data.ts",
46-
"script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/refresh-materialized-views.ts",
47-
"script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/unmerge-members.ts",
34+
"script:continue-run": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/continue-run.ts",
35+
"script:change-tenant-plan": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/change-tenant-plan.ts",
36+
"script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/trigger-webhook.ts",
37+
"script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/send-weekly-analytics-email.ts",
38+
"script:unleash-init": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unleash-init.ts",
39+
"script:enrich-members-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/enrich-members-and-organizations.ts",
40+
"script:enrich-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/enrich-organizations-synchronous.ts",
41+
"script:generate-merge-suggestions": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/generate-merge-suggestions.ts",
42+
"script:generate-merge-suggestions-synchronous": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/generate-merge-suggestions-synchronous.ts",
43+
"script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-organizations.ts",
44+
"script:get-member-enrichment-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/get-member-enrichment-data.ts",
45+
"script:get-organization-enrichment-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/get-organization-enrichment-data.ts",
46+
"script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-materialized-views.ts",
47+
"script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unmerge-members.ts",
4848
"script:member-unmerge-testing": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/member-unmerge-testing.ts",
49-
"script:merge-similar-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/merge-similar-organizations.ts",
50-
"script:cache-dashboard": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/cache-dashboard.ts",
51-
"script:purge-tenants-and-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/purge-tenants-and-data.ts"
49+
"script:merge-similar-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-similar-organizations.ts",
50+
"script:cache-dashboard": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/cache-dashboard.ts",
51+
"script:purge-tenants-and-data": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/purge-tenants-and-data.ts"
5252
},
5353
"dependencies": {
5454
"@aws-sdk/client-comprehend": "^3.159.0",
@@ -180,7 +180,7 @@
180180
"rdme": "^7.2.0",
181181
"supertest": "^6.2.2",
182182
"ts-jest": "^29.1.0",
183-
"ts-node": "10.6.0",
183+
"tsx": "^4.7.1",
184184
"typescript": "^5.2.2"
185185
}
186186
}

‎backend/src/database/repositories/memberEnrichmentCacheRepository.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { QueryTypes } from 'sequelize'
2-
import { EnrichmentCache } from '@crowd/types/premium'
2+
import { EnrichmentCache } from '@crowd/types/src/premium'
33
import { IRepositoryOptions } from './IRepositoryOptions'
44
import SequelizeRepository from './sequelizeRepository'
55

‎backend/src/services/premium/enrichment/memberEnrichmentService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
EnrichmentAPIResponse,
2525
EnrichmentAPISkills,
2626
EnrichmentAPIWorkExperience,
27-
} from '@crowd/types/premium'
27+
} from '@crowd/types/src/premium'
2828
import { WorkflowIdReusePolicy } from '@crowd/temporal'
2929
import { ENRICHMENT_CONFIG, REDIS_CONFIG } from '../../../conf'
3030
import { AttributeData } from '../../../database/attributes/attribute'

‎backend/tsconfig.json

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
"types": ["node", "jest"],
1414
"baseUrl": "./src",
1515
"paths": {
16-
"@crowd/*/premium": ["../../services/libs/*/src/premium"],
17-
"@crowd/*": ["../../services/libs/*/src"],
1816
"@/*": ["./*"]
1917
},
2018
"skipLibCheck": true

0 commit comments

Comments
 (0)