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

Implement recurringDonationsByUserId web service #1317

Merged
merged 3 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion migration/1706820821887-addmpEthToDatabaseTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class addmpEthToDatabaseTokens1706820821887
("address" = '0x48afbbd342f64ef8a9ab1c143719b63c2ad81710' AND "networkId" = ${NETWORK_IDS.MAIN_NET}) OR
("address" = '0x819845b60a192167ed1139040b4f8eca31834f27' AND "networkId" = ${NETWORK_IDS.OPTIMISTIC})
`);

if (exists && exists.length === 2) {
return;
}
Expand Down
12 changes: 12 additions & 0 deletions src/repositories/recurringDonationRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Project } from '../entities/project';
import { User } from '../entities/user';
import { RecurringDonation } from '../entities/recurringDonation';
import { AnchorContractAddress } from '../entities/anchorContractAddress';
import { Donation } from '../entities/donation';

export const createNewRecurringDonation = async (params: {
project: Project;
Expand Down Expand Up @@ -37,3 +38,14 @@ export const findActiveRecurringDonations = async (): Promise<
},
});
};

export const findRecurringDonationById = async (
donationId: number,
): Promise<RecurringDonation | null> => {
return RecurringDonation.createQueryBuilder('recurringDonation')
.where(`recurringDonation.id = :donationId`, {
donationId,
})
.leftJoinAndSelect('recurringDonation.project', 'project')
.getOne();
};
273 changes: 269 additions & 4 deletions src/resolvers/recurringDonationResolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,32 @@ import { assert } from 'chai';
import axios from 'axios';
import {
createRecurringDonationQuery,
fetchDonationsByProjectIdQuery,
fetchRecurringDonationsByProjectIdQuery,
fetchRecurringDonationsByUserIdQuery,
updateRecurringDonationStatusMutation,
} from '../../test/graphqlQueries';
import { errorMessages } from '../utils/errorMessages';
import { addNewAnchorAddress } from '../repositories/anchorContractAddressRepository';
import { Donation, DONATION_STATUS } from '../entities/donation';
import { RECURRING_DONATION_STATUS } from '../entities/recurringDonation';

describe(
'createRecurringDonation test cases',
createRecurringDonationTestCases,
);
describe('donationsByProjectId test cases', donationsByProjectIdTestCases);
describe(
'recurringDonationsByProjectId test cases',
recurringDonationsByProjectIdTestCases,
);

describe(
'recurringDonationsByUserId test cases',
recurringDonationsByUserIdTestCases,
);

describe(
'updateRecurringDonationStatus test cases',
updateRecurringDonationStatusTestCases,
);

function createRecurringDonationTestCases() {
it('should create recurringDonation successfully', async () => {
Expand Down Expand Up @@ -188,7 +202,7 @@ function createRecurringDonationTestCases() {
});
}

function donationsByProjectIdTestCases() {
function recurringDonationsByProjectIdTestCases() {
it('should sort by the createdAt DESC', async () => {
const project = await saveProjectDirectlyToDb(createProjectData());

Expand Down Expand Up @@ -521,3 +535,254 @@ function donationsByProjectIdTestCases() {
assert.equal(donations[0].status, 'verified');
});
}
function recurringDonationsByUserIdTestCases() {
it('should sort by the createdAt DESC', async () => {
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});

const result = await axios.post(
graphqlUrl,
{
query: fetchRecurringDonationsByUserIdQuery,
variables: {
userId: donor.id,
orderBy: {
field: 'createdAt',
direction: 'DESC',
},
},
},
{},
);
const donations =
result.data.data.recurringDonationsByUserId.recurringDonations;
assert.equal(result.data.data.recurringDonationsByUserId.totalCount, 2);
for (let i = 0; i < donations.length - 1; i++) {
assert.isTrue(donations[i].createdAt >= donations[i + 1].createdAt);
}
});
it('should sort by the createdAt ASC', async () => {
const project = await saveProjectDirectlyToDb(createProjectData());
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());

await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});

const result = await axios.post(
graphqlUrl,
{
query: fetchRecurringDonationsByUserIdQuery,
variables: {
userId: donor.id,
orderBy: {
field: 'createdAt',
direction: 'ASC',
},
},
},
{},
);

const donations =
result.data.data.recurringDonationsByUserId.recurringDonations;
assert.equal(result.data.data.recurringDonationsByUserId.totalCount, 2);
for (let i = 0; i < donations.length - 1; i++) {
assert.isTrue(donations[i].createdAt <= donations[i + 1].createdAt);
}
});
it('should sort by the amount ASC', async () => {
const project = await saveProjectDirectlyToDb(createProjectData());
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());

await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
amount: 100,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
amount: 200,
},
});

const result = await axios.post(
graphqlUrl,
{
query: fetchRecurringDonationsByUserIdQuery,
variables: {
userId: donor.id,
orderBy: {
field: 'amount',
direction: 'ASC',
},
},
},
{},
);

const donations =
result.data.data.recurringDonationsByUserId.recurringDonations;
assert.equal(result.data.data.recurringDonationsByUserId.totalCount, 2);
for (let i = 0; i < donations.length - 1; i++) {
assert.isTrue(donations[i].amount <= donations[i + 1].amount);
}
});
it('should sort by the amount DESC', async () => {
const project = await saveProjectDirectlyToDb(createProjectData());
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());

await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
amount: 100,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
amount: 200,
},
});

const result = await axios.post(
graphqlUrl,
{
query: fetchRecurringDonationsByUserIdQuery,
variables: {
userId: donor.id,
orderBy: {
field: 'amount',
direction: 'DESC',
},
},
},
{},
);

const donations =
result.data.data.recurringDonationsByUserId.recurringDonations;
assert.equal(result.data.data.recurringDonationsByUserId.totalCount, 2);
for (let i = 0; i < donations.length - 1; i++) {
assert.isTrue(donations[i].amount >= donations[i + 1].amount);
}
});
}
function updateRecurringDonationStatusTestCases() {
it('should donation status remain pending after calling without sending status (we assume its not mined so far)', async () => {
const transactionInfo = {
txHash: generateRandomEvmTxHash(),
networkId: NETWORK_IDS.XDAI,
amount: 1,
fromAddress: generateRandomEtheriumAddress(),
toAddress: generateRandomEtheriumAddress(),
currency: 'GIV',
timestamp: 1647069070,
};
const project = await saveProjectDirectlyToDb({
...createProjectData(),
walletAddress: transactionInfo.toAddress,
});
const user = await saveUserDirectlyToDb(transactionInfo.fromAddress);
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());
const donation = await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
assert.equal(donation.status, RECURRING_DONATION_STATUS.PENDING);

const accessToken = await generateTestAccessToken(donor.id);
const result = await axios.post(
graphqlUrl,
{
query: updateRecurringDonationStatusMutation,
variables: {
donationId: donation.id,
},
},
{
headers: {
Authorization: `Bearer ${accessToken}`,
},
},
);
assert.equal(
result.data.data.updateRecurringDonationStatus.status,
RECURRING_DONATION_STATUS.PENDING,
);
});

it('should update donation status to failed, tx is not mined and donor says it failed', async () => {
const transactionInfo = {
txHash: generateRandomEvmTxHash(),
networkId: NETWORK_IDS.XDAI,
amount: 1,
fromAddress: generateRandomEtheriumAddress(),
toAddress: generateRandomEtheriumAddress(),
currency: 'GIV',
timestamp: 1647069070,
};
const project = await saveProjectDirectlyToDb({
...createProjectData(),
walletAddress: transactionInfo.toAddress,
});
const user = await saveUserDirectlyToDb(transactionInfo.fromAddress);
const donor = await saveUserDirectlyToDb(generateRandomEtheriumAddress());
const donation = await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
await saveRecurringDonationDirectlyToDb({
donationData: {
donorId: donor.id,
},
});
assert.equal(donation.status, RECURRING_DONATION_STATUS.PENDING);

const accessToken = await generateTestAccessToken(donor.id);
const result = await axios.post(
graphqlUrl,
{
query: updateRecurringDonationStatusMutation,
variables: {
donationId: donation.id,
status: RECURRING_DONATION_STATUS.FAILED,
},
},
{
headers: {
Authorization: `Bearer ${accessToken}`,
},
},
);
assert.equal(
result.data.data.updateRecurringDonationStatus.status,
RECURRING_DONATION_STATUS.FAILED,
);
});
}
Loading
Loading