Merge pull request #1197 from imgbot/backup_improvements

chore: added sender email and organization email to backup queue

Author: GrigoreMihai

Common/Messages/BackupMessage.cs

@@ -9,5 +9,9 @@ public class BackupMessage
         public string BillingCycle { get; set; }
 
         public int Price { get; set; }
+
+        public string SenderEmail { get; set; }
+
+        public string OrganizationBillingEmail { get; set; }
     }
 }

WebHook/WebHookFunction.cs

@@ -373,7 +373,9 @@ await backupMessages.AddMessageAsync(new CloudQueueMessage(JsonConvert.Serialize
                                 PlanId = hook.marketplace_purchase.plan.id,
                                 Price = price,
                                 SaleType = recurrentSale,
-                                BillingCycle = hook.marketplace_purchase.billing_cycle
+                                BillingCycle = hook.marketplace_purchase.billing_cycle,
+                                SenderEmail = hook.sender.email,
+                                OrganizationBillingEmail = hook.marketplace_purchase.account.organization_billing_email
                             })));
                     }
 
@@ -405,13 +407,22 @@ await marketplaceTable.ExecuteAsync(TableOperation.InsertOrMerge(new Marketplace
                             price = hook.marketplace_purchase.plan.yearly_price_in_cents / 100;
                         }
 
+                        var returnType = "cancelled";
+
+                        if (hook.marketplace_purchase.on_free_trial == true)
+                        {
+                            returnType = "cancelled_free_trial";
+                        }
+
                         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
+                                SaleType = returnType,
+                                BillingCycle = hook.marketplace_purchase.billing_cycle,
+                                SenderEmail = hook.sender.email,
+                                OrganizationBillingEmail = hook.marketplace_purchase.account.organization_billing_email
                             })));
                     }