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

Import from Donation Backup Service #1253

Merged
merged 14 commits into from
Jan 23, 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
13 changes: 13 additions & 0 deletions config/example.env
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,16 @@ LOST_DONATIONS_NETWORK_ID=

SOLANA_CHAIN_ID=103
DISABLE_NOTIFICATION_CENTER=
ENABLE_IMPORT_DONATION_BACKUP=false
DONATION_SAVE_BACKUP_API_URL=
DONATION_SAVE_BACKUP_API_SECRET=
DONATION_SAVE_BACKUP_CRONJOB_EXPRESSION=
DONATION_SAVE_BACKUP_DATA_SOURCE=

# default value is failed_donation
DONATION_SAVE_BACKUP_COLLECTION=
# default value is failed_donation
DONATION_SAVE_BACKUP_DATABASE=

# Default value is saveBackup
DONATION_SAVE_BACKUP_ADAPTER=saveBackup
4 changes: 4 additions & 0 deletions config/test.env
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,7 @@ LOST_DONATIONS_QF_ROUND=
LOST_DONATIONS_NETWORK_ID=10

DISABLE_NOTIFICATION_CENTER=false
DONATION_SAVE_BACKUP_CRONJOB_EXPRESSION=
ENABLE_IMPORT_DONATION_BACKUP=false
DONATION_SAVE_BACKUP_API_URL=
DONATION_SAVE_BACKUP_API_SECRET=
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"tslint:fix": "tslint -c tslint.json --fix '{src,test,migration}/**/*.ts'",
"test": "NODE_ENV=test mocha --config ./.mocharc.all-test.json",
"test:syncProjectsRequiredForListing": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/services/cronJobs/syncProjectsRequiredForListing.test.ts",
"test:backupDonationImport": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/services/cronJobs/backupDonationImport.test.ts",
"test:projectEntity": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/entities/project.test.ts",
"test:projectValidators": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/utils/validators/projectValidator.test.ts",
"test:onramperWebhook": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/services/onramper/webhookHandler.test.ts",
Expand Down
16 changes: 16 additions & 0 deletions src/adapters/adaptersFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { GitcoinAdapter } from './gitcoin/gitcoinAdapter';
import { GitcoinMockAdapter } from './gitcoin/gitcoinMockAdapter';
import { GivPowerBalanceAggregatorAdapter } from './givPowerBalanceAggregator/givPowerBalanceAggregatorAdapter';
import { GivPowerBalanceAggregatorAdapterMock } from './givPowerBalanceAggregator/givPowerBalanceAggregatorAdapterMock';
import { DonationSaveBackupAdapter } from './donationSaveBackup/donationSaveBackupAdapter';
import { DonationSaveBackupMockAdapter } from './donationSaveBackup/DonationSaveBackupMockAdapter';

const discordAdapter = new DiscordAdapter();
const googleAdapter = new GoogleAdapter();
Expand Down Expand Up @@ -118,3 +120,17 @@ export const getPowerBalanceAggregatorAdapter = () => {
return mockPowerBalanceAggregator;
}
};

const donationSaveBackupAdapter = new DonationSaveBackupAdapter();
const mockDonationSaveBackupAdapter = new DonationSaveBackupMockAdapter();

export const getDonationSaveBackupAdapter = () => {
switch (process.env.DONATION_SAVE_BACKUP_ADAPTER) {
case 'saveBackup':
return donationSaveBackupAdapter;
case 'mock':
return mockDonationSaveBackupAdapter;
default:
return mockDonationSaveBackupAdapter;
}
};
43 changes: 43 additions & 0 deletions src/adapters/donationSaveBackup/DonationSaveBackupInterface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
export type FetchedSavedFailDonationInterface = {
_id: string;
txHash: string;
imported?: boolean;
importError?: string;
token: {
symbol: string;
address: string;
networkId: number;
};
walletAddress: string;
amount: number;
chainId: number;
projectId: number;
anonymous: boolean;
nonce: number;
symbol: string;
chainvineReferred?: string;
safeTransactionId?: string;
};

export interface DonationSaveBackupInterface {
getNotImportedDonationsFromBackup(params: {
limit: number;
}): Promise<FetchedSavedFailDonationInterface[]>;

getSingleDonationFromBackupByTxHash(
txHash: string,
): Promise<FetchedSavedFailDonationInterface | null>;

markDonationAsImported(donationMongoId: string): Promise<void>;

unmarkDonationAsImported(donationMongoId: string): Promise<void>;

getSingleDonationFromBackupById(
donationMongoId: string,
): Promise<FetchedSavedFailDonationInterface | null>;

markDonationAsImportError(
donationMongoId: string,
errorMessage,
): Promise<void>;
}
41 changes: 41 additions & 0 deletions src/adapters/donationSaveBackup/DonationSaveBackupMockAdapter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import {
DonationSaveBackupInterface,
FetchedSavedFailDonationInterface,
} from './DonationSaveBackupInterface';

export class DonationSaveBackupMockAdapter
implements DonationSaveBackupInterface
{
async getNotImportedDonationsFromBackup(params: {
limit: number;
}): Promise<FetchedSavedFailDonationInterface[]> {
return [];
}

async getSingleDonationFromBackupByTxHash(
txHash: string,
): Promise<FetchedSavedFailDonationInterface | null> {
return null;
}

async markDonationAsImported(donationMongoId: string): Promise<void> {
//
}

async unmarkDonationAsImported(donationMongoId: string): Promise<void> {
//
}

async getSingleDonationFromBackupById(
donationMongoId: string,
): Promise<FetchedSavedFailDonationInterface | null> {
return null;
}

markDonationAsImportError(
donationMongoId: string,
errorMessage,
): Promise<void> {
return Promise.resolve(undefined);
}
}
218 changes: 218 additions & 0 deletions src/adapters/donationSaveBackup/donationSaveBackupAdapter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
// a method the get objects from mongodb api read from config DONATION_SAVE_BACKUP_API_URL with sercret read from DONATION_SAVE_BACKUP_API_SECRET,
// it must filter objects by those doesn't have `imported` field with true value
// also must support pagination

