Merge pull request #39 from gitcomteam/dev

0.17.0

Author: mx2s

App/AL/Controller/Auth/JwtAuthController.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using App.AL.Validation.String;
-using App.DL.Model.User;
-using App.DL.Model.User.Registration;
 using App.DL.Module.Email;
 using App.DL.Repository.User;
 using App.DL.Repository.User.Registration;
@@ -12,6 +10,7 @@
 using Micron.DL.Module.Controller;
 using Micron.DL.Module.Crypto;
 using Micron.DL.Module.Http;
+using Micron.DL.Module.Misc;
 using Micron.DL.Module.Validator;
 using Nancy;
 using Newtonsoft.Json.Linq;
@@ -95,6 +94,45 @@ public JwtAuthController() {
                 });
             });
 
+            Post("/api/v1/lazy_register", _ => {
+                var errors = ValidationProcessor.Process(Request, new IValidatorRule[] {
+                    new ShouldHaveParameters(new[] {"email"}),
+                    new ShouldBeValidEmail(),
+                }, true);
+                if (errors.Count > 0) return HttpResponse.Errors(errors);
+
+                var email = GetRequestStr("email").Replace(" ", "").ToLower();
+
+                var existingUser = UserRepository.FindByEmail(email);
+
+                if (existingUser != null) {
+                    return HttpResponse.Error(
+                        HttpStatusCode.Forbidden,
+                        "User with this email already exist, you need to log in"
+                    );
+                }
+
+                var login = email.Split("@")[0];
+
+                var registeredUser = UserRepository.FindOrCreateByEmailAndLogin(
+                    email, login, Rand.RandomString()
+                );
+
+                var registerQueueItem = RegistrationQueueItemRepository.Create(registeredUser);
+                
+                MailGunSender.QueueTemplate(
+                    "confirm-your-email", registeredUser.email, "GitCom - you almost there!",
+                    new[] {
+                        new KeyValuePair<string, string>("confirmation_key", registerQueueItem.confirmation_key),
+                    }
+                );
+                
+
+                return HttpResponse.Data(new JObject() {
+                    ["token"] = Jwt.FromUserId(registeredUser.id)
+                });
+            });
+
             Post("/api/v1/register/confirm_email", _ => {
                 var errors = ValidationProcessor.Process(Request, new IValidatorRule[] {
                     new ShouldHaveParameters(new[] {"confirmation_key"}),

App/AL/Controller/Project/UserProjectsController.cs

@@ -0,0 +1,26 @@
+using App.DL.Repository.User;
+using App.PL.Transformer.Project;
+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 {
+    public class UserProjectsController : BaseController {
+        protected override IMiddleware[] Middleware() => new IMiddleware[] {};
+
+        public UserProjectsController() {
+            Get("/api/v1/user/projects/get", _ => {
+                var errors = ValidationProcessor.Process(Request, new IValidatorRule[] {
+                    new ExistsInTable("user_guid", "users", "guid")
+                });
+                if (errors.Count > 0) return HttpResponse.Errors(errors);
+
+                var user = UserRepository.FindByGuid(GetRequestStr("user_guid"));
+                
+                return HttpResponse.Item("projects", new ProjectTransformer().Many(user.Projects()));
+            });
+        }
+    }
+}

App/App.csproj

@@ -5,7 +5,7 @@
         <TargetFramework>netcoreapp2.2</TargetFramework>
         <LangVersion>8</LangVersion>
         <Nullable>enable</Nullable>
-        <AssemblyVersion>0.16.0</AssemblyVersion>
+        <AssemblyVersion>0.17.0</AssemblyVersion>
         <FileVersion></FileVersion>
     </PropertyGroup>
 

App/DL/Model/Project/Project.cs

@@ -52,6 +52,16 @@ public static Project FindBy(string col, int val)
                 $"SELECT * FROM projects WHERE {col} = @val LIMIT 1", new {val}
             ).FirstOrDefault();
 
+        public static Project[] GetBy(string col, string val)
+            => Connection().Query<Project>(
+                $"SELECT * FROM projects WHERE {col} = @val LIMIT 1", new {val}
+            ).ToArray();
+        
+        public static Project[] GetBy(string col, int val)
+            => Connection().Query<Project>(
+                $"SELECT * FROM projects WHERE {col} = @val LIMIT 1", new {val}
+            ).ToArray();
+
         public static Project FindRandom()
             => Connection().Query<Project>(
                 "SELECT * FROM projects WHERE id = @id ORDER BY random() LIMIT 1"

App/DL/Model/User/User.cs

@@ -3,6 +3,7 @@
 using App.DL.Enum;
 using App.DL.Model.Auth;
 using App.DL.Repository.Auth;
+using App.DL.Repository.Project;
 using Micron.DL.Module.Crypto;
 using Dapper;
 
@@ -56,5 +57,7 @@ public static int Create(string email, string login, string password)
 
         public ServiceAccessToken ServiceAccessToken(ServiceType serviceType) =>
             ServiceAccessTokenRepository.Find(this, serviceType);
+
+        public Project.Project[] Projects() => ProjectRepository.GetBy("creator_id", id);
     }
 }

App/DL/Repository/Project/ProjectRepository.cs

@@ -10,10 +10,16 @@ public static ProjectModel Find(int id) {
             return ProjectModel.Find(id);
         }
 
-        public static ProjectModel FindByGuid(string guid) {
-            return ProjectModel.FindByGuid(guid);
-        }
+        public static ProjectModel FindByGuid(string guid) => ProjectModel.FindByGuid(guid);
+        
+        public static ProjectModel FindBy(string col, string val) => ProjectModel.FindBy(col, val);
+        
+        public static ProjectModel FindBy(string col, int val) => ProjectModel.FindBy(col, val);
 
+        public static ProjectModel[] GetBy(string col, string val) => ProjectModel.GetBy(col, val);
+        
+        public static ProjectModel[] GetBy(string col, int val) => ProjectModel.GetBy(col, val);
+
         public static ProjectModel FindRandom() => ProjectModel.FindRandom();
 
         public static ProjectModel[] GetRandom() => ProjectModel.GetRandom();

migrations/db/migrations/20200121112249_create_user_badges_table.php

@@ -0,0 +1,22 @@
+<?php
+
+
+use Phinx\Migration\AbstractMigration;
+
+class CreateUserBadgesTable extends AbstractMigration
+{
+    public function change()
+    {
+        $table = $this->table('user_badges');
+        $table
+            ->addColumn('guid', 'string')
+            ->addColumn('user_id', 'integer', ['signed' => false, 'null' => false])
+            ->addColumn('badge', 'string')
+
+            ->addForeignKey('user_id', 'users', 'id', ['delete'=> 'CASCADE', 'update'=> 'CASCADE'])
+            
+            ->addIndex(['guid'], ['unique' => true])
+
+            ->create();
+    }
+}