Merge pull request #1129 from imgbot/backup_queue

Backup queue
imgbot · Mar 24, 2022 · b1cd054 · b1cd054
2 parents 5020c66 + e63879c
commit b1cd054
Show file tree

Hide file tree

Showing 14 changed files with 138 additions and 33 deletions.
diff --git a/Common/KnownGitHubs.cs b/Common/KnownGitHubs.cs
@@ -22,7 +22,7 @@ public static class KnownGitHubs
         // </remarks>
         public const string AccessTokensUrlFormat = "https://api.github.com/app/installations/{0}/access_tokens";
 
-        public const int SmallestLimitPaidPlan = 5;
+        public const int SmallestLimitPaidPlan = 1;
 
         // -1 for existing plans that include unlimited private
         // -2 for old plans which also have unlimited private, that do not need marketplacesync
@@ -44,6 +44,11 @@ public static readonly ReadOnlyDictionary<int, int> Plans
                 { 6921, 50 },
                 { 6922, 100 },
                 { 6923, 200 },
+                { 7386, 1 },
+                { 7387, 3 },
+                { 7388, 10 },
+                { 7389, 25 },
+                { 7390, 100 },
             });
     }
 }
diff --git a/Common/Messages/BackupMessage.cs b/Common/Messages/BackupMessage.cs
@@ -0,0 +1,11 @@
+namespace Common.Messages
+{
+    public class BackupMessage
+    {
+        public int PlanId { get; set; }
+
+        public string SaleType { get; set; }
+
+        public int Price { get; set; }
+    }
+}
diff --git a/Common/TableModels/Marketplace.cs b/Common/TableModels/Marketplace.cs
@@ -38,5 +38,7 @@ public Marketplace(int accountId, string accountLogin)
         public int? AllowedPrivate { get; set; }
 
         public int? UsedPrivate { get; set; }
+
+        public bool? FreeTrial { get; set; }
     }
 }
diff --git a/CompressImagesFunction/host.json b/CompressImagesFunction/host.json
@@ -1,12 +1,12 @@
 {
   "version": "2.0",
-  "functionTimeout": "01:00:00",
+  "functionTimeout": "02:00:00",
   "logging": {
     "fileLoggingMode": "never"
   },
  "extensions": {
    "queues": {
-     "batchSize": 4
+     "batchSize": 2
    }
  }
 }
diff --git a/Test/WebHookTests.cs b/Test/WebHookTests.cs
@@ -32,7 +32,8 @@ public async Task GivenCommitToOtherBranch_ShouldReturnOkDoNothing()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -65,7 +66,8 @@ public async Task GivenCommitToDefaultBranchNoImages_ShouldReturnOkDoNothing()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -98,7 +100,8 @@ public async Task GivenCommitToImgBotBranchByImgbot_ShouldReturnOkQueueToOpenPr(
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -134,7 +137,8 @@ public async Task GivenCommitToImgBotBranchByOthers_ShouldReturnOkDoNothing()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -167,7 +171,8 @@ public async Task GivenCommitToDefaultBranchWithImages_ShouldReturnOkQueueToRout
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -224,6 +229,7 @@ void ExtraSetup(
                 out var installationsTable,
                 out var marketplaceTable,
                 out var settingsTable,
+                out var backupMessages,
                 ExtraSetup);
 
             // Assert OKObjectResult and Value
@@ -261,7 +267,8 @@ public async Task GivenCommitToDefaultBranchWithConfig_ShouldReturnOkQueueToRout
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -298,7 +305,8 @@ public async Task GivenCommitToDefaultBranchWithImagesUppercaseExtensions_Should
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -335,7 +343,8 @@ public async Task GivenNewInstallationAdded_ShouldReturnOkQueueRouter()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -372,7 +381,8 @@ public async Task GivenNewInstallationCreated_ShouldReturnOkQueueRouter()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -428,6 +438,7 @@ void ExtraSetup(
                 out var installationsTable,
                 out var marketplaceTable,
                 out var settingsTable,
+                out var backupMessages,
                 ExtraSetup);
 
             // Assert OKObjectResult and Value
@@ -483,6 +494,7 @@ void ExtraSetup(
                 out var installationsTable,
                 out var marketplaceTable,
                 out var settingsTable,
+                out var backupMessages,
                 ExtraSetup);
 
             // Assert OKObjectResult and Value
@@ -516,7 +528,8 @@ public async Task GivenMarketplacePurchase_ShouldReturnOkWriteRow()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -569,6 +582,7 @@ void ExtraSetup(
                 out var installationsTable,
                 out var marketplaceTable,
                 out var settingsTable,
+                out var backupMessages,
                 ExtraSetup);
 
             // Assert OKObjectResult and Value
@@ -603,7 +617,8 @@ public async Task GivenMergedImgBotToDefaultBranch_ShouldReturnOkQueueToDeleteBr
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -660,6 +675,7 @@ void ExtraSetup(
                 out var installationsTable,
                 out var marketplaceTable,
                 out var settingsTable,
+                out var backupMessages,
                 ExtraSetup);
 
             // Assert OKObjectResult and Value
@@ -697,7 +713,8 @@ public async Task GivenMergedImgBotToOtherBranch_ShouldReturnOkDoNothing()
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -730,7 +747,8 @@ public async Task GivenSquashMergedImgBotToDefaultBranch_ShouldReturnOkQueueToDe
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -767,7 +785,8 @@ public async Task GivenRebaseMergedImgBotToDefaultBranch_ShouldReturnOkQueueToDe
                 out var deleteBranchMessages,
                 out var installationsTable,
                 out var marketplaceTable,
-                out var settingsTable);
+                out var settingsTable,
+                out var backupMessages);
 
             // Assert OKObjectResult and Value
             var response = (HookResponse)((OkObjectResult)result).Value;
