Merge pull request #78 from gitcomteam/release/minor

mx2s · web-flow · commit c42bbf924d1f · 2020-03-04T15:46:32.000+03:00
v0.19.0-rc7
diff --git a/App/AL/AppBoot.cs b/App/AL/AppBoot.cs
@@ -1,6 +1,5 @@
 using System;
 using App.DL.Module.Cache;
-using Micron.DL.Model;
 
 namespace App.AL {
     public static class AppBoot {
diff --git a/App/AL/Schedule/Project/Post/SyncReleases.cs b/App/AL/Schedule/Project/Post/SyncReleases.cs
@@ -28,46 +28,40 @@ public SyncReleases() {
                     var githubToken = AppConfig.GetConfiguration("auth:external:github:token");
                     if (githubToken != null) githubClient.Credentials = new Credentials(githubToken);
 
-                    int pageIndex = 1;
-                    var repos = Repo.Paginate(pageIndex);
+                    var repos = Repo.GetRandom(50);
 
-                    while (repos.Length > 0) {
-                        foreach (var repo in repos) {
+                    foreach (var repo in repos) {
+                        try {
+                            if (repo.service_type != RepoServiceType.GitHub) continue;
+                            var splitUrl = repo.repo_url.Split("/");
+                            IEnumerable<Release> releases;
                             try {
-                                if (repo.service_type != RepoServiceType.GitHub) continue;
-                                var splitUrl = repo.repo_url.Split("/");
-                                IEnumerable<Release> releases;
-                                try {
-                                    releases = githubClient.Repository.Release.GetAll(
-                                        splitUrl[3], splitUrl[4]
-                                    ).Result.OrderBy(x => x.Id);
-                                }
-                                catch (Exception e) {
-                                    continue; // ignored
-                                }
+                                releases = githubClient.Repository.Release.GetAll(
+                                    splitUrl[3], splitUrl[4]
+                                ).Result.OrderBy(x => x.Id);
+                            }
+                            catch (Exception e) {
+                                continue; // ignored
+                            }
 
-                                foreach (var release in releases) {
-                                    if (release.Body.Length < 100) continue;
+                            foreach (var release in releases) {
+                                if (release.Body.Length < 100) continue;
 
-                                    var existingPost = ProjectPost.FindBy("origin_id", release.Id.ToString());
-                                    if (existingPost != null) continue;
+                                var existingPost = ProjectPost.FindBy("origin_id", release.Id.ToString());
+                                if (existingPost != null) continue;
 
-                                    var post = ProjectPost.Create(
-                                        repo.Project(), $"Released {release.Name}", release.Body
-                                    );
-                                    post.UpdateCol("origin_id", release.Id.ToString());
-                                    post.UpdateCol(
-                                        "created_at", release.PublishedAt.Value.ToUnixTimeSeconds().ToString()
-                                    );
-                                }
-                            }
-                            catch (Exception e) {
-                                SentrySdk.CaptureException(e);
+                                var post = ProjectPost.Create(
+                                    repo.Project(), $"Released {release.Name}", release.Body
+                                );
+                                post.UpdateCol("origin_id", release.Id.ToString());
+                                post.UpdateCol(
+                                    "created_at", release.PublishedAt.Value.ToUnixTimeSeconds().ToString()
+                                );
                             }
                         }
-
-                        ++pageIndex;
-                        repos = Repo.Paginate(pageIndex);
+                        catch (Exception e) {
+                            SentrySdk.CaptureException(e);
+                        }
                     }
                 });
                 JobsPool.Get().Push(task);
diff --git a/App/AL/Utils/External/Discord/DiscordWebhooks.cs b/App/AL/Utils/External/Discord/DiscordWebhooks.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Micron.DL.Module.Config;
+
+namespace App.AL.Utils.External.Discord {
+    public static class DiscordWebhooks {
+        public static void SendEvent(string type, string content) {
+            Task.Run(() => {
+                var client = new HttpClient();
+                client.DefaultRequestHeaders.Add("Accept", "application/json");
+
+                var webhookUrl = AppConfig.GetConfiguration($"external:discord:webhook_tokens:{type}");
+
+                if (string.IsNullOrEmpty(webhookUrl)) return;
+                
+                var response = client.PostAsync(
+                    webhookUrl,
+                    new FormUrlEncodedContent(new[] {
+                        new KeyValuePair<string, string>("content", content),
+                    })
+                ).Result;
+            });
+        }
+    }
+}
diff --git a/App/DL/Model/Repo/Repo.cs b/App/DL/Model/Repo/Repo.cs
@@ -55,6 +55,11 @@ public static Repo Find(string originId, RepoServiceType type)
                 $"SELECT * FROM repositories WHERE origin_id = @origin_id AND service_type = '{type.ToString()}' LIMIT 1",
                 new {origin_id = originId}
             ).FirstOrDefault();
+        
+       public static Repo[] GetRandom(int limit = 10)
+           => Connection().Query<Repo>(
+               "SELECT * FROM repositories ORDER BY random() LIMIT @limit", new {limit}
+           ).ToArray();
 
         public static Repo[] Paginate(int page, int size = 20)
             => Connection().Query<Repo>(
@@ -84,8 +89,10 @@ public Repo Save() {
             return this;
         }
 
-        public Octokit.Repository GithubRepo() => 
-            GitHubApi.Client().Repository.Get(Convert.ToInt64(origin_id)).Result;
+        public Octokit.Repository GithubRepo() {
+            var originId = Convert.ToInt64(origin_id == "" ? "0" : origin_id);
+            return GitHubApi.Client().Repository.Get(originId).Result;
+        }
 
         public Project.Project Project() => Model.Project.Project.FindBy("repository_id", id);
         
diff --git a/App/DL/Repository/Alias/ProjectAliasRepository.cs b/App/DL/Repository/Alias/ProjectAliasRepository.cs
@@ -26,8 +26,11 @@ public static ProjectAlias Create(Model.Project.Project project) {
             var alias = PrepareAlias(project.name);
 
             var creator = project.Creator();
-            var owner = creator != null ? 
-                PrepareAlias(creator.login) : PrepareAlias(project.Repository().GithubRepo().Owner.Login);
+
+            var owner = creator != null ? PrepareAlias(creator.login) : "_";
+            #if !DEBUG
+            if (creator == null) owner = PrepareAlias(project.Repository().GithubRepo().Owner.Login);
+            #endif
 
             var newAlias = alias;
             var postfix = 0;
diff --git a/App/DL/Repository/Funding/InvoiceRepository.cs b/App/DL/Repository/Funding/InvoiceRepository.cs
@@ -1,3 +1,4 @@
+using App.AL.Utils.External.Discord;
 using App.DL.Enum;
 using App.DL.Model.Funding;
 using App.DL.Repository.User;
@@ -18,7 +19,9 @@ public static Invoice Create(
                     UserBalanceRepository.FindOrCreate(user, currencyType);
                     break;
             }
-            return Find(Invoice.Create(user, entityId, entityType, amount, currencyType, status, wallet));
+            var invoice = Find(Invoice.Create(user, entityId, entityType, amount, currencyType, status, wallet));
+            DiscordWebhooks.SendEvent("system-events", $"New invoice #{invoice.id} was created for user: {invoice.user_id}");
+            return invoice;
         }
 
         public static Invoice UpdateStatus(Invoice invoice, InvoiceStatus status) {
diff --git a/App/DL/Repository/User/UserRepository.cs b/App/DL/Repository/User/UserRepository.cs
@@ -1,3 +1,4 @@
+using App.AL.Utils.External.Discord;
 using App.DL.Enum;
 using App.DL.Model.Funding;
 using App.DL.Model.User;
@@ -58,7 +59,7 @@ public static UserModel FindOrCreateByEmailAndLogin(
             }
             
             user ??= Create(email, login, password);
-
+            
             UserBadge.Create(user, "Early adopter");
 
             int tokenRegisterBonus = System.Convert.ToInt32(
@@ -78,7 +79,9 @@ public static UserModel FindOrCreateByEmailAndLogin(
         }
 
         public static UserModel Create(string email, string login, string password) {
-            return Find(UserModel.Create(email, login, password));
+            var newUserId = UserModel.Create(email, login, password);
+            DiscordWebhooks.SendEvent("system-events", $"New user #{newUserId} just signed up! Email: {email}");
+            return Find(newUserId);
         }
     }
 }
diff --git a/docker/build_and_push.sh b/docker/build_and_push.sh
@@ -10,4 +10,4 @@ docker build -t registry.gitlab.com/mxss/gitcom-api/gitcom-backend:"$1" -f docke
 echo "Pushing image to registy"
 docker push registry.gitlab.com/mxss/gitcom-api/gitcom-backend:"$1"
 
-echo "Done. version $1 is built and pushed."
+echo "Done. version $1 is built and pushed."

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using App.AL.Utils.External.Discord;`
`1`	`2`	`using App.DL.Enum;`
`2`	`3`	`using App.DL.Model.Funding;`
`3`	`4`	`using App.DL.Repository.User;`
`@@ -18,7 +19,9 @@ public static Invoice Create(`
`18`	`19`	`UserBalanceRepository.FindOrCreate(user, currencyType);`
`19`	`20`	`break;`
`20`	`21`	`}`
`21`		`- return Find(Invoice.Create(user, entityId, entityType, amount, currencyType, status, wallet));`
	`22`	`+ var invoice = Find(Invoice.Create(user, entityId, entityType, amount, currencyType, status, wallet));`
	`23`	`+ DiscordWebhooks.SendEvent("system-events", $"New invoice #{invoice.id} was created for user: {invoice.user_id}");`
	`24`	`+ return invoice;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public static Invoice UpdateStatus(Invoice invoice, InvoiceStatus status) {`