import { logger } from '../../utils/logger';
import config from '../../config';
import axios from 'axios';
import {
DonationSaveBackupInterface,
FetchedSavedFailDonationInterface,
} from './DonationSaveBackupInterface';

const DONATION_SAVE_BACKUP_API_URL = config.get(
'DONATION_SAVE_BACKUP_API_URL',
) as string;
const DONATION_SAVE_BACKUP_API_SECRET = config.get(
'DONATION_SAVE_BACKUP_API_SECRET',
) as string;
const DONATION_SAVE_BACKUP_DATA_SOURCE = config.get(
'DONATION_SAVE_BACKUP_DATA_SOURCE',
) as string;
const DONATION_SAVE_BACKUP_COLLECTION =
config.get('DONATION_SAVE_BACKUP_COLLECTION') || 'failed_donation';
const DONATION_SAVE_BACKUP_DATABASE =
config.get('DONATION_SAVE_BACKUP_DATABASE') || 'failed_donation';

// add '/' if doesn't exist at the
const baseUrl = DONATION_SAVE_BACKUP_API_URL.endsWith('/')
? DONATION_SAVE_BACKUP_API_URL
: `${DONATION_SAVE_BACKUP_API_URL}/`;

export class DonationSaveBackupAdapter implements DonationSaveBackupInterface {
async getNotImportedDonationsFromBackup(params: {
limit: number;
}): Promise<FetchedSavedFailDonationInterface[]> {
const result = await axios.post(
`${baseUrl}find`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
limit: params.limit,
filter: {
imported: { $ne: true },
importError: { $ne: true },
},
sort: { _id: 1 },
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('getNotImportedDonationsFromBackup error', result.data);
throw new Error('getNotImportedDonationsFromBackup error');
}
return result.data.documents;
}

async getSingleDonationFromBackupByTxHash(
txHash: string,
): Promise<FetchedSavedFailDonationInterface | null> {
const result = await axios.post(
`${baseUrl}findOne`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
filter: {
txHash,
},
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('getSingleDonationFromBackupByTxHash error', result.data);
throw new Error('getSingleDonationFromBackupByTxHash error');
}
return result.data.document;
}

async markDonationAsImported(donationMongoId: string): Promise<void> {
const result = await axios.post(
`${baseUrl}updateOne`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
filter: {
_id: { $oid: donationMongoId },
},
update: {
$set: {
imported: true,
},
},
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('markDonationAsImported error', result.data);
throw new Error('markDonationAsImported error');
}
}

async markDonationAsImportError(
donationMongoId: string,
errorMessage,
): Promise<void> {
const result = await axios.post(
`${baseUrl}updateOne`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
filter: {
_id: { $oid: donationMongoId },
},
update: {
$set: {
importError: errorMessage,
},
},
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('markDonationAsImportError error', result.data);
throw new Error('markDonationAsImportError error');
}
}

async getSingleDonationFromBackupById(
donationMongoId: string,
): Promise<FetchedSavedFailDonationInterface | null> {
const result = await axios.post(
`${baseUrl}findOne`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
filter: {
_id: { $oid: donationMongoId },
},
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('getSingleDonationFromBackupById error', result.data);
throw new Error('getSingleDonationFromBackupById error');
}
return result.data.document;
}

async unmarkDonationAsImported(donationMongoId: string): Promise<void> {
const result = await axios.post(
`${baseUrl}updateOne`,
{
collection: DONATION_SAVE_BACKUP_COLLECTION,
database: DONATION_SAVE_BACKUP_DATABASE,
dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE,
filter: {
_id: { $oid: donationMongoId },
},
update: {
$unset: {
imported: '',
},
},
},
{
headers: {
'api-key': DONATION_SAVE_BACKUP_API_SECRET,
'Content-Type': 'application/json',
'Access-Control-Request-Headers': '*',
},
},
);

if (result.status !== 200) {
logger.error('unmarkDonationAsImported error', result.data);
throw new Error('unmarkDonationAsImported error');
}
}
}
3 changes: 2 additions & 1 deletion src/resolvers/donationResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ class DonationCurrencyStats {

@Resolver(of => User)
export class DonationResolver {
constructor(private readonly donationRepository: Repository<Donation>) {
private readonly donationRepository: Repository<Donation>;
constructor() {
this.donationRepository =
AppDataSource.getDataSource().getRepository(Donation);
}
Expand Down
5 changes: 5 additions & 0 deletions src/server/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import { runCheckActiveStatusOfQfRounds } from '../services/cronJobs/checkActive
import { runUpdateProjectCampaignsCacheJob } from '../services/cronJobs/updateProjectCampaignsCacheJob';
import { corsOptions } from './cors';
import { runSyncLostDonations } from '../services/cronJobs/importLostDonationsJob';
import { runSyncBackupServiceDonations } from '../services/cronJobs/backupDonationImportJob';

Resource.validate = validate;

Expand Down Expand Up @@ -340,6 +341,10 @@ export async function bootstrap() {
runSyncLostDonations();
}

if ((config.get('ENABLE_IMPORT_DONATION_BACKUP') as string) === 'true') {
runSyncBackupServiceDonations();
}

if (
(config.get('FILL_POWER_SNAPSHOT_BALANCE_SERVICE_ACTIVE') as string) ===
'true'
Expand Down
Loading
Loading