@@ -802,6 +821,7 @@ private Task<IActionResult> ExecuteHookAsync(
             out CloudTable installationsTable,
             out CloudTable marketplaceTable,
             out CloudTable settingsTable,
+            out CloudQueue backupMessages,
             Action<CloudQueue, CloudQueue, CloudTable, CloudTable, CloudTable> extraSetup = null)
         {
             var request = Substitute.For<HttpRequestMessage>();
@@ -811,6 +831,8 @@ private Task<IActionResult> ExecuteHookAsync(
             installationsTable = Substitute.For<CloudTable>(new Uri("https://myaccount.table.core.windows.net/Tables/installation"));
             marketplaceTable = Substitute.For<CloudTable>(new Uri("https://myaccount.table.core.windows.net/Tables/marketplace"));
             settingsTable = Substitute.For<CloudTable>(new Uri("https://myaccount.table.core.windows.net/Tables/settings"));
+            backupMessages = Substitute.For<CloudQueue>(new Uri("https://myaccount.queue.core.windows.net/Queue/backup"));
+
             var logger = Substitute.For<ILogger>();
 
             request.Headers.Add("X-GitHub-Event", new[] { githubEvent });
@@ -819,7 +841,7 @@ private Task<IActionResult> ExecuteHookAsync(
             extraSetup?.Invoke(routerMessages, openPrMessages, installationsTable, marketplaceTable, settingsTable);
 
             return WebHook.WebHookFunction.Run(
-                request, routerMessages, openPrMessages, deleteBranchMessages, installationsTable, marketplaceTable, settingsTable, logger);
+                request, routerMessages, openPrMessages, deleteBranchMessages, installationsTable, marketplaceTable, settingsTable, backupMessages, logger);
         }
     }
 }
diff --git a/Web/src/app/vue/App.vue b/Web/src/app/vue/App.vue
@@ -139,7 +139,7 @@
           <div class="col-11 col-lg offset-lg-1">
             <p>
               <img alt src="/images/128x128_circle.png" width="30" />
-              Imgbot &copy; 2017-2020
+              Imgbot &copy; 2017-2022
             </p>
           </div>
           <div class="col-11 col-lg">

diff --git a/Web/src/app/vue/components/Installation.vue b/Web/src/app/vue/components/Installation.vue
@@ -77,14 +77,19 @@ export default {
         case 6894:
           return 'Starter'
         case 6919:
+        case 7386:
           return 'Team'
         case 6920:
+        case 7387:
           return 'Agency'
         case 6921:
+        case 7388:
           return 'Enterprise'
         case 6922:
+        case 7389:
           return 'Gold'
         case 6923:
+        case 7390:
           return 'Platinium'
 
       }
