cleaning

Yavsc/ApiControllers/PdfEstimateController.cs

@@ -17,6 +17,7 @@ namespace Yavsc.ApiControllers
     using Yavsc.Services;
     using Yavsc.Models.Messaging;
     using Yavsc.ViewModels;
+    using Microsoft.Extensions.OptionsModel;
 
     [Route("api/pdfestimate"), Authorize]
     public class PdfEstimateController : Controller
@@ -33,12 +34,17 @@ namespace Yavsc.ApiControllers
             IAuthorizationService authorizationService,
             ILoggerFactory loggerFactory,
             IStringLocalizer<Yavsc.Resources.YavscLocalisation> SR,
-            ApplicationDbContext context)
+            ApplicationDbContext context,
+            IOptions<GoogleAuthSettings> googleSettings,
+            IGoogleCloudMessageSender GCMSender
+            )
         {
+            _googleSettings=googleSettings.Value;
             this.authorizationService = authorizationService;
             dbContext = context;
             logger = loggerFactory.CreateLogger<PdfEstimateController>();
             this._localizer = SR;
+            _GCMSender=GCMSender;
         }
 
         [HttpGet("get/{id}", Name = "Get"), Authorize]

Yavsc/Controllers/FormationSettingsController.cs

@@ -1,7 +1,5 @@
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Data.Entity;
 using Yavsc.Models;
 using Yavsc.Models.Workflow.Profiles;

Yavsc/Controllers/ManageController.cs

@@ -116,13 +116,8 @@ namespace Yavsc.Controllers
             model.HaveProfessionalSettings = _dbContext.Performers.Any(x => x.PerformerId == user.Id);
             var usrActs = _dbContext.UserActivities.Include(a=>a.Does).Where(a=> a.UserId == user.Id);
 
-            await usrActs.Where(u=>u.Does.SettingsClassName!=null).ForEachAsync(
-                a=>{ a.Settings = a.Does.CreateSettings(User.GetUserId()); }
-            );
-
             model.HaveActivityToConfigure = usrActs.Any( a=> a.Settings == null && a.Does.SettingsClassName!=null );
-            model.Activity = _dbContext.UserActivities.Include(a=>a.Does).Where(u=>u.UserId == user.Id)
-            .ToList();
+            model.Activity = _dbContext.UserActivities.Include(a=>a.Does).Where(u=>u.UserId == user.Id).ToList();
             return View(model);
         }
 

Yavsc/Helpers/WorkflowHelpers.cs

@@ -7,18 +7,8 @@ namespace Yavsc.Helpers
     using Microsoft.Data.Entity;
     using Models.Workflow;
     using Yavsc.Models;
-    using YavscLib;
     public static class WorkflowHelpers
     {
-        public static ISpecializationSettings  CreateSettings (this Activity activity, string userId) {
-            if (activity.SettingsClassName==null) return null;
-            var ctor = Startup.ProfileTypes.Single(t=>t.FullName==activity.SettingsClassName).GetConstructor(System.Type.EmptyTypes);
-            if (ctor==null) return null;
-            ISpecializationSettings result = (ISpecializationSettings) ctor.Invoke(null);
-            result.UserId = userId;
-            return result;
-        }
-
         public static List<PerformerProfile> ListPerformers(this ApplicationDbContext context, string actCode)
         {
             return context.Performers