feat: shopify_id in subscription and usage record

server/content-types/Billing/Subscription/schema.json

@@ -11,6 +11,12 @@
     "draftAndPublish": false
   },
   "attributes": {
+    "shopify_id": {
+      "type": "biginteger",
+      "required": true,
+      "unique": true,
+      "configurable": false
+    },
     "status": {
       "type": "enumeration",
       "enum": [

server/content-types/Billing/UsageRecord/schema.json

@@ -11,6 +11,12 @@
     "draftAndPublish": false
   },
   "attributes": {
+    "shopify_id": {
+      "type": "biginteger",
+      "required": true,
+      "unique": true,
+      "configurable": false
+    },
     "price": {
       "type": "decimal",
       "required": true,

server/controllers/billing/subscription.js

@@ -77,7 +77,7 @@ module.exports = ({ strapi }) => ({
     const subscriptionDb = await subscriptionService.findByShop(session.shop);
     if (_.isEmpty(subscriptionDb.data)) return ctx.notFound();
     if (subscriptionDb.data.status !== 'ACTIVE') return ctx.notFound();
-    const subscriptionShopify = await subscriptionService.findOnShopify(subscriptionDb.data.id, session);
+    const subscriptionShopify = await subscriptionService.findOnShopify(subscriptionDb.data.shopify_id, session);
     ctx.body = {
       ...subscriptionDb,
       shopify: subscriptionShopify,

server/services/billing/subscription.js

@@ -36,7 +36,7 @@ module.exports = createCoreService('plugin::shopify.subscription', ({ strapi })
     // create subscription on db
     await super.create({
       data: {
-        id: subscriptionId,
+        shopify_id: subscriptionId,
         status: 'PENDING',
         trial_ends_on: trialEndsOn,
         confirmation_url: confirmationUrl,
@@ -53,7 +53,7 @@ module.exports = createCoreService('plugin::shopify.subscription', ({ strapi })
     if (_.isEmpty(subscription.data)) {
       return;
     }
-    await super.update(subscription.data.id, { data: { status: 'CANCELLED' } });
+    await strapi.db.query('plugin::shopify.subscription').update({ where: { shopify_id: subscription.data.shopify_id }, data: { status: 'CANCELLED' } });
   },
 
   async findOnShopify(id) {

server/services/billing/usage-record.js

@@ -26,7 +26,7 @@ module.exports = createCoreService('plugin::shopify.usage-record', ({ strapi })
     if (_.isEmpty(subscriptionDb.data)) throw new Error('Shop subscription not found');
     if (subscriptionDb.data.status !== 'ACTIVE') throw new Error('Shop subscription is not ACTIVE');
     // get shopify subscription
-    const subscriptionShopify = await subscriptionService.findOnShopify(subscriptionDb.data.id);
+    const subscriptionShopify = await subscriptionService.findOnShopify(subscriptionDb.data.shopify_id);
     // get capped amount
     const cappedAmount = Number(_.get(subscriptionShopify, 'usage.cappedAmount.amount'));
     // get balance used
@@ -39,16 +39,14 @@ module.exports = createCoreService('plugin::shopify.usage-record', ({ strapi })
     params.lineItemId = _.get(subscriptionShopify, 'usage.id');
     // get graphql client
     const client = new Shopify.Clients.Graphql(session.shop, session.accessToken);
-
     // create usage record on Shopify
     const { usageRecordGid } = await appUsageRecordCreate(client, params);
-
     // get numeric id from gid
     const usageRecordId = this.usageRecordGidToId(usageRecordGid);
     // create usage record on db
     const result = await super.create({
       data: {
-        id: usageRecordId,
+        shopify_id: usageRecordId,
         price,
         subscription: subscriptionDb.data.id,
       },

server/services/billing/webhooks.js

@@ -12,7 +12,7 @@ const enabledExport = ({ strapi }) => ({
     // run before subscribe lifecycles
     if (status === 'ACTIVE') await lifecycles.run('beforeSubscribe', shop);
     // update subscription
-    await subscriptionService.update(id, { data: { status } });
+    await strapi.db.query('plugin::shopify.subscription').update({where: {shopify_id: id }, data: { status: status }});
     // run after subscribe lifecycles
     if (status === 'ACTIVE') await lifecycles.run('afterSubscribe', shop);
     strapi.log.info(`Subscription ${id} updated successfully to ${status}`);