@@ -98,35 +103,50 @@ export default {
         case 6921:
         case 6922:
         case 6927:
+        case 7386:
+        case 7387:
+        case 7388:
+        case 7389:
           return 'Upgrade plan'
         case 1750:
         case 2840:
         case 2841:
         case 6923:
+        case 7390:
           return 'Downgrade plan'
       }
     },
     changePlanLink: function() {
       switch (this.installation.planId) {
         case 1749:
         case 6927:
-          return `https://github.com/marketplace/imgbot/upgrade/6/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/13/${this.installation.accountid}`
         case 1750:
         case 2840:
         case 2841:
           return `https://github.com/marketplace/imgbot/upgrade/12/${this.installation.accountid}`
         case 6894:
-          return `https://github.com/marketplace/imgbot/upgrade/7/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/13/${this.installation.accountid}`
         case 6919:
-          return `https://github.com/marketplace/imgbot/upgrade/8/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/14/${this.installation.accountid}`
         case 6920:
-          return `https://github.com/marketplace/imgbot/upgrade/9/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/15/${this.installation.accountid}`
         case 6921:
-          return `https://github.com/marketplace/imgbot/upgrade/10/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/16/${this.installation.accountid}`
         case 6922:
-          return `https://github.com/marketplace/imgbot/upgrade/11/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/17/${this.installation.accountid}`
         case 6923:
-          return `https://github.com/marketplace/imgbot/upgrade/10/${this.installation.accountid}`
+          return `https://github.com/marketplace/imgbot/upgrade/16/${this.installation.accountid}`
+        case 7386:
+          return `https://github.com/marketplace/imgbot/upgrade/14/${this.installation.accountid}`
+        case 7387:
+          return `https://github.com/marketplace/imgbot/upgrade/15/${this.installation.accountid}`
+        case 7388:
+          return `https://github.com/marketplace/imgbot/upgrade/16/${this.installation.accountid}`
+        case 7389:
+          return `https://github.com/marketplace/imgbot/upgrade/17/${this.installation.accountid}`
+        case 7390:
+          return `https://github.com/marketplace/imgbot/upgrade/16/${this.installation.accountid}`
       }
     },
     filteredRepositories: function() {

diff --git a/Web/src/app/vue/components/Repository.vue b/Web/src/app/vue/components/Repository.vue
@@ -127,7 +127,7 @@ export default {
       return 'undefined';
     },
     addedPlan: function() {
-      return [ 6894, 6919, 6920, 6921, 6922,6923 ].includes(this.planId);
+      return [ 6894, 6919, 6920, 6921, 6922,6923,7386,7387,7388,7389,7390 ].includes(this.planId);
     }
   },
   methods: {

diff --git a/Web/src/github-students/index.html b/Web/src/github-students/index.html
@@ -188,7 +188,7 @@ <h3>Policies</h3>
             <div class="col-11 col-lg offset-lg-1">
                 <p>
                     <img alt="" src="/images/128x128_circle.png" width="30" />
-                    Imgbot &copy; 2017-2019
+                    Imgbot &copy; 2017-2022
                 </p>
             </div>
             <div class="col-11 col-lg">

diff --git a/Web/src/index.html b/Web/src/index.html
@@ -235,7 +235,7 @@ <h3>Policies</h3>
       <div class="col-11 col-lg offset-lg-1">
           <p>
               <img alt="" src="/images/128x128_circle.png" width="30" />
-              Imgbot &copy; 2017-2019
+              Imgbot &copy; 2017-2022
             </p>
       </div>
       <div class="col-11 col-lg">

diff --git a/Web/src/info/index.html b/Web/src/info/index.html
@@ -121,7 +121,7 @@ <h3>Policies</h3>
             <div class="col-11 col-lg offset-lg-1">
                 <p>
                     <img alt="" src="/images/128x128_circle.png" width="30" />
-                    Imgbot &copy; 2017-2019
+                    Imgbot &copy; 2017-2022
                 </p>
             </div>
             <div class="col-11 col-lg">

diff --git a/Web/src/winning/index.html b/Web/src/winning/index.html
@@ -178,7 +178,7 @@ <h3>Policies</h3>
       <div class="col-11 col-lg offset-lg-1">
         <p>
           <img alt="" src="/images/128x128_circle.png" width="30" />
-          Imgbot &copy; 2017-2019
+          Imgbot &copy; 2017-2022
         </p>
       </div>
       <div class="col-11 col-lg">