-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
95 additions
and
79 deletions.
There are no files selected for viewing
18 changes: 10 additions & 8 deletions
18
migrations/1720553769343-changeMicroserviceAndCategoryOfNotifyRewardNotificationType.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,25 @@ | ||
import { MigrationInterface, QueryRunner } from "typeorm"; | ||
import { MigrationInterface, QueryRunner } from 'typeorm'; | ||
import { MICRO_SERVICES } from '../src/utils/utils'; | ||
import { NOTIFICATION_CATEGORY } from '../src/types/general'; | ||
|
||
export class changeMicroserviceAndCategoryOfNotifyRewardNotificationType1720553769343 implements MigrationInterface { | ||
public async up(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
export class changeMicroserviceAndCategoryOfNotifyRewardNotificationType1720553769343 | ||
implements MigrationInterface | ||
{ | ||
public async up(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
UPDATE notification_type | ||
SET "microService" = '${MICRO_SERVICES.notifyReward}', | ||
category = '${NOTIFICATION_CATEGORY.ORTTO}' | ||
WHERE name = 'Notify reward amount'; | ||
`); | ||
} | ||
} | ||
|
||
public async down(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
public async down(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
UPDATE notification_type | ||
SET "microService" = '${MICRO_SERVICES.givethio}', | ||
categoty = '${NOTIFICATION_CATEGORY.GENERAL}' | ||
WHERE name = 'Notify reward amount'; | ||
`); | ||
} | ||
} | ||
} |
29 changes: 15 additions & 14 deletions
29
migrations/1720828190666-seedThirdPartyForNotifyReward.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,28 @@ | ||
import { MigrationInterface, QueryRunner } from "typeorm" | ||
import { MigrationInterface, QueryRunner } from 'typeorm'; | ||
|
||
export class seedThirdPartyForNotifyReward1720828190666 implements MigrationInterface { | ||
public async up(queryRunner: QueryRunner): Promise<void> { | ||
if ( | ||
process.env.NODE_ENV === 'test' || | ||
process.env.NODE_ENV === 'development' | ||
) { | ||
// Create third part record for notifyreward in development and test ENVs | ||
await queryRunner.query(` | ||
export class seedThirdPartyForNotifyReward1720828190666 | ||
implements MigrationInterface | ||
{ | ||
public async up(queryRunner: QueryRunner): Promise<void> { | ||
if ( | ||
process.env.NODE_ENV === 'test' || | ||
process.env.NODE_ENV === 'development' | ||
) { | ||
// Create third part record for notifyreward in development and test ENVs | ||
await queryRunner.query(` | ||
INSERT INTO third_party( | ||
"microService", secret, "isActive") | ||
VALUES | ||
('notifyreward', 'secret', true) | ||
; | ||
`); | ||
} | ||
} | ||
} | ||
|
||
public async down(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
public async down(queryRunner: QueryRunner): Promise<void> { | ||
await queryRunner.query(` | ||
DELETE FROM third_party | ||
WHERE "microService" = 'notifyreward'; | ||
`); | ||
} | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,9 +27,10 @@ | |
"keywords": [], | ||
"author": "", | ||
"license": "ISC", | ||
"packageManager": "[email protected]", | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "npm run lint" | ||
"pre-commit": "npm run lint:fix" | ||
} | ||
}, | ||
"dependencies": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2096,24 +2096,24 @@ function sendNotificationTestCases() { | |
|
||
it('should create *Notify reward amount* notification, success', async () => { | ||
const data = { | ||
eventName: "Notify reward amount", | ||
eventName: 'Notify reward amount', | ||
sendEmail: true, | ||
sendSegment: true, | ||
creationTime: 1667992708000, | ||
email: "[email protected]", | ||
email: '[email protected]', | ||
segment: { | ||
payload: { | ||
round: 10, | ||
date: "1667992708000", | ||
amount: "12134", | ||
contractAddress: "0xsfglsjfdflk", | ||
farm: "test farm", | ||
message: "test message", | ||
network: "ethereum", | ||
script: "test script", | ||
transactionHash: "test txhash" | ||
} | ||
} | ||
date: '1667992708000', | ||
amount: '12134', | ||
contractAddress: '0xsfglsjfdflk', | ||
farm: 'test farm', | ||
message: 'test message', | ||
network: 'ethereum', | ||
script: 'test script', | ||
transactionHash: 'test txhash', | ||
}, | ||
}, | ||
}; | ||
|
||
const result = await axios.post(sendNotificationUrl, data, { | ||
|
@@ -2129,25 +2129,25 @@ function sendNotificationTestCases() { | |
it('should create *Notify reward amount* notification, failed invalid payload', async () => { | ||
try { | ||
const data = { | ||
eventName: "Notify reward amount", | ||
eventName: 'Notify reward amount', | ||
sendEmail: true, | ||
sendSegment: true, | ||
creationTime: 1667992708000, | ||
email: "[email protected]", | ||
email: '[email protected]', | ||
segment: { | ||
payload: { | ||
round: 10, | ||
date: "1667992708000", | ||
amount: "12134", | ||
contractAddress: "0xsfglsjfdflk", | ||
farm: "test farm", | ||
message: "test message", | ||
network: "ethereum", | ||
script: "test script", | ||
transactionHash: "test txhash", | ||
invalidField: "invalid data" | ||
} | ||
} | ||
date: '1667992708000', | ||
amount: '12134', | ||
contractAddress: '0xsfglsjfdflk', | ||
farm: 'test farm', | ||
message: 'test message', | ||
network: 'ethereum', | ||
script: 'test script', | ||
transactionHash: 'test txhash', | ||
invalidField: 'invalid data', | ||
}, | ||
}, | ||
}; | ||
await axios.post(sendNotificationUrl, data, { | ||
headers: { | ||
|
@@ -2161,7 +2161,10 @@ function sendNotificationTestCases() { | |
e.response.data.message, | ||
errorMessagesEnum.IMPACT_GRAPH_VALIDATION_ERROR.message, | ||
); | ||
assert.equal(e.response.data.description, '"segment.payload.invalidField" is not allowed'); | ||
assert.equal( | ||
e.response.data.description, | ||
'"segment.payload.invalidField" is not allowed', | ||
); | ||
} | ||
}); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
import { expect } from 'chai'; | ||
import { activityCreator } from './notificationService'; | ||
import { NOTIFICATIONS_EVENT_NAMES } from '../types/notifications'; | ||
import { expect } from 'chai'; | ||
|
||
describe('activityCreator', () => { | ||
it('should create attributes for NOTIFY_REWARD_AMOUNT', () => { | ||
|
@@ -14,30 +14,35 @@ describe('activityCreator', () => { | |
network: 'Test Network', | ||
script: 'Test Script', | ||
transactionHash: '0xabc', | ||
email: '[email protected]' | ||
email: '[email protected]', | ||
}; | ||
const result = activityCreator(payload, NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT); | ||
expect(JSON.stringify(result)).equal(JSON.stringify({ | ||
activities: [ | ||
{ | ||
activity_id: "act:cm:notify-reward-amount", | ||
attributes: { | ||
'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, | ||
'str:cm:message': payload.message, | ||
'str:cm:network': payload.network, | ||
'str:cm:script': payload.script, | ||
'str:cm:transactionhash': payload.transactionHash, | ||
}, | ||
fields: { | ||
'str::email': payload.email, | ||
const result = activityCreator( | ||
payload, | ||
NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT, | ||
); | ||
expect(JSON.stringify(result)).equal( | ||
JSON.stringify({ | ||
activities: [ | ||
{ | ||
activity_id: 'act:cm:notify-reward-amount', | ||
attributes: { | ||
'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, | ||
'str:cm:message': payload.message, | ||
'str:cm:network': payload.network, | ||
'str:cm:script': payload.script, | ||
'str:cm:transactionhash': payload.transactionHash, | ||
}, | ||
fields: { | ||
'str::email': payload.email, | ||
}, | ||
}, | ||
}, | ||
], | ||
merge_by: ['str::email'], | ||
})); | ||
}) | ||
], | ||
merge_by: ['str::email'], | ||
}), | ||
); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters