Implement profile and curriculum upload

Author: LorenzCK

.gitignore

@@ -7,3 +7,7 @@ secret.env
 composer.phar
 /src/DonationManager/vendor/*
 *.xlsx
+data/curricula/*
+!data/curricula/placeholder
+data/profile/*
+!data/profile/placeholder

data/curricula/placeholder

@@ -12,6 +12,8 @@ services:
     networks:
     - web
     - codemooc-reg-backend
+    volumes:
+    - ./data:/data:rw
     env_file:
     - config.env
     - secret.env

data/profile/placeholder

@@ -23,7 +23,4 @@ COPY --from=build /app/Web/out ./
 ENV ASPNETCORE_URLS http://+:5001
 EXPOSE 5001
 
-# Drop privileges
-USER 1000
-
 ENTRYPOINT ["dotnet", "CodeMooc.Web.dll"]

docker-compose.yml

@@ -1,16 +1,21 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using CodeMooc.Web.Data;
 using CodeMooc.Web.Model;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 
 namespace CodeMooc.Web.Controllers {
 
@@ -32,10 +37,7 @@ IConfiguration configuration
             Configuration = configuration;
         }
 
-        protected T GetViewModel<T>()
-            where T : DashboardBaseViewModel {
-            T model = (T)Activator.CreateInstance(typeof(T));
-
+        protected int? GetUserId() {
             if(!HttpContext.User.Identity.IsAuthenticated) {
                 Logger.LogError("User not authenticated on dashboard");
                 return null;
@@ -47,8 +49,21 @@ protected T GetViewModel<T>()
                 return null;
             }
 
+            return id;
+        }
+
+        protected T GetViewModel<T>()
+            where T : DashboardBaseViewModel {
+
+            T model = (T)Activator.CreateInstance(typeof(T));
+
+            var userId = GetUserId();
+            if(!userId.HasValue) {
+                return null;
+            }
+
             model.LoggedUser = (from r in Database.Registrations
-                                where r.Id == id
+                                where r.Id == userId.Value
                                 select r).SingleOrDefault();
             Logger.LogDebug("Loaded user information for user {0} {1}", model.LoggedUser.Id, model.LoggedUser.Name);
 
@@ -108,14 +123,89 @@ public IActionResult ShowAssociationStatus() {
             return View("Status", model);
         }
 
-        [HttpGet("cv-upload")]
+        protected string GetCurriculumPath(int userId) {
+            var pathsConf = Configuration.GetSection("Paths");
+            string pathCurricula = pathsConf["Curricula"];
+
+            return Path.Combine(pathCurricula, $"{userId}.pdf");
+        }
+
+        protected string GetProfilePicPath(int userId) {
+            var pathsConf = Configuration.GetSection("Paths");            
+            string pathProfilePics = pathsConf["ProfilePics"];
+
+            return Path.Combine(pathProfilePics, $"{userId}.jpg");
+        }
+
+        [HttpGet("curriculum")]
         public IActionResult ShowCvUpload() {
-            return null;
+            var model = GetViewModel<DashboardUploadViewModel>();
+            var userId = model.LoggedUser.Id;
+
+            var pathProfile = GetProfilePicPath(userId);
+            model.ProfilePictureFilename = System.IO.File.Exists(pathProfile) ? Path.GetFileName(pathProfile) : null;
+            Logger.LogDebug("Path {0} exists {1}", pathProfile, model.ProfilePictureFilename != null);
+
+            var pathCurriculum = GetCurriculumPath(userId);
+            model.CurriculumFilename = System.IO.File.Exists(pathCurriculum) ? Path.GetFileName(pathCurriculum) : null;
+            Logger.LogDebug("Path {0} exists {1}", pathCurriculum, model.ProfilePictureFilename != null);
+
+            return View("Upload", model);
+        }
+
+        [HttpPost("curriculum")]
+        public async Task<IActionResult> ProcessCvUpload(IFormFile profilePic, IFormFile curriculum) {
+            var userId = GetUserId();
+            if(!userId.HasValue) {
+                return RedirectToAction(nameof(ShowCvUpload));
+            }
+
+            if(profilePic != null) {
+                ProcessProfilePicture(userId.Value, profilePic);
+            }
+            if(curriculum != null) {
+                await ProcessCurriculum(userId.Value, curriculum);
+            }
+
+            return RedirectToAction(nameof(ShowCvUpload));
         }
 
-        [HttpPost("cv-upload")]
-        public IActionResult ProcessCvUpload() {
-            return null;
+        protected void ProcessProfilePicture(int userId, IFormFile file) {
+            Logger.LogDebug("Processing profile picture, name {0} size {1}", file.FileName, file.Length);
+
+            var pathProfile = GetProfilePicPath(userId);
+            using(var source = file.OpenReadStream()) {
+                using(var img = Image.Load(source)) {
+                    Logger.LogTrace("Resizing input image");
+                    img.Mutate(x => x
+                        .AutoOrient()
+                        .Resize(new ResizeOptions {
+                            Mode = ResizeMode.Min,
+                            Size = new SixLabors.Primitives.Size(640, 640)
+                        })
+                        .Crop(640, 640)
+                    );
+
+                    using(var output = new FileStream(pathProfile, FileMode.Create, FileAccess.Write)) {
+                        Logger.LogTrace("Writing file to {0}", pathProfile);
+                        img.SaveAsJpeg(output);
+                    }
+                }
+            }
+
+            Logger.LogInformation("Profile picture for user {0} uploaded to {1}", userId, pathProfile);
+        }
+
+        protected async Task ProcessCurriculum(int userId, IFormFile file) {
+            Logger.LogDebug("Processing curriculum, name {0} size {1}", file.FileName, file.Length);
+
+            var pathCurriculum = GetCurriculumPath(userId);
+            using(var output = new FileStream(pathCurriculum, FileMode.Create, FileAccess.Write)) {
+                Logger.LogTrace("Writing file to {0}", pathCurriculum);
+                await file.CopyToAsync(output);
+            }
+
+            Logger.LogInformation("Curriculum for user {0} uploaded to {1}", userId, pathCurriculum);
         }
 
     }

src/Web/Dockerfile

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace CodeMooc.Web.Model {
+
+    public class DashboardUploadViewModel : DashboardBaseViewModel {
+
+        public string ProfilePictureFilename { get; set; }
+
+        public string CurriculumFilename { get; set; }
+
+    }
+
+}

src/Web/Web/Controllers/DashboardController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using CodeMooc.Web.Data;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
@@ -10,6 +11,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
 
 namespace CodeMooc.Web {
 
@@ -126,6 +128,21 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
 
             app.UseStaticFiles();
 
+            // Add static file paths for uploaded files
+            var pathsConf = Configuration.GetSection("Paths");
+
+            string pathCurricula = pathsConf["Curricula"];
+            app.UseStaticFiles(new StaticFileOptions {
+                FileProvider = new PhysicalFileProvider(Path.Combine("/data", pathCurricula)),
+                RequestPath = "/uploads/curricula"
+            });
+
+            string pathProfilePics = pathsConf["ProfilePics"];
+            app.UseStaticFiles(new StaticFileOptions {
+                FileProvider = new PhysicalFileProvider(Path.Combine("/data", pathProfilePics)),
+                RequestPath = "/uploads/profiles"
+            });
+
             app.UseAuthentication();
 
             app.UseMvc();

src/Web/Web/Model/DashboardUploadViewModel.cs

@@ -19,8 +19,8 @@
             <dt>@Html.ActionLink("Vedi stato socio", "ShowAssociationStatus")</dt>
             <dd>Verifica la tua registrazione come socio dell'associazione CodeMOOC.net ed i badge rilasciati.</dd>
 
-            <dt>@Html.ActionLink("Carica curriculum", "ShowCvUpload")</dt>
-            <dd>Partecipa alla rete di competenze ed esperienze che l'associazione sta costruendo caricando il tuo curriculum.</dd>
+            <dt>@Html.ActionLink("Raccolta curricula", "ShowCvUpload")</dt>
+            <dd>Partecipa alla rete di competenze ed esperienze che l'associazione sta costruendo, caricando il tuo curriculum.</dd>
         </dl>
 
     </div>

src/Web/Web/Startup.cs

@@ -0,0 +1,74 @@
+@using CodeMooc.Web.Model
+@model DashboardUploadViewModel
+@{
+    Layout = "Main";
+    ViewData["Title"] = "Raccolta curricula";
+}
+
+<div class="container">
+    <h1 class="text-center">Raccolta curricula</h1>
+
+    <div class="col-12 col-sm-8 offset-sm-2 col-md-6 offset-md-3">
+
+        <p>◀&nbsp;@Html.ActionLink("Torna al pannello di controllo", "Index")</p>
+
+        <p>
+            CodeMOOC.net sta sviluppando una <b>rete di competenze ed esperienze</b>,  una via di mezzo tra una raccolta di curricula ed un social network.
+            Questo strumento verrà <b>sviluppato su misura</b>, in modo che rappresenti al meglio la rete degli associati, le loro esperienze professionali e le relazioni che le valorizzano.
+        </p>
+
+        <p>
+            Tramite questo modulo raccoglieremo i curricula degli associati, in modo da usarli come base di dati reale attorno alla quale costruire lo strumento.
+        </p>
+
+        <h2>Profilo utente</h2>
+
+        <p>
+            Usa questo modulo per caricare un'immagine di profilo che ti rappresenti sulla rete di associati CodeMOOC.net.
+            Utilizza immagini di formato quadrato.
+        </p>
+
+        @if (Model.ProfilePictureFilename != null) {
+            <p class="text-center">
+                <img src="~/uploads/profiles/@Model.ProfilePictureFilename" alt="Profile utente" class="avatar img-fluid" />
+            </p>
+        }
+
+        <form asp-controller="Dashboard" asp-action="ProcessCvUpload" method="post" enctype="multipart/form-data" class="form-horizontal" role="form" asp-antiforgery="true">
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="profilePic">Immagine profilo:</label>
+                    <input name="profilePic" type="file" class="input-form-control" />
+                </div>
+
+                <button id="submit" type="submit" value="submit" class="btn btn-primary btn-block">Carica immagine profilo</button>
+            </div>
+        </form>
+
+        <h2>Curriculum</h2>
+
+        <p>
+            Usa questo modulo per caricare il tuo curriculum in formato EuroPass: utilizza l'<a href="https://europass.cedefop.europa.eu/it/documents/curriculum-vitae">editor online</a> per creare il documento e trasmettilo qui in formato PDF.
+        </p>
+
+        @if (Model.CurriculumFilename != null) {
+            <p>
+                <b>Il tuo curriculum è stato caricato correttamente!</b><br />
+                File attuale: <a href="~/uploads/curricula/@Model.CurriculumFilename">@Model.CurriculumFilename</a>.
+            </p>
+        }
+
+        <form asp-controller="Dashboard" asp-action="ProcessCvUpload" method="post" enctype="multipart/form-data" class="form-horizontal" role="form" asp-antiforgery="true">
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="curriculum">Curriculum:</label>
+                    <input name="curriculum" type="file" class="input-form-control" />
+                </div>
+
+                <button id="submit" type="submit" value="submit" class="btn btn-primary btn-block">Carica curriculum</button>
+            </div>
+        </form>
+
+    </div>
+
+</div>

src/Web/Web/Views/Dashboard/Index.cshtml

@@ -18,6 +18,7 @@
     <PackageReference Include="MySql.Data" Version="8.0.17" />
     <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.17" />
     <PackageReference Include="RestSharp" Version="106.6.10" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
   </ItemGroup>
 
   <ItemGroup>

src/Web/Web/Views/Dashboard/Upload.cshtml

@@ -16,5 +16,9 @@
   },
   "StaticUserPasswords": {
     "a.bogliolo": "$2y$12$jU9.9jJzc58TLq5Q1vYSTOuYR.4oLUL/vy006rCU69xP.wPeqqzN2"
+  },
+  "Paths": {
+    "Curricula": "/data/curricula",
+    "ProfilePics": "/data/profile"
   }
 }

src/Web/Web/Web.csproj

@@ -65,6 +65,10 @@ button {
     color: rgb(172, 82, 138) !important;
 }
 
+img.avatar {
+    max-width: 50%;
+}
+
 hr {
     margin-top: 2rem;
     margin-bottom: 2rem;
@@ -77,6 +81,14 @@ hr {
     margin-right: auto;
 }
 
+.input-form-control {
+    display: block;
+    height: calc(2.25rem + 2px);
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+}
+
 #submit {
     background-color: rgb(202,112,168);
     border-color: rgb(202,112,168);