Merge branch 'release/minor' into dev

Author: mx2s

.circleci/config.json.testing renamed to .circleci/config.testing.json

@@ -11,13 +11,17 @@
         "jwt": {
             "secret_key": "GQDsD21j8s2zdm12F1f1k12",
             "token_life_days": 7
-        }
+        },
+	"schedule": {
+	    "token": "fk1092fk21"
+	}
+    },
+    "schedule": {
+        "token": "F2l901f"
     },
-    "Logging": {
-        "LogLevel": {
-            "Default": "Debug",
-            "System": "Information",
-            "Microsoft": "Information"
+    "user": {
+        "registration": {
+                "token_bonus": 500
         }
     }
-}
+}

.circleci/config.yml

@@ -66,7 +66,7 @@ jobs:
 
       - run:
           name: copy app config
-          command: mkdir -p Tests/bin/Debug/netcoreapp2.2/config && cp .circleci/config.json.testing Tests/bin/Debug/netcoreapp2.2/config/config.json
+          command: mkdir -p Tests/bin/Debug/netcoreapp2.2/config && cp .circleci/config.testing.json Tests/bin/Debug/netcoreapp2.2/config/config.json
 
       - run:
           name: yum install dotnet core sdk 2.2

App/AL/Controller/Alias/Project/ProjectAliasController.cs

@@ -21,11 +21,8 @@ public ProjectAliasController() {
                 var alias = ProjectAliasRepository.FindByAlias(
                     GetRequestStr("owner"), GetRequestStr("alias")
                 );
+                if (alias == null) return HttpResponse.Error(HttpStatusCode.NotFound, "Project not found");
 
-                if (alias == null) {
-                    return HttpResponse.Error(HttpStatusCode.NotFound, "Project not found");
-                }
-                
                 return HttpResponse.Item("project", new ProjectTransformer().Transform(alias.Project()));
             });
         }

App/AL/Controller/Auth/External/GitHub/GithubAuthController.cs

@@ -59,7 +59,7 @@ public GithubAuthController() {
                         "We're unable to get your access token, please try again");
                 }
 
-                var githubClient = new GitHubClient(new ProductHeaderValue("SupportHub"));
+                var githubClient = new GitHubClient(new ProductHeaderValue("GitCom"));
 
                 githubClient.Credentials = new Credentials(accessToken);
 

App/AL/Controller/Auth/JwtAuthController.cs

@@ -39,9 +39,8 @@ public JwtAuthController() {
                     return HttpResponse.Error(
                         new HttpError(HttpStatusCode.Unauthorized, "Your email / password combination is incorrect")
                     );
-
-                var queuedItem = RegistrationQueueItemRepository.Find(user);
-                if (queuedItem != null && !queuedItem.email_confirmed)
+                
+                if (!user.EmailConfirmed())
                     return HttpResponse.Error(HttpStatusCode.Forbidden, "You need to confirm your email");
 
                 return HttpResponse.Data(new JObject() {

App/AL/Controller/Card/CardController.cs

@@ -7,6 +7,7 @@
 using Micron.DL.Module.Controller;
 using Micron.DL.Module.Http;
 using Micron.DL.Module.Validator;
+using Newtonsoft.Json.Linq;
 
 namespace App.AL.Controller.Card {
     public sealed class CardController : BaseController {
@@ -33,8 +34,21 @@ public CardController() {
                 if (errors.Count > 0) return HttpResponse.Errors(errors);
 
                 var column = BoardColumnRepository.FindByGuid(GetRequestStr("column_guid"));
-                
-                return HttpResponse.Item("cards", new CardTransformer().Many(column.Cards()));
+
+                var page = GetRequestInt("page");
+                page = page > 0 ? page : 1;
+
+                var pageSize = 25;
+
+                return HttpResponse.Data(new JObject() {
+                    ["data"] = new JObject() {
+                        ["cards"] = new CardTransformer().Many(column.Cards(page, pageSize))
+                    },
+                    ["meta"] = new JObject() {
+                        ["pages_count"] = (column.CardsCount() / pageSize)+1,
+                        ["current_page"] = page
+                    }
+                });
             });
         }
     }

App/AL/Controller/External/MyIntegrationsController.cs

@@ -21,7 +21,7 @@ public MyIntegrationsController() {
                 JObject githubUser = null;
 
                 if (githubToken != null) {
-                    var githubClient = new GitHubClient(new ProductHeaderValue("SupportHub"));
+                    var githubClient = new GitHubClient(new ProductHeaderValue("GitCom"));
 
                     githubClient.Credentials = new Credentials(githubToken.access_token);
 

App/AL/Controller/Funding/Balance/FundingBalanceController.cs

@@ -2,7 +2,6 @@
 using App.AL.Validation.Entity;
 using App.DL.Enum;
 using App.DL.Repository.Funding;
-using App.DL.Repository.User;
 using App.PL.Transformer.Funding;
 using Micron.AL.Validation.Basic;
 using Micron.AL.Validation.String;

App/AL/Controller/Project/Image/ProjectImageController.cs

@@ -0,0 +1,26 @@
+using App.DL.Repository.Project;
+using App.PL.Transformer.Image;
+using Micron.AL.Validation.Db;
+using Micron.DL.Middleware;
+using Micron.DL.Module.Controller;
+using Micron.DL.Module.Http;
+using Micron.DL.Module.Validator;
+
+namespace App.AL.Controller.Project.Image {
+    public class ProjectImageController : BaseController {
+        protected override IMiddleware[] Middleware() => new IMiddleware[] { };
+
+        public ProjectImageController() {
+            Get("/api/v1/project/images/get", _ => {
+                var errors = ValidationProcessor.Process(Request, new IValidatorRule[] {
+                    new ExistsInTable("project_guid", "projects", "guid"),
+                });
+                if (errors.Count > 0) return HttpResponse.Errors(errors);
+
+                var project = ProjectRepository.FindByGuid(GetRequestStr("project_guid"));
+
+                return HttpResponse.Item("images", new ImageTransformer().Many(project.Images()));
+            });
+        }
+    }
+}

App/AL/Controller/Project/ProjectController.cs

@@ -8,7 +8,7 @@
 
 namespace App.AL.Controller.Project {
     public sealed class ProjectController : BaseController {
-        protected override IMiddleware[] Middleware() => new IMiddleware[] {};
+        protected override IMiddleware[] Middleware() => new IMiddleware[] { };
 
         public ProjectController() {
             Get("/api/v1/project/get", _ => {