TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 19:33:02 +03:00
Code Issues Projects Releases Wiki Activity

Updated bson-objectid calls to match API change

Browse Source 
refs c873899e49

- as of `bson-objectid` v2.0.0, this library exports the function
  to generate an ObjectID directly, and then you need to use `.toHexString()`
  to get the 24 character hex string - 6696f27d82
- this commit removes all uses of `.generate()` and replaces with this
  change
This commit is contained in:
Daniel Lockyer 2021-04-21 16:02:02 +01:00 committed by naz
parent ddedbd4225
commit 119c013229
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghost/members-importer/lib/batch-import.js
View File

@ -258,7 +258,7 @@ function getMemberData({members, labels, importSetLabels, createdBy}) {
}
const memberToInsert = {
id: ObjectId.generate(),
id: ObjectId().toHexString(),
uuid: uuid.v4(), // member model default
email: member.email,
name: member.name,
@ -276,7 +276,7 @@ function getMemberData({members, labels, importSetLabels, createdBy}) {
const memberLabelAssociationsToInsert = allLabels.map((label, index) => {
return {
id: ObjectId.generate(),
id: ObjectId().toHexString(),
member_id: memberToInsert.id,
label_id: labelIdLookup[label],
sort_order: index
@ -328,7 +328,7 @@ async function createStripeCustomers(stripeCustomersToCreate) {
});
result.customersToInsert.push({
id: ObjectId.generate(),
id: ObjectId().toHexString(),
member_id: customerToCreate.member_id,
customer_id: customer.id,
email: customer.email,
@ -343,7 +343,7 @@ async function createStripeCustomers(stripeCustomersToCreate) {
const payment = subscription.default_payment_method;
result.subscriptionsToInsert.push({
id: ObjectId.generate(),
id: ObjectId().toHexString(),
customer_id: customer.id,
subscription_id: subscription.id,
plan_id: subscription.plan.id,
@ -399,7 +399,7 @@ async function fetchStripeCustomers(stripeCustomersToInsert) {
});
result.customersToInsert.push({
id: ObjectId.generate(),
id: ObjectId().toHexString(),
member_id: customer.member_id,
customer_id: customer.customer_id,
email: fetchedCustomer.email,
@ -413,7 +413,7 @@ async function fetchStripeCustomers(stripeCustomersToInsert) {
fetchedCustomer.subscriptions.data.forEach((subscription) => {
const payment = subscription.default_payment_method;
result.subscriptionsToInsert.push({
id: ObjectId.generate(),
id: ObjectId().toHexString(),
customer_id: customer.customer_id,
subscription_id: subscription.id,
plan_id: subscription.plan.id,