Merge pull request #1175 from imgbot/backup_queue_update

chore: added backup message for cancelled subscription

Author: GrigoreMihai

Common/Messages/BackupMessage.cs

@@ -6,6 +6,8 @@ public class BackupMessage
 
         public string SaleType { get; set; }
 
+        public string BillingCycle { get; set; }
+
         public int Price { get; set; }
     }
 }

CompressImagesFunction/host.json

@@ -6,7 +6,9 @@
   },
  "extensions": {
    "queues": {
-     "batchSize": 2
+     "batchSize": 2,
+     "maxDequeueCount" : 2,
+     "newBatchThreshold" : 1
    }
  }
 }

WebHook/Model/Hook.cs

@@ -336,13 +336,15 @@ public class MarketplacePurchase
             public Account account { get; set; }
 
             public Plan plan { get; set; }
+            public string billing_cycle { get; set; }
             public bool? on_free_trial { get; set; }
         }
 
         public class Plan
         {
             public int id { get; set; }
             public int monthly_price_in_cents { get; set; }
+            public int yearly_price_in_cents { get; set; }
         }
     }
 }

WebHook/WebHookFunction.cs

@@ -360,12 +360,20 @@ private static async Task<string> ProcessMarketplacePurchaseAsync(Hook hook, Clo
                             }
                         }
 
+                        var price = hook.marketplace_purchase.plan.monthly_price_in_cents / 100;
+
+                        if (hook.marketplace_purchase.billing_cycle == "yearly")
+                        {
+                            price = hook.marketplace_purchase.plan.yearly_price_in_cents / 100;
+                        }
+
                         await backupMessages.AddMessageAsync(new CloudQueueMessage(JsonConvert.SerializeObject(
                             new BackupMessage
                             {
                                 PlanId = hook.marketplace_purchase.plan.id,
-                                Price = hook.marketplace_purchase.plan.monthly_price_in_cents / 100,
-                                SaleType = recurrentSale
+                                Price = price,
+                                SaleType = recurrentSale,
+                                BillingCycle = hook.marketplace_purchase.billing_cycle
                             })));
                     }
 
@@ -387,6 +395,26 @@ await marketplaceTable.ExecuteAsync(TableOperation.InsertOrMerge(new Marketplace
                     return hook.action;
                 case "cancelled":
                     await marketplaceTable.DropRow(hook.marketplace_purchase.account.id, hook.marketplace_purchase.account.login);
+                    if (KnownGitHubs.Plans.ContainsKey(hook.marketplace_purchase.plan.id) &&
+                        KnownGitHubs.Plans[hook.marketplace_purchase.plan.id] != 0)
+                    {
+                        var price = hook.marketplace_purchase.plan.monthly_price_in_cents / 100;
+
+                        if (hook.marketplace_purchase.billing_cycle == "yearly")
+                        {
+                            price = hook.marketplace_purchase.plan.yearly_price_in_cents / 100;
+                        }
+
+                        await backupMessages.AddMessageAsync(new CloudQueueMessage(JsonConvert.SerializeObject(
+                            new BackupMessage
+                            {
+                                PlanId = hook.marketplace_purchase.plan.id,
+                                Price = price,
+                                SaleType = "cancelled",
+                                BillingCycle = hook.marketplace_purchase.billing_cycle
+                            })));
+                    }
+
                     logger.LogInformation("ProcessMarketplacePurchaseAsync/cancelled {PlanId} for {Owner}", hook.marketplace_purchase.plan.id, hook.marketplace_purchase.account.login);
                     return "cancelled";
                 default: