Merge pull request #37 from skalahonza/opt

Opt
skalahonza · Feb 23, 2018 · cb2323e · cb2323e
2 parents 873e74a + 567b498
commit cb2323e
Show file tree

Hide file tree

Showing 25 changed files with 85 additions and 69 deletions.
diff --git a/Chemiklani.BL/Chemiklani.BL.csproj b/Chemiklani.BL/Chemiklani.BL.csproj
@@ -10,10 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" />
-    <PackageReference Include="Riganti.Utils.Infrastructure.Core" Version="2.0.0" />
-    <PackageReference Include="Riganti.Utils.Infrastructure.Services" Version="2.0.0" />
-    <PackageReference Include="Riganti.Utils.Infrastructure.AutoMapper" Version="2.0.0" />
-    <PackageReference Include="Riganti.Utils.Infrastructure.EntityFramework" Version="2.0.0" />
     <PackageReference Include="EntityFramework" Version="6.1.3" />
   </ItemGroup>
 

diff --git a/Chemiklani.BL/DTO/BaseDTO.cs b/Chemiklani.BL/DTO/BaseDTO.cs
@@ -1,4 +1,4 @@
-using Riganti.Utils.Infrastructure.Core;
+using Chemiklani.DAL.Entities;
 
 namespace Chemiklani.BL.DTO
 {

diff --git a/Chemiklani.BL/DTO/IMappable.cs b/Chemiklani.BL/DTO/IMappable.cs
@@ -1,8 +1,8 @@
-using Riganti.Utils.Infrastructure.Core;
+using Chemiklani.DAL.Entities;
 
 namespace Chemiklani.BL.DTO
 {
-    public interface IMappable<TEntity>
+    public interface IMappable<in TEntity>
         where TEntity:IEntity<int>
     {
         void MapFrom(TEntity entity);

diff --git a/Chemiklani.BL/Services/ScoreService.cs b/Chemiklani.BL/Services/ScoreService.cs
@@ -93,7 +93,7 @@ public List<string> GetRooms()
         /// <summary>
         /// Get sore dataset for given list of teams
         /// </summary>
-        /// <param name="room"></param>
+        /// <param name="room">Room, used for filter, elave empty if filter not required</param>
         /// <param name="completeDataset">True: you can view points for each task</param>
         /// <returns></returns>
         public List<TeamScoreDTO> GetResults(string room = "", bool completeDataset = false)
@@ -118,6 +118,11 @@ public List<TeamScoreDTO> GetResults(string room = "", bool completeDataset = fa
                     })
                     .ToList();
 
+                var scores = dc.Scores
+                    .Include(x => x.Task)
+                    .Include(x => x.Team)
+                    .ToList();
+
                 var competedTasks = dc.Tasks.ToList();
 
                 //get score for each team
@@ -129,7 +134,7 @@ public List<TeamScoreDTO> GetResults(string room = "", bool completeDataset = fa
                     {
                         Team = t,
                         TasksScores =
-                            completeDataset ? new List<TaskScoreDTO>(TaskScores(t.Id, competedTasks).OrderBy(x => x.TaskNumber)) : new List<TaskScoreDTO>(),
+                            completeDataset ? new List<TaskScoreDTO>(TaskScores(t.Id, competedTasks,scores).OrderBy(x => x.TaskNumber)) : new List<TaskScoreDTO>(),
                         TotalPoints = GetPointsOfTeam(t.Id),
                     });
                 });
