Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 1174 #1175

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
b95601b
configure profile new UI screen
Bhupesh-mfsi Aug 5, 2024
58a89b4
added radio buttons for profile
Bhupesh-mfsi Aug 5, 2024
26b4a77
configured new UI for profile configuration
Bhupesh-mfsi Aug 9, 2024
25a766c
Merge branch 'develop' of https://github.com/corpus-io/dm3 into new-c…
Bhupesh-mfsi Aug 9, 2024
155c040
reverted back to old vscode formatter
Bhupesh-mfsi Aug 9, 2024
ac2fe69
sync prisma versions
malteish Aug 12, 2024
2f3512f
remove prisma from ds
malteish Aug 12, 2024
4ca01e0
update to latest prisma version
malteish Aug 14, 2024
c0998e0
remove all imports and setups of winston
malteish Aug 14, 2024
1f9e15a
replace winston usages with console
malteish Aug 14, 2024
469415f
uninstall winston
malteish Aug 14, 2024
ec41817
add metrics endpoint with mock output
malteish Aug 14, 2024
6153b46
add router to get metrics
malteish Aug 15, 2024
0d0eb1e
remove unused config file
malteish Aug 15, 2024
40d24e7
introduce metrics types
malteish Aug 15, 2024
fb7c9a0
start building the metrics setter
malteish Aug 15, 2024
d3ee8a6
added network dialog
Bhupesh-mfsi Aug 26, 2024
815cc75
Merge branch 'develop' of https://github.com/corpus-io/dm3 into netwo…
Bhupesh-mfsi Aug 26, 2024
8cbdc9b
fixed import statement
Bhupesh-mfsi Aug 26, 2024
d7c9734
fixed broken tests
Bhupesh-mfsi Aug 27, 2024
58aac72
added delete DS node functionality
Bhupesh-mfsi Aug 28, 2024
0a234f6
fixed code formatting
Bhupesh-mfsi Aug 28, 2024
a121a39
update profile backend changes
Bhupesh-mfsi Aug 29, 2024
247c9ce
Merge pull request #1158 from dm3-org/update-profile-backend-fix
AlexNi245 Aug 29, 2024
f46e2df
Merge branch 'develop' of https://github.com/corpus-io/dm3 into netwo…
Bhupesh-mfsi Aug 29, 2024
b265b70
some fixes for update profile
Bhupesh-mfsi Aug 30, 2024
f188528
added createOrUpdate profile function
Bhupesh-mfsi Aug 30, 2024
1ec2932
added updated profile check in test
Bhupesh-mfsi Aug 30, 2024
f81271e
fixed breaking test of update profile
Bhupesh-mfsi Aug 30, 2024
5e91690
fixed expect statement of test
Bhupesh-mfsi Aug 30, 2024
f6a7ebd
fixed broken test
Bhupesh-mfsi Aug 30, 2024
7a81827
Merge pull request #1161 from dm3-org/update-profile-backend-fix
Bhupesh-mfsi Aug 30, 2024
057ff2f
Merge branch 'develop' of https://github.com/corpus-io/dm3 into netwo…
Bhupesh-mfsi Aug 30, 2024
9e2191d
Merge branch 'develop' into removeWinston
malteish Sep 2, 2024
da38428
Merge pull request #1150 from dm3-org/removeWinston
AlexNi245 Sep 2, 2024
e1c382e
add missing safe-stable-stringify
AlexNi245 Sep 2, 2024
ade0aa8
fixed DM3 name update profile
Bhupesh-mfsi Sep 2, 2024
14f1d4b
Merge branch 'develop' of https://github.com/corpus-io/dm3 into netwo…
Bhupesh-mfsi Sep 2, 2024
ed50f40
pin prisma major version
malteish Sep 3, 2024
55f13c5
update metrics db structure
malteish Sep 3, 2024
a11e091
load metrics config from env
malteish Sep 3, 2024
cb1c90d
add tests
malteish Sep 3, 2024
c01235a
Merge pull request #1143 from dm3-org/syncPrismaVersions
AlexNi245 Sep 3, 2024
987d0e1
wire in countMessage
malteish Sep 3, 2024
90dbb91
fix test
malteish Sep 3, 2024
d7203d8
update getMetrics function
malteish Sep 3, 2024
73b5e47
add tests for getMetrics
malteish Sep 3, 2024
ff16d9e
add logging
malteish Sep 3, 2024
12bbc05
fixed resolver issue of ENS
Bhupesh-mfsi Sep 3, 2024
b1948aa
Merge branch 'develop' of https://github.com/corpus-io/dm3 into netwo…
Bhupesh-mfsi Sep 3, 2024
f7094e7
get resoler address properly
AlexNi245 Sep 3, 2024
c2e16dd
change metrics return type
malteish Sep 4, 2024
8a97748
censor current interval
malteish Sep 4, 2024
2653186
reduce logging
malteish Sep 4, 2024
4b98fc4
Merge branch 'develop' into addMetricsApi
malteish Sep 4, 2024
374c484
fix types
malteish Sep 4, 2024
a5091f3
fix test
malteish Sep 4, 2024
e2425a8
fixed DS name publish profile issue
Bhupesh-mfsi Sep 4, 2024
3db3ddf
await db write
malteish Sep 4, 2024
caca795
enable notification counting
malteish Sep 4, 2024
48986d2
disable censoring for testing
malteish Sep 4, 2024
68afb10
added use memo
Bhupesh-mfsi Sep 4, 2024
2159900
Merge pull request #1156 from dm3-org/network-dialog
AlexNi245 Sep 5, 2024
e146cea
load metrics config
malteish Sep 5, 2024
4befb98
cleanup
malteish Sep 5, 2024
7cc02d0
fix metrics tests
malteish Sep 5, 2024
9552bf5
fix test
malteish Sep 5, 2024
f596318
enable metrics censoring and add test
malteish Sep 5, 2024
86f2ba7
enable tests
malteish Sep 5, 2024
fd24448
cleanup
malteish Sep 5, 2024
0d5cd69
Merge pull request #1162 from dm3-org/addMetricsApi
malteish Sep 5, 2024
c3648f0
fixed delete msg issue
Bhupesh-mfsi Sep 9, 2024
e8f2d90
Merge branch 'hotfix-1174' of https://github.com/corpus-io/dm3 into h…
Bhupesh-mfsi Sep 9, 2024
2385756
removed test
Bhupesh-mfsi Sep 9, 2024
e98cc2a
Revert "removed test"
Bhupesh-mfsi Sep 9, 2024
90e32b2
Revert "fixed delete msg issue"
Bhupesh-mfsi Sep 9, 2024
f117bf5
fixed delete msg issue
Bhupesh-mfsi Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@
"@dm3-org/dm3-lib-shared": "workspace:^",
"@dm3-org/dm3-lib-storage": "workspace:^",
"@dm3-org/dm3-lib-test-helper": "workspace:^",
"@prisma/client": "4.16.2",
"@prisma/client": "^5.19.1",
"axios": "^0.27.2",
"body-parser": "^1.20.1",
"cors": "^2.8.5",
"dotenv": "^16.0.1",
"ethers": "5.7.2",
"express": "^4.18.1",
"prisma": "^5.10.1",
"redis": "^4.1.0",
"web-push": "^3.6.7",
"winston": "^3.8.1",
"yaml": "^2.1.3"
},
"scripts": {
Expand All @@ -33,7 +31,7 @@
"start": "yarn prisma-init && node ./dist/index.js",
"start-inspect": "node --inspect=0.0.0.0:9229 ./dist/index.js",
"test": "yarn run before:tests && DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests?schema=public' yarn jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)'",
"build": "yarn prisma generate && yarn tsc && cp ./config.yml ./dist/config.yml | true",
"build": "yarn prisma generate && yarn tsc | true",
"build:schema": "sh ./schemas.sh",
"createDeliveryServiceProfile": "node --no-warnings ./cli.js",
"before:tests": "docker compose -f docker-compose.test.yml up -d && DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests?schema=public' yarn prisma-init"
Expand All @@ -53,6 +51,7 @@
"jest": "^29.2.2",
"jest-mock-extended": "2.0.4",
"prettier": "^2.6.2",
"prisma": "^5.19.1",
"superagent": "^8.0.3",
"supertest": "^6.3.1",
"ts-json-schema-generator": "^0.98.0",
Expand Down
175 changes: 0 additions & 175 deletions packages/backend/src/config/getDeliveryServiceProperties.test.ts

This file was deleted.

60 changes: 0 additions & 60 deletions packages/backend/src/config/getDeliveryServiceProperties.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/delivery-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"@dm3-org/dm3-lib-profile": "workspace:^",
"@dm3-org/dm3-lib-server-side": "workspace:^",
"@dm3-org/dm3-lib-shared": "workspace:^",
"@prisma/client": "4.16.2",
"axios": "^0.27.2",
"body-parser": "^1.20.1",
"dotenv": "^16.0.1",
Expand All @@ -20,7 +19,6 @@
"redis": "^4.1.0",
"socket.io": "^4.5.1",
"web-push": "^3.6.7",
"winston": "^3.8.1",
"yaml": "^2.1.3"
},
"scripts": {
Expand All @@ -29,6 +27,7 @@
"start-inspect": "node --inspect=0.0.0.0:9229 ./dist/index.js",
"test": "yarn run before:tests && jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)' ",
"build": "yarn tsc ",
"dev": "nodemon --exec 'ts-node ./src/index.ts' --watch src --ext ts",
"createDeliveryServiceProfile": "node --no-warnings ./cli.js",
"before:tests": "docker compose -f docker-compose.test.yml up -d",
"after:tests": "docker compose -f docker-compose.test.yml down"
Expand All @@ -47,6 +46,7 @@
"babel-preset-env": "^1.7.0",
"jest": "^29.2.2",
"jest-mock-extended": "2.0.4",
"nodemon": "^3.1.4",
"prettier": "^2.6.2",
"superagent": "^8.0.3",
"supertest": "^6.3.1",
Expand Down
Loading
Loading