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

fix: run check inqueu subscription if some subscription is inactive #276

Merged
merged 2 commits into from
Jan 24, 2023
Merged

fix: run check inqueu subscription if some subscription is inactive #276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32ba24
run check inqueu subscription if some subscription is inactive
rubenkristian Jan 24, 2023
4b0074d
Merge branch 'main' into fix/menstrual-subscription-scheduler
irmannmal Jan 24, 2023
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
125 changes: 63 additions & 62 deletions src/schedulers/menstrual-subscription/menstrual-subscription.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { PaymentStatus } from '@debionetwork/polkadot-provider/lib/primitives/pa
export class MenstrualSubscriptionService {
private logger: Logger = new Logger(MenstrualSubscriptionService.name);
private isRunningInActive = false;
private isRunningInQueue = false;
private timer: number;
private menstrualSubscriptionDuration: { [key: string]: number };
constructor(
private readonly gCloudSecretManagerService: GCloudSecretManagerService<keyList>,
Expand All @@ -24,9 +22,6 @@ export class MenstrualSubscriptionService {
) {}

onModuleInit() {
this.timer = strToMilisecond(
this.gCloudSecretManagerService.getSecret('UNSTAKE_TIMER').toString(),
);
const unstakeInterval: number = strToMilisecond(
this.gCloudSecretManagerService.getSecret('UNSTAKE_INTERVAL').toString(),
);
Expand All @@ -37,33 +32,26 @@ export class MenstrualSubscriptionService {
const menstrualSubscriptionInActive = setInterval(async () => {
await this.handleInActiveMenstrualSubscription();
}, unstakeInterval);
const menstrualSubscriptionInQueue = setInterval(async () => {
await this.handleInQueueMenstrualSubscription();
}, unstakeInterval);
this.schedulerRegistry.addInterval(
'menstrual-subscription-inactive',
menstrualSubscriptionInActive,
);
this.schedulerRegistry.addInterval(
'menstrual-subscription-inqueue',
menstrualSubscriptionInQueue,
);
}

async handleInQueueMenstrualSubscription() {
async handleInActiveMenstrualSubscription() {
try {
if (this.isRunningInQueue || this.subtrateService.api === undefined)
if (this.isRunningInActive || this.subtrateService.api === undefined)
return;

this.isRunningInQueue = true;
this.isRunningInActive = true;
const menstrualSubscription = await this.elasticsearchService.search({
index: 'menstrual-subscription',
allow_no_indices: true,
body: {
query: {
match: {
status: {
query: 'InQueue',
query: 'Active',
},
},
},
Expand All @@ -80,66 +68,79 @@ export class MenstrualSubscriptionService {
size: 10,
});

const currtime = new Date().getTime();

const listMenstrualSubscription = menstrualSubscription.body.hits.hits;
for (const menstrualSubscription of listMenstrualSubscription) {
if (this.subtrateService.api === undefined) break;

const menstrualSubscriptionId = menstrualSubscription['_source']['id'];
const duration = menstrualSubscription['_source']['duration'];
const date = menstrualSubscription['_source']['updated_at'];

const menstrualSubscriptionData = await queryMenstrualSubscriptionById(
this.subtrateService.api,
menstrualSubscriptionId,
);

if (
menstrualSubscriptionData.status === SubscriptionStatus.InQueue &&
menstrualSubscriptionData.paymentStatus === PaymentStatus.Paid
) {
await changeMenstrualSubscriptionStatus(
this.subtrateService.api,
this.subtrateService.pair,
menstrualSubscriptionId,
SubscriptionStatus.Active,
);
} else if (
menstrualSubscriptionData.status === SubscriptionStatus.Active &&
menstrualSubscriptionData.paymentStatus === PaymentStatus.Paid
) {
if (menstrualSubscriptionData.status === 'Inactive') {
await this.elasticsearchService.update({
index: 'menstrual-subscription',
id: menstrualSubscriptionId,
refresh: 'wait_for',
body: {
doc: {
status: 'Active',
payment_status: 'Paid',
status: 'Inactive',
},
},
});

await this.checkInQueueByAddress(menstrualSubscriptionData.addressId);
} else if (
menstrualSubscriptionData.status === 'Active' &&
this.checkTimeDurationEnd(currtime, date, duration)
) {
await changeMenstrualSubscriptionStatus(
this.subtrateService.api,
this.subtrateService.pair,
menstrualSubscriptionId,
SubscriptionStatus.Inactive,
);

await this.checkInQueueByAddress(menstrualSubscriptionData.addressId);
}
}
} catch (err) {
this.logger.error(`active menstrual subscription error ${err}`);
this.logger.error(`inactive menstrual subscription error ${err}`);
} finally {
this.isRunningInQueue = false;
this.isRunningInActive = false;
}
}

async handleInActiveMenstrualSubscription() {
async checkInQueueByAddress(address: string) {
try {
if (this.isRunningInActive || this.subtrateService.api === undefined)
return;

this.isRunningInActive = true;
const menstrualSubscription = await this.elasticsearchService.search({
index: 'menstrual-subscription',
allow_no_indices: true,
body: {
query: {
match: {
status: {
query: 'Active',
},
bool: {
must: [
{
match: {
status: {
query: 'InQueue',
},
},
},
{
match: {
address_id: {
query: address,
},
},
},
],
},
},
sort: [
Expand All @@ -155,48 +156,48 @@ export class MenstrualSubscriptionService {
size: 10,
});

const currtime = new Date().getTime();

const listMenstrualSubscription = menstrualSubscription.body.hits.hits;
for (const menstrualSubscription of listMenstrualSubscription) {
if (this.subtrateService.api === undefined) break;

const menstrualSubscriptionId = menstrualSubscription['_source']['id'];
const duration = menstrualSubscription['_source']['duration'];
const date = menstrualSubscription['_source']['updated_at'];

const menstrualSubscriptionData = await queryMenstrualSubscriptionById(
this.subtrateService.api,
menstrualSubscriptionId,
);

if (menstrualSubscriptionData.status === 'Inactive') {
if (
menstrualSubscriptionData.status === SubscriptionStatus.InQueue &&
menstrualSubscriptionData.paymentStatus === PaymentStatus.Paid
) {
await changeMenstrualSubscriptionStatus(
this.subtrateService.api,
this.subtrateService.pair,
menstrualSubscriptionId,
SubscriptionStatus.Active,
);
break;
} else if (
menstrualSubscriptionData.status === SubscriptionStatus.Active &&
menstrualSubscriptionData.paymentStatus === PaymentStatus.Paid
) {
await this.elasticsearchService.update({
index: 'menstrual-subscription',
id: menstrualSubscriptionId,
refresh: 'wait_for',
body: {
doc: {
status: 'Inactive',
status: SubscriptionStatus.Active,
payment_status: PaymentStatus.Paid,
},
},
});
} else if (
menstrualSubscriptionData.status === 'Active' &&
this.checkTimeDurationEnd(currtime, date, duration)
) {
await changeMenstrualSubscriptionStatus(
this.subtrateService.api,
this.subtrateService.pair,
menstrualSubscriptionId,
SubscriptionStatus.Inactive,
);
break;
}
}
} catch (err) {
this.logger.error(`inactive menstrual subscription error ${err}`);
} finally {
this.isRunningInActive = false;
this.logger.error(`active menstrual subscription error ${err}`);
}
}

Expand Down