@@ -151,33 +156,29 @@ public List<TeamScoreDTO> GetResults(string room = "", bool completeDataset = fa
         /// </summary>
         /// <param name="teamId">Team to be examined</param>
         /// <param name="competedTasks">Tasks the team competed in</param>
+        /// <param name="allScores">All scores from database</param>
         /// <returns></returns>
-        private List<TaskScoreDTO> TaskScores(int teamId, List<Task> competedTasks)
+        private List<TaskScoreDTO> TaskScores(int teamId, List<Task> competedTasks, List<Score> allScores)
         {
-            using (var dc = CreateDbContext())
-            {
-                var result = new List<TaskScoreDTO>();
+            var result = new List<TaskScoreDTO>();
 
-                //get all tasks, team was evaluated in
-                var scores = dc.Scores
-                    .Where(x => x.Team.Id == teamId)
-                    .Include(x => x.Task);        
+            //get all tasks, team was evaluated in
+            var scores = allScores.Where(x => x.Team.Id == teamId).ToList();
 
-                //add points where the team competed
-                foreach (var competedTask in competedTasks)
+            //add points where the team competed
+            foreach (var competedTask in competedTasks)
+            {
+                var score = scores.FirstOrDefault(x => x.Task.Id == competedTask.Id);
+                var dto = new TaskScoreDTO();
+                dto.MapFrom(competedTask);
+                if (score != null)
                 {
-                    var score = scores.FirstOrDefault(x => x.Task.Id == competedTask.Id);
-                    var dto = new TaskScoreDTO();
-                    dto.MapFrom(competedTask);
-                    if (score != null)
-                    {
-                        dto.Points = score.Points;
-                    }
-                    result.Add(dto);
+                    dto.Points = score.Points;
                 }
-
-                return result;
+                result.Add(dto);
             }
+
+            return result;
         }
 
         /// <summary>

diff --git a/Chemiklani.BL/Services/TeamService.cs b/Chemiklani.BL/Services/TeamService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Chemiklani.BL.DTO;

diff --git a/Chemiklani.DAL/AppDbContext.cs b/Chemiklani.DAL/AppDbContext.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Data.Entity;
 using Chemiklani.DAL.Entities;
 using Microsoft.AspNet.Identity.EntityFramework;

diff --git a/Chemiklani.DAL/Chemiklani.DAL.csproj b/Chemiklani.DAL/Chemiklani.DAL.csproj
@@ -42,12 +42,6 @@
     <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Riganti.Utils.Infrastructure.Core, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Riganti.Utils.Infrastructure.Core.2.0.7\lib\net461\Riganti.Utils.Infrastructure.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Riganti.Utils.Infrastructure.EntityFramework, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Riganti.Utils.Infrastructure.EntityFramework.2.0.7\lib\net461\Riganti.Utils.Infrastructure.EntityFramework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -65,6 +59,7 @@
     <Compile Include="Entities\AppUserClaim.cs" />
     <Compile Include="Entities\AppUserLogin.cs" />
     <Compile Include="Entities\AppUserRole.cs" />
+    <Compile Include="Entities\IEntity.cs" />
     <Compile Include="Entities\Score.cs" />
     <Compile Include="Entities\Task.cs" />
     <Compile Include="Entities\Team.cs" />

diff --git a/Chemiklani.DAL/Entities/AppRole.cs b/Chemiklani.DAL/Entities/AppRole.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNet.Identity.EntityFramework;
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Entities/AppUserClaim.cs b/Chemiklani.DAL/Entities/AppUserClaim.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Identity.EntityFramework;
-using Riganti.Utils.Infrastructure.Core;
+using Microsoft.AspNet.Identity.EntityFramework;
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Entities/AppUserLogin.cs b/Chemiklani.DAL/Entities/AppUserLogin.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Identity.EntityFramework;
-using Riganti.Utils.Infrastructure.Core;
+using Microsoft.AspNet.Identity.EntityFramework;
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Entities/AppUserRole.cs b/Chemiklani.DAL/Entities/AppUserRole.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Identity.EntityFramework;
-using Riganti.Utils.Infrastructure.Core;
+using Microsoft.AspNet.Identity.EntityFramework;
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Entities/IEntity.cs b/Chemiklani.DAL/Entities/IEntity.cs
@@ -0,0 +1,7 @@
+namespace Chemiklani.DAL.Entities
+{
+    public interface IEntity<T>
+    {
+        T Id { get; set; }
+    }
+}
diff --git a/Chemiklani.DAL/Entities/Score.cs b/Chemiklani.DAL/Entities/Score.cs
@@ -1,5 +1,3 @@
-using Riganti.Utils.Infrastructure.Core;
-
 namespace Chemiklani.DAL.Entities
 {
     public class Score : IEntity<int>

diff --git a/Chemiklani.DAL/Entities/Task.cs b/Chemiklani.DAL/Entities/Task.cs
@@ -1,4 +1,4 @@
-using Riganti.Utils.Infrastructure.Core;
+
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Entities/Team.cs b/Chemiklani.DAL/Entities/Team.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Riganti.Utils.Infrastructure.Core;
 
 namespace Chemiklani.DAL.Entities
 {

diff --git a/Chemiklani.DAL/Migrations/201706011715579_Init.cs b/Chemiklani.DAL/Migrations/201706011715579_Init.cs
@@ -1,6 +1,5 @@
 namespace Chemiklani.DAL.Migrations
 {
-    using System;
     using System.Data.Entity.Migrations;
 
     public partial class Init : DbMigration

diff --git a/Chemiklani.DAL/Migrations/201707041218579_TeamsRooms.cs b/Chemiklani.DAL/Migrations/201707041218579_TeamsRooms.cs
@@ -1,6 +1,5 @@
 namespace Chemiklani.DAL.Migrations
 {
-    using System;
     using System.Data.Entity.Migrations;
 
     public partial class TeamsRooms : DbMigration

diff --git a/Chemiklani.DAL/Migrations/201707281012007_TeamCategories.cs b/Chemiklani.DAL/Migrations/201707281012007_TeamCategories.cs
@@ -1,6 +1,5 @@
 namespace Chemiklani.DAL.Migrations
 {
-    using System;
     using System.Data.Entity.Migrations;
 
     public partial class TeamCategories : DbMigration

diff --git a/Chemiklani.DAL/Properties/AssemblyInfo.cs b/Chemiklani.DAL/Properties/AssemblyInfo.cs
@@ -1,16 +1,15 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("iPodnik.DAL")]
+[assembly: AssemblyTitle("Chemiklani")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("iPodnik.DAL")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("Chemiklani")]
+[assembly: AssemblyCopyright("Copyright © Jan Skála 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Chemiklani.DAL/packages.config b/Chemiklani.DAL/packages.config
@@ -3,6 +3,4 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net461" />
-  <package id="Riganti.Utils.Infrastructure.Core" version="2.0.7" targetFramework="net461" />
-  <package id="Riganti.Utils.Infrastructure.EntityFramework" version="2.0.7" targetFramework="net461" />
 </packages>
diff --git a/Chemiklani/Chemiklani.csproj b/Chemiklani/Chemiklani.csproj
@@ -148,9 +148,6 @@
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Riganti.Utils.Infrastructure.Core, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Riganti.Utils.Infrastructure.Core.2.0.7\lib\net461\Riganti.Utils.Infrastructure.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
@@ -278,7 +275,9 @@
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="packages.config" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Views\MasterPage.dotmaster" />
     <Content Include="Controls\Menu.dotcontrol" />
     <Content Include="Views\Default.dothtml" />
@@ -289,6 +288,7 @@
     <Content Include="Views\Users.dothtml" />
     <Content Include="Views\Score.dothtml" />
     <Content Include="Views\Results.dothtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

diff --git a/Chemiklani/Properties/AssemblyInfo.cs b/Chemiklani/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Chemiklani")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright © Jan Skála 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Chemiklani/Properties/PublishProfiles/Chemiklani - Web Deploy.pubxml b/Chemiklani/Properties/PublishProfiles/Chemiklani - Web Deploy.pubxml
@@ -23,5 +23,24 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <UserName>$Chemiklani</UserName>
     <_SavePWD>True</_SavePWD>
     <_DestinationType>AzureWebSite</_DestinationType>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="DB" Order="1" Enabled="True">
+          <Destination Path="Data Source=tcp:chemiklanidbserver.database.windows.net,1433;Initial Catalog=Chemiklani_db;User ID=sqladmin@chemiklanidbserver;Password=Hesoyam12!" Name="Data Source=tcp:chemiklanidbserver.database.windows.net,1433;Initial Catalog=Chemiklani_db;User Id=sqladmin@chemiklanidbserver;Password=Hesoyam12!" />
+          <Object Type="DbDacFx">
+            <PreSource Path="Data Source=(localdb)\mssqllocaldb;Initial Catalog=Chemiklani;Integrated Security=True" includeData="False" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\DB_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+          </Object>
+          <UpdateFrom Type="Web.Config">
+            <Source MatchValue="Data Source=(localdb)\mssqllocaldb; Integrated Security=true; Initial Catalog=Chemiklani" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+          </UpdateFrom>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
   </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="DB-Web.config Connection String">
+      <ParameterValue>Data Source=tcp:chemiklanidbserver.database.windows.net,1433;Initial Catalog=Chemiklani_db;User Id=sqladmin@chemiklanidbserver;Password=Hesoyam12!</ParameterValue>
+    </MSDeployParameterValue>
+  </ItemGroup>
 </Project>
diff --git a/Chemiklani/Properties/PublishProfiles/FolderProfile.pubxml b/Chemiklani/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>bin\Release\PublishOutput</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
diff --git a/Chemiklani/packages.config b/Chemiklani/packages.config
@@ -38,7 +38,6 @@
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="Owin" version="1.0" targetFramework="net451" />
-  <package id="Riganti.Utils.Infrastructure.Core" version="2.0.7" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />