Skip to content

New keyword before ObjectId() #4

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

Open
KumarSidharth wants to merge 3 commits into
base: main
Choose a base branch
from
Open

New keyword before ObjectId() #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3682f08
new keyword
Sep 18, 2023
bc40969
engines
Sep 18, 2023
d6cae21
mongoose version >=6.12.0
Sep 21, 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
6 changes: 3 additions & 3 deletions models/mongoose/plan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class PlanModel extends BasePlanModel {
}

async getPlanById(planId) {
const dbPlan = await this.model.findOne({ _id: ObjectId(planId)});
const dbPlan = await this.model.findOne({ _id: new ObjectId(planId)});
if(!dbPlan) {
return dbPlan;
}
Expand All @@ -81,11 +81,11 @@ class PlanModel extends BasePlanModel {
}

async updatePlan(planId, planData) {
const dbPlan = await this.model.findOne({ _id: ObjectId(planId) });
const dbPlan = await this.model.findOne({ _id: new ObjectId(planId) });
deepExtend(dbPlan, planData);
await dbPlan.save();
return new Plan(dbPlan.toObject());
}
}

module.exports = PlanModel;
module.exports = PlanModel;
16 changes: 9 additions & 7 deletions models/mongoose/subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,27 @@ class SubscriptionModel extends BaseSubscriptionModel{
company_id: companyId,
plan_id: planId,
status: 'pending',
platform_subscription_id: ObjectId(platformSubscriptionId)
platform_subscription_id: new ObjectId(platformSubscriptionId)
}));
}

async updateSubscription(subscription) {
const dbSubscription = await this.model.findOne({ company_id: subscription.company_id, platform_subscription_id: ObjectId(subscription.platform_subscription_id) });
const dbSubscription = await this.model.findOne({
company_id: subscription.company_id,
platform_subscription_id: new ObjectId(subscription.platform_subscription_id)
});
deepExtend(dbSubscription, omit(subscription, ["company_id", "platform_subscription_id"]));
await dbSubscription.save();
return new Subscription(dbSubscription.toObject())
}

async removeSubscription(subscriptionId) {
const dbSubscription = await this.model.findOne({ _id: ObjectId(subscriptionId) });
await dbSubscription.remove();
const dbSubscription = await this.model.findByIdAndDelete(new ObjectId(subscriptionId));
return new Subscription(dbSubscription.toObject());
}

async activateSubscription(subscriptionId, platformSubscriptionId) {
const dbSubscription = await this.model.findOne({ _id: ObjectId(subscriptionId) });
const dbSubscription = await this.model.findOne({ _id: new ObjectId(subscriptionId) });
dbSubscription.status = 'active';
dbSubscription.platform_subscription_id = platformSubscriptionId;
dbSubscription.activated_on = (new Date()).toISOString();
Expand All @@ -105,12 +107,12 @@ class SubscriptionModel extends BaseSubscriptionModel{
}

async cancelSubscription(subscriptionId) {
const dbSubscription = await this.model.findOne({ _id: ObjectId(subscriptionId) })
const dbSubscription = await this.model.findOne({ _id: new ObjectId(subscriptionId) })
dbSubscription.status = 'cancelled';
dbSubscription.cancelled_on = (new Date()).toISOString();
await dbSubscription.save();
return new Subscription(dbSubscription.toObject());
}
}

module.exports = SubscriptionModel;
module.exports = SubscriptionModel;
Loading