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.

Sign up for GitHub

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

Jump to bottom

fix: hot fix production mq issue #79

Merged
merged 5 commits into from
Nov 10, 2024
Merged

fix: hot fix production mq issue #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22c2615
build: bump dependencies
mrcaidev Nov 10, 2024
0bbdb52
fix: id in Account Update Queue
MrPhotato Nov 10, 2024
f4c3bed
Merge remote-tracking branch 'origin/NSHM-135-Listen-to-account-updat…
MrPhotato Nov 10, 2024
970589a
build: bump dependencies
mrcaidev Nov 10, 2024
e5058c9
chore: merge branch 'NSHM-135-Listen-to-account-update-queue' of gith…
mrcaidev Nov 10, 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
9 changes: 1 addition & 8 deletions services/account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,8 @@ Account service is responsible for account-related operations, such as registrat
{
{
"id": 1,
"email": "[email protected]",
"nickname": "mrcaidev",
"avatar_url": "https://avatars.githubusercontent.com/u/78269445?v=4",
"department_id": 1,
"phone_code": "65",
"phone_number": "80843976",
"preferred_currency": "CNY",
"created_at": "2024-09-23 12:19:10.415264+00",
"deleted_at": null
"avatar_url": "https://avatars.githubusercontent.com/u/78269445?v=4"
}
}
```
Expand Down
4 changes: 4 additions & 0 deletions services/account/src/main/java/edu/nus/market/service/AccountServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,16 @@ public ResponseEntity<Object> updateProfileService(UpdateProfileReq updateProfil
accountDao.hardDeleteAccount(checkAccount.getId());
}
}

account = new Account(updateProfileReq);

if (emailTransaction != null)
account.setEmail(emailTransaction.getEmail());

ResAccount resAccount = new ResAccount(accountDao.updateProfile(account, id));

account = accountDao.getAccountById(id);

mqService.sendUpdateMessage(new UpdateMessage(account));
return ResponseEntity.status(HttpStatus.OK).body(resAccount);

Expand Down
Binary file modified services/item/bun.lockb
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion services/item/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "bun build --outdir dist --target bun --minify src/index.ts"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.686.0",
"@aws-sdk/client-s3": "^3.688.0",
"amqplib": "^0.10.4",
"hono": "^4.6.9",
"jsonwebtoken": "^9.0.2",
Expand Down
26 changes: 13 additions & 13 deletions services/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,38 @@
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-tooltip": "^1.1.3",
"@radix-ui/react-use-controllable-state": "^1.1.0",
"@tanstack/react-query": "^5.59.16",
"@tanstack/react-query-devtools": "^5.59.16",
"@tanstack/react-query": "^5.59.20",
"@tanstack/react-query-devtools": "^5.59.20",
"@tanstack/react-table": "^8.20.5",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"cmdk": "^1.0.4",
"dayjs": "^1.11.13",
"embla-carousel-react": "^8.3.0",
"input-otp": "^1.2.4",
"lucide-react": "^0.453.0",
"next": "^15.0.1",
"embla-carousel-react": "^8.3.1",
"input-otp": "^1.4.1",
"lucide-react": "^0.456.0",
"next": "^15.0.3",
"react": "19.0.0-rc-45804af1-20241021",
"react-dom": "19.0.0-rc-45804af1-20241021",
"sharp": "^0.33.5",
"tailwind-merge": "^2.5.4",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.14",
"tailwindcss-animate": "^1.0.7",
"valibot": "^0.42.1",
"winston": "^3.15.0",
"valibot": "1.0.0-beta.3",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0"
},
"devDependencies": {
"@eslint/compat": "^1.2.1",
"@eslint/compat": "^1.2.2",
"@eslint/eslintrc": "^3.1.0",
"@types/eslint-config-prettier": "^6.11.3",
"@types/eslint__eslintrc": "^2.1.2",
"@types/node": "^22.7.9",
"@types/node": "^22.9.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"eslint": "^9.13.0",
"eslint-config-next": "^15.0.1",
"eslint": "^9.14.0",
"eslint-config-next": "^15.0.3",
"eslint-config-prettier": "^9.1.0",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
Expand Down
Loading
Loading