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

V2 2 0 release #126

Merged
merged 55 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d95526b
add eslint
RamRamez Jul 2, 2024
5a7e13c
add eslint
RamRamez Jul 2, 2024
007f753
add eslint
RamRamez Jul 2, 2024
18976dd
add eslint
RamRamez Jul 2, 2024
8c0aac4
fix eslint errors
RamRamez Jul 2, 2024
16b0e81
remove lock file
RamRamez Jul 2, 2024
8a6ab3a
Merge branch 'refs/heads/staging' into eslint
RamRamez Jul 17, 2024
966fd17
fix eslint errors
RamRamez Jul 17, 2024
10fe752
Change date schema to be compatible with ortto schema
ae2079 Jul 22, 2024
1a469c7
Merge pull request #105 from Giveth/eslint
RamRamez Jul 22, 2024
fe1c9f9
Fix unit test based on changes
ae2079 Jul 22, 2024
c548c78
Pull staging and resolve conflicts
ae2079 Jul 22, 2024
90528ac
Fix lint errors
ae2079 Jul 22, 2024
5eab9eb
Fix lint errors
ae2079 Jul 22, 2024
3a8e70b
change main-pipeline
RamRamez Jul 22, 2024
b530e65
feat: change GivethNotificationTypes seed
Reshzera Jul 22, 2024
c8fe8a6
fix: remove brake line
Reshzera Jul 22, 2024
aa3423a
Merge pull request #108 from Giveth/4194-make-orto-schema-compatible
ae2079 Jul 22, 2024
1922f6e
change Dockerfile
RamRamez Jul 23, 2024
385dd19
change Dockerfile to use yarn
RamRamez Jul 23, 2024
5e2fb97
Merge pull request #111 from Giveth/change-Dockerfile
RamRamez Jul 23, 2024
14a0d7f
remove userId from notify reward amount ortto request
ae2079 Jul 23, 2024
e45646a
Merge pull request #112 from Giveth/4194-make-notification-compatible…
ae2079 Jul 23, 2024
d779dfb
add email to payload for notify reward
ae2079 Jul 24, 2024
c36d275
Fix tests for notify reward
ae2079 Jul 24, 2024
37cfa70
fix: create migration to change givbacks notification
Reshzera Jul 24, 2024
42428dc
Merge pull request #110 from Giveth/feat/issue-2527
Reshzera Jul 24, 2024
64ebbfd
Change scripts to use ts-node for running migrations
ae2079 Jul 30, 2024
9d3823e
Add tsconfig-paths module to application
ae2079 Jul 30, 2024
b2678d6
ensure dataSource initialize before running migrations
ae2079 Jul 31, 2024
4618870
Update packages
ae2079 Jul 31, 2024
c1d245d
Use the previous version of ts
ae2079 Jul 31, 2024
c0e9ce3
Allow ts to resolve json modules
ae2079 Jul 31, 2024
ed56844
Run pretest scripts before test migrations
ae2079 Jul 31, 2024
9c6662d
Make pretest scripts stand alone
ae2079 Jul 31, 2024
6186262
Revert changes on pre-test-scripts.ts
ae2079 Jul 31, 2024
45f2075
remove pre-test-scripts from migration commands
ae2079 Jul 31, 2024
a02e696
downgrade typeorm version to fix migration execution
ae2079 Jul 31, 2024
0b6839d
run migrations using scripts
ae2079 Jul 31, 2024
5018277
Upgrade typeorm version again
ae2079 Jul 31, 2024
db16aa0
add create test database step to the staging-pipeline.yml
ae2079 Aug 1, 2024
5ed076b
add wait for database step to the staging-pipeline.yml
ae2079 Aug 1, 2024
a805727
change database port in the staging-pipeline.yml
ae2079 Aug 1, 2024
135f6d1
change database name in the staging-pipeline.yml and remove redundant…
ae2079 Aug 1, 2024
5a290b8
change database name in the main-pipeline.yml
ae2079 Aug 1, 2024
1436576
Merge pull request #113 from Giveth/fix-migrations-execution-issue
ae2079 Aug 1, 2024
28d21a2
add migration for create Qacc third party
ae2079 Aug 12, 2024
0a22290
Merge pull request #117 from Giveth/addQaccThirdParty
aminlatifi Aug 12, 2024
ede15cf
support Qacc on Ortto
ae2079 Aug 20, 2024
9ba9425
Add Qacc to microServices
ae2079 Aug 20, 2024
6d73ff7
Merge pull request #119 from Giveth/supportQaccOnOrtto
ae2079 Aug 20, 2024
b452f6b
Resolve merge conflicts
mohammadranjbarz Aug 28, 2024
a69f240
Feat/User mail verification notification
kkatusic Nov 15, 2024
3eada61
Merge pull request #124 from Giveth/enable_user_email_verification
kkatusic Nov 22, 2024
ada2cff
Merge branch 'main' into v2_2_0_release
kkatusic Dec 4, 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
Prev Previous commit
Next Next commit
Change date schema to be compatible with ortto schema
ae2079 committed Jul 22, 2024
commit 10fe75278ea46570c15ee3f1d47b83a96687f9cd
2 changes: 1 addition & 1 deletion src/services/notificationService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('activityCreator', () => {
expect(JSON.stringify(result)).equal(JSON.stringify({
activities: [
{
activity_id: "act:cm:notify-reward-amount",
activity_id: "act:cm:notify-reward",
attributes: {
'int:cm:round': payload.round,
'str:cm:date': payload.date,
Expand Down
9 changes: 8 additions & 1 deletion src/services/notificationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { NOTIFICATION_CATEGORY } from '../types/general';

export const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES) : any=> {
let attributes;
let date;
switch (orttoEventName) {
case NOTIFICATIONS_EVENT_NAMES.SUBSCRIBE_ONBOARDING:
attributes = {
Expand Down Expand Up @@ -170,9 +171,15 @@ export const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVEN
}
break
case NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT:
date = new Date(Number(payload.date));
attributes = {
"dtz:cm:date": {
"year": date.getUTCFullYear(),
"month": date.getUTCMonth() + 1, // JavaScript's months are zero-indexed
"day": date.getUTCDate(),
"timezone": "UTC"
},
"int:cm:round": payload.round,
"str:cm:date": payload.date,
"str:cm:amount": payload.amount,
"str:cm:contractaddress": payload.contractAddress,
"str:cm:farm": payload.farm,
Expand Down
2 changes: 1 addition & 1 deletion src/types/notifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ export const ORTTO_EVENT_NAMES = {
[NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKE_LAST_WARNING]: 'second-update-warning',
[NOTIFICATIONS_EVENT_NAMES.CREATE_ORTTO_PROFILE]: 'created-profile',
[NOTIFICATIONS_EVENT_NAMES.SEND_EMAIL_CONFIRMATION]: 'verification-form-email-verification',
[NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT]: 'notify-reward-amount',
[NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT]: 'notify-reward',
[NOTIFICATIONS_EVENT_NAMES.SUBSCRIBE_ONBOARDING]: 'onboarding-form',
}
Loading