From 925ef4ecb030c84bbba2d807988e5e89633e88a3 Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Tue, 3 Aug 2021 09:41:07 +0300
Subject: [PATCH 1/7] fix: remove useless pages\usings, move some files

---
 .../Client/Pages/Counter.razor                | 16 --------
 .../{TestPage.razor => SingleStat.razor}      |  2 +-
 .../Pages/{GetTeam.razor => UnitedStat.razor} | 38 ++++---------------
 .../Client/Pages/UnitedStat.razor.cs          | 36 ++++++++++++++++++
 .../Client/Shared/NavMenu.razor               | 14 +++----
 .../Client/_Imports.razor                     |  2 +-
 .../Server/Controllers/TeamController.cs      |  2 -
 7 files changed, 52 insertions(+), 58 deletions(-)
 delete mode 100644 Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Counter.razor
 rename Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/{TestPage.razor => SingleStat.razor} (96%)
 rename Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/{GetTeam.razor => UnitedStat.razor} (52%)
 create mode 100644 Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Counter.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Counter.razor
deleted file mode 100644
index 8641f78..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Counter.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-@page "/counter"
-
-<h1>Counter</h1>
-
-<p>Current count: @currentCount</p>
-
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-
-@code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/SingleStat.razor
similarity index 96%
rename from Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor
rename to Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/SingleStat.razor
index 5b1e9f8..6a987ec 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/SingleStat.razor
@@ -1,7 +1,7 @@
 @page "/testpage"
 @using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses
 @inject HttpClient Http
-<h1>TestFunc</h1>
+<h1>Get activity by 2 ways (Test)</h1>
 <p>
     <input @bind="_setName" @bind:event="oninput" />
 </p>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor
similarity index 52%
rename from Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor
rename to Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor
index 3f7b376..4b194f5 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor
@@ -1,15 +1,16 @@
 @page "/Team"
-@using Kysect.GithubActivityAnalyzer.WebDemo.Shared
-@using Kysect.GithubActivityAnalyzer.Aggregators.Models
 @inject HttpClient Http
-<h1>TestFunc</h1>
+<h1>United stat</h1>
 <p>
-    <input @bind="_teamName" @bind:event="oninput" />
+    <input @bind="@_teamName" @bind:event="oninput" />
 </p>
+
 <p>
-    <input @bind="_username" @bind:event="oninput" />
+    <input @bind="@_username" @bind:event="oninput" />
 </p>
-<button class="btn btn-primary" @onclick="AddStudent">Add member</button>
+
+<button class="btn btn-primary" @onclick="@AddStudent">Add member</button>
+
 <p>
     <button class="btn btn-primary" @onclick="GetStat">Get Stat</button>
 </p>
@@ -57,28 +58,3 @@ else
 
 }
 
-@code {
-    private string _username = String.Empty;
-    private string _teamName = String.Empty;
-    private List<string> _usernames = new List<string>();
-    private TeamResponse _team;
-    private bool _statsIsVisible = false;
-
-
-    protected async Task GetStat()
-    {
-        Team newTeamInfo = new Team()
-        {
-            TeamName = _teamName,
-            Usernames = _usernames
-        };
-        var response = await Http.PostAsJsonAsync("Team", newTeamInfo);
-        _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
-        _statsIsVisible = true;
-    }
-
-    private void AddStudent()
-    {
-        _usernames.Add(_username);
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs
new file mode 100644
index 0000000..1aef1da
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using Kysect.GithubActivityAnalyzer.Aggregators.Models;
+using System.Net.Http.Json;
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Client.Pages
+{
+    public partial class UnitedStat
+    {
+        private string _username = String.Empty;
+        private string _teamName = String.Empty;
+        private List<string> _usernames = new List<string>();
+        private TeamResponse _team;
+        private bool _statsIsVisible = false;
+
+
+        protected async Task GetStat()
+        {
+            Team newTeamInfo = new Team()
+            {
+                TeamName = _teamName,
+                Usernames = _usernames
+            };
+            var response = await Http.PostAsJsonAsync("Team", newTeamInfo);
+            _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
+            _statsIsVisible = true;
+        }
+        private void AddStudent()
+        {
+            if (!_usernames.Contains(_username))
+                _usernames.Add(_username);
+        }
+
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
index f51aaaf..fb9be82 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
@@ -12,19 +12,14 @@
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
-        </li>
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="testpage">
-                <span class="oi oi-plus" aria-hidden="true"></span> Test Page
+                <span class="oi oi-plus" aria-hidden="true"></span> Single stat
             </NavLink>
         </li>
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="Team">
-                <span class="oi oi-plus" aria-hidden="true"></span> Team
+                <span class="oi oi-plus" aria-hidden="true"></span> United Stat
             </NavLink>
         </li>
         <li class="nav-item px-3">
@@ -32,6 +27,11 @@
                 <span class="oi oi-plus" aria-hidden="true"></span> DatabaseTeam
             </NavLink>
         </li>
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="TeamDashboard">
+                <span class="oi oi-plus" aria-hidden="true"></span> Team Dashboard
+            </NavLink>
+        </li>
     </ul>
 </div>
 
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/_Imports.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/_Imports.razor
index 2b477dc..d440f4d 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/_Imports.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/_Imports.razor
@@ -7,4 +7,4 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using Kysect.GithubActivityAnalyzer.WebDemo.Client
-@using Kysect.GithubActivityAnalyzer.WebDemo.Client.Shared
+@using Kysect.GithubActivityAnalyzer.WebDemo.Client.Shared
\ No newline at end of file
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
index 8ed4b79..72c27bd 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
-using Kysect.GithubActivityAnalyzer.Aggregators;
 using Kysect.GithubActivityAnalyzer.Aggregators.Models;
 using Kysect.GithubActivityAnalyzer.ApiAccessor;
-using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
 {

From 59e2af6220856732d682cbc1d258ff40b66c699c Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Tue, 3 Aug 2021 09:47:53 +0300
Subject: [PATCH 2/7] feat: add dashboard page

---
 ...thubActivityAnalyzer.WebDemo.Client.csproj |  1 +
 .../Pages/Dashboards/TeamDashboard.razor      | 33 +++++++++++++++
 .../Pages/Dashboards/TeamDashboard.razor.cs   | 31 ++++++++++++++
 .../Client/wwwroot/index.html                 |  9 +++-
 .../Client/wwwroot/js/Chart.js                | 42 +++++++++++++++++++
 .../Server/Controllers/DBTeamController.cs    |  5 ++-
 .../Server/Services/ITeamService.cs           |  4 +-
 .../Server/Services/TeamService.cs            |  5 ++-
 8 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
 create mode 100644 Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
 create mode 100644 Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/js/Chart.js

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
index e461689..d501b05 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="ChartJs.Blazor" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.4" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
new file mode 100644
index 0000000..494f915
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
@@ -0,0 +1,33 @@
+@page "/TeamDashboard"
+@inject HttpClient Http
+@inject IJSRuntime jsRuntime
+<h1>Team Dashboard</h1>
+<p>
+    <input @bind="@_teamName" @bind:event="oninput" />
+</p>
+
+<p>
+    <button class="btn btn-primary" @onclick="GenerateBarChart">GenerateBarChart</button>
+</p>
+@if (_teamName is null && !_statsIsVisible)
+{
+    <p><em>Please write team name</em></p>
+}
+else
+{
+    <p>Team name: @_teamName </p>
+}
+@if (_statsIsVisible)
+{
+    <div id="chartdiv"></div>
+}
+
+
+<!-- Styles -->
+<style>
+    #chartdiv {
+        width: 100%;
+        height: 500px;
+        font-size: 11px;
+    }
+</style>
\ No newline at end of file
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
new file mode 100644
index 0000000..d4a0ddb
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using Kysect.GithubActivityAnalyzer.Aggregators.Models;
+using System.Net.Http.Json;
+using Microsoft.JSInterop;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Client.Pages.Dashboards
+{
+    public partial class TeamDashboard
+    {
+        private string _teamName = String.Empty;
+        private TeamResponse _team;
+        private bool _statsIsVisible = false;
+        private async Task GetStat()
+        {
+            var teamResponse = await Http.PostAsJsonAsync("DBTeam/GetTeam", new Team(_teamName));
+            Team teamInfo = await teamResponse.Content.ReadFromJsonAsync<Team>();
+            var response = await Http.PostAsJsonAsync("Team", teamInfo);
+            _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
+            _statsIsVisible = true;
+        }
+        private async void GenerateBarChart()
+        {
+            await GetStat();
+            var teamInfo = _team.Members;
+            await jsRuntime.InvokeVoidAsync("GenerateBarChart", teamInfo);
+        }
+
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/index.html b/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/index.html
index 37bcc83..de6da85 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/index.html
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 
 <head>
@@ -20,6 +20,13 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webassembly.js"></script>
+
+    <!-- Resources -->
+    <script src="https://www.amcharts.com/lib/3/amcharts.js"></script>
+    <script src="https://www.amcharts.com/lib/3/serial.js"></script>
+    <script src="https://www.amcharts.com/lib/3/plugins/export/export.min.js"></script>
+    <link rel="stylesheet" href="https://www.amcharts.com/lib/3/plugins/export/export.css" type="text/css" media="all" />
+    <script src="js/Chart.js"></script>
 </body>
 
 </html>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/js/Chart.js b/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/js/Chart.js
new file mode 100644
index 0000000..23cfa27
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/wwwroot/js/Chart.js
@@ -0,0 +1,42 @@
+function GenerateBarChart(teamInfo) {
+   AmCharts.makeChart("chartdiv", {
+        "type": "serial",
+        "theme": "none",
+        "categoryField": "username",
+        "rotate": true,
+        "startDuration": 1,
+        "categoryAxis": {
+            "gridPosition": "start",
+            "position": "left"
+        },
+        "trendLines": [],
+        "graphs": [
+            {
+                "balloonText": "totalContributions:[[value]]",
+                "fillAlphas": 0.8,
+                "id": "AmGraph-1",
+                "lineAlpha": 0.2,
+                "title": "totalContributions",
+                "type": "column",
+                "valueField": "totalContributions"
+            },
+        ],
+        "guides": [],
+        "valueAxes": [
+            {
+                "id": "ValueAxis-1",
+                "position": "top",
+                "axisAlpha": 0
+            }
+        ],
+        "allLabels": [],
+        "balloon": {},
+        "titles": [],
+        "dataProvider": teamInfo,
+        "export": {
+            "enabled": true
+        },
+        "hideCredits": true
+
+    });
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
index 637d300..022ae84 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
@@ -42,9 +42,10 @@ public void GetAllTeams()
         {
         }
 
-        [HttpGet("GetTeam")]
-        public void GetTeam()
+        [HttpPost("GetTeam")]
+        public Team GetTeam(Team team)
         {
+            return _teamService.GetTeam(team);
         }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
index 0db47f8..e8e2e69 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
@@ -13,8 +13,6 @@ public interface ITeamService
 
         //TODO: разобраться с возвращаемым значением
         public void GetAllTeams();
-
-        //TODO: разобраться с возвращаемым значением
-        public IQueryable<Member> GetTeam(string teamName);
+        public Team GetTeam(Team teamName);
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
index ed234ca..3acbd6d 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
@@ -37,9 +37,10 @@ void ITeamService.GetAllTeams()
         {
             throw new System.NotImplementedException();
         }
-        IQueryable<Member> ITeamService.GetTeam(string teamName)
+        Team ITeamService.GetTeam(Team team)
         {
-            throw new System.NotImplementedException();
+            team.Usernames = _teamRepository.GetAllByTeam(team.TeamName).Select(p => p.Username).ToList();
+            return team;
         }
     }
 }

From 7dbc157d33fdf6fbff28db5b9ba36b2925525507 Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Wed, 4 Aug 2021 09:12:46 +0300
Subject: [PATCH 3/7] feat: try to handle unknown teamNames

---
 .../Pages/Dashboards/TeamDashboard.razor      | 15 +++++++----
 .../Pages/Dashboards/TeamDashboard.razor.cs   | 26 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
index 494f915..4dba122 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor
@@ -6,10 +6,7 @@
     <input @bind="@_teamName" @bind:event="oninput" />
 </p>
 
-<p>
-    <button class="btn btn-primary" @onclick="GenerateBarChart">GenerateBarChart</button>
-</p>
-@if (_teamName is null && !_statsIsVisible)
+@if (_teamName is null)
 {
     <p><em>Please write team name</em></p>
 }
@@ -17,11 +14,19 @@ else
 {
     <p>Team name: @_teamName </p>
 }
+
+<p>
+    <button class="btn btn-primary" @onclick="GenerateBarChart">Generate Bar Chart</button>
+</p>
+
 @if (_statsIsVisible)
 {
     <div id="chartdiv"></div>
 }
-
+else 
+{
+    <p><font size="1" color="red" face="Arial">No such team</font></p>
+}
 
 <!-- Styles -->
 <style>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
index d4a0ddb..f963b63 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
@@ -4,6 +4,7 @@
 using Kysect.GithubActivityAnalyzer.Aggregators.Models;
 using System.Net.Http.Json;
 using Microsoft.JSInterop;
+using System.Linq;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Client.Pages.Dashboards
 {
@@ -11,21 +12,28 @@ public partial class TeamDashboard
     {
         private string _teamName = String.Empty;
         private TeamResponse _team;
-        private bool _statsIsVisible = false;
+        private bool _statsIsVisible = true;
         private async Task GetStat()
         {
-            var teamResponse = await Http.PostAsJsonAsync("DBTeam/GetTeam", new Team(_teamName));
-            Team teamInfo = await teamResponse.Content.ReadFromJsonAsync<Team>();
-            var response = await Http.PostAsJsonAsync("Team", teamInfo);
-            _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
-            _statsIsVisible = true;
+            var team = await Http.PostAsJsonAsync("DBTeam/GetTeam", new Team(_teamName));
+            Team teamToAggregate = await team.Content.ReadFromJsonAsync<Team>();
+            if (teamToAggregate.Usernames.Any())
+            {
+                var teamResponse = await Http.PostAsJsonAsync("Team", teamToAggregate);
+                _team = await teamResponse.Content.ReadFromJsonAsync<TeamResponse>();
+                _statsIsVisible = true;
+            }
+            else { _statsIsVisible = false;}
         }
         private async void GenerateBarChart()
         {
             await GetStat();
-            var teamInfo = _team.Members;
-            await jsRuntime.InvokeVoidAsync("GenerateBarChart", teamInfo);
+            StateHasChanged();
+            if (_statsIsVisible)
+            {
+                var teamInfo = _team.Members;
+                await jsRuntime.InvokeVoidAsync("GenerateBarChart", teamInfo);
+            }
         }
-
     }
 }

From 1293987c605f68fccaad5663e7cc5a2553b6c68e Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Sat, 14 Aug 2021 10:04:41 +0300
Subject: [PATCH 4/7] fix conflict

---
 .../Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
index d501b05..848365f 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Kysect.GithubActivityAnalyzer.WebDemo.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="ChartJs.Blazor" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.8" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
   </ItemGroup>
 

From 9aa85a47cff7e3b47b17f36f1a7ae13f324b58a0 Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Sat, 14 Aug 2021 10:12:04 +0300
Subject: [PATCH 5/7] style: fix indent, usings; rename TeamController
 ->TeamInfoController

---
 .../Client/Pages/UnitedStat.razor.cs                       | 3 +--
 .../{TeamController.cs => TeamInfoController.cs}           | 6 +++---
 .../Server/Services/IActivityService.cs                    | 7 ++-----
 3 files changed, 6 insertions(+), 10 deletions(-)
 rename Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/{TeamController.cs => TeamInfoController.cs} (77%)

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs
index 1aef1da..df38480 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/UnitedStat.razor.cs
@@ -4,6 +4,7 @@
 using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
 using Kysect.GithubActivityAnalyzer.Aggregators.Models;
 using System.Net.Http.Json;
+
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Client.Pages
 {
     public partial class UnitedStat
@@ -13,8 +14,6 @@ public partial class UnitedStat
         private List<string> _usernames = new List<string>();
         private TeamResponse _team;
         private bool _statsIsVisible = false;
-
-
         protected async Task GetStat()
         {
             Team newTeamInfo = new Team()
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamInfoController.cs
similarity index 77%
rename from Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
rename to Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamInfoController.cs
index 72c27bd..b81993f 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamInfoController.cs
@@ -6,12 +6,12 @@ namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
 {
     [ApiController]
     [Route("[controller]")]
-    public class TeamController : Controller
+    public class TeamInfoController : Controller
     {
         private readonly GithubActivityProvider _provider = new GithubActivityProvider();
 
-        [HttpPost]
-        public TeamResponse GetStudyGroup(Shared.Team info)
+        [HttpPost("GetTeamInfo")]
+        public TeamResponse GetTeamInfo(Shared.Team info)
         {
             return new TeamResponse(new Aggregators.Team(info.TeamName, info.Usernames, _provider)); 
         }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs
index add3b58..0df4d32 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs
@@ -1,14 +1,11 @@
 using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
 {
     public interface IActivityService
     {
-        public Task<ActivityInfo> GetActivityInfoFromGithub(string username);
-        public ActivityInfo GetActivityInfoFromDB(string username);
+        Task<ActivityInfo> GetActivityInfoFromGithub(string username);
+        ActivityInfo GetActivityInfoFromDB(string username);
     }
 }

From 44a4bd63f5b3713511cad5de20feebd494c0533b Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Sat, 14 Aug 2021 10:16:52 +0300
Subject: [PATCH 6/7] refact: add IActionResult, split GenerateBarChart logic

---
 .../Pages/Dashboards/TeamDashboard.razor.cs   | 44 +++++++++++++------
 .../Server/Controllers/DBTeamController.cs    | 16 +++++--
 .../Server/Services/ITeamService.cs           | 16 +++----
 .../Server/Services/TeamService.cs            | 12 +++--
 4 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
index f963b63..8dc1bca 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
 using Kysect.GithubActivityAnalyzer.Aggregators.Models;
-using System.Net.Http.Json;
 using Microsoft.JSInterop;
-using System.Linq;
+using System.Net;
+using System.Net.Http.Json;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Client.Pages.Dashboards
 {
@@ -13,18 +13,7 @@ public partial class TeamDashboard
         private string _teamName = String.Empty;
         private TeamResponse _team;
         private bool _statsIsVisible = true;
-        private async Task GetStat()
-        {
-            var team = await Http.PostAsJsonAsync("DBTeam/GetTeam", new Team(_teamName));
-            Team teamToAggregate = await team.Content.ReadFromJsonAsync<Team>();
-            if (teamToAggregate.Usernames.Any())
-            {
-                var teamResponse = await Http.PostAsJsonAsync("Team", teamToAggregate);
-                _team = await teamResponse.Content.ReadFromJsonAsync<TeamResponse>();
-                _statsIsVisible = true;
-            }
-            else { _statsIsVisible = false;}
-        }
+
         private async void GenerateBarChart()
         {
             await GetStat();
@@ -35,5 +24,32 @@ private async void GenerateBarChart()
                 await jsRuntime.InvokeVoidAsync("GenerateBarChart", teamInfo);
             }
         }
+        private async Task GetStat()
+        {
+            Team team = await GetTeam();
+            if (team is not null)
+            {
+                var teamInfoResponse = await Http.PostAsJsonAsync("TeamInfo/GetTeamInfo", team);
+                _team = await teamInfoResponse.Content.ReadFromJsonAsync<TeamResponse>();
+                _statsIsVisible = true;
+            }
+            else
+            {
+                _statsIsVisible = false;
+            }
+
+        }
+        private async Task<Team> GetTeam()
+        {
+            var teamResponse = await Http.PostAsJsonAsync("DBTeam/GetTeam", new Team(_teamName));
+            if (teamResponse.StatusCode == HttpStatusCode.OK)
+            {
+                return await teamResponse.Content.ReadFromJsonAsync<Team>();
+            }
+            else 
+            { 
+                return null;
+            }
+        }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
index 022ae84..f2fdee8 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
@@ -1,5 +1,6 @@
 using Kysect.GithubActivityAnalyzer.WebDemo.Server.Services;
 using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
@@ -32,20 +33,29 @@ public void DeleteMember(string username)
             _teamService.DeleteMember(username);
         }
 
+        ///TO DO: to realize
         [HttpPost("updateMember")]
         public void UpdateMember()
         {
         }
-
+        ///TO DO: to realize
         [HttpGet("GetAllTeams")]
         public void GetAllTeams()
         {
         }
 
         [HttpPost("GetTeam")]
-        public Team GetTeam(Team team)
+        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(Team))]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public IActionResult GetTeam(Team teamName)
         {
-            return _teamService.GetTeam(team);
+
+            if (!_teamService.TryGetTeam(teamName, out var team))
+            {
+                return NotFound();
+            }
+
+            return Ok(team);
         }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
index e8e2e69..8143b5d 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
@@ -1,18 +1,16 @@
-using Kysect.GithubActivityAnalyzer.Data.Entities;
-using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
-using System.Linq;
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
 {
     public interface ITeamService
     {
-        public void AddTeam(Team team);
-        public void DeleteTeam(string teamName);
-        public void UpdateMember(string username, string teamName);
-        public void DeleteMember(string username);
+        void AddTeam(Team team);
+        void DeleteTeam(string teamName);
+        void UpdateMember(string username, string teamName);
+        void DeleteMember(string username);
 
         //TODO: разобраться с возвращаемым значением
-        public void GetAllTeams();
-        public Team GetTeam(Team teamName);
+        void GetAllTeams();
+        bool TryGetTeam(Team teamName, out Team team);
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
index 3acbd6d..8e22604 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
@@ -33,14 +33,18 @@ public void DeleteMember(string username)
         }
 
         //TODO: Уточнить с ТЗ и реализовать
-        void ITeamService.GetAllTeams()
+        public void GetAllTeams()
         {
             throw new System.NotImplementedException();
         }
-        Team ITeamService.GetTeam(Team team)
+        public bool TryGetTeam(Team teamName, out Team team)
         {
-            team.Usernames = _teamRepository.GetAllByTeam(team.TeamName).Select(p => p.Username).ToList();
-            return team;
+            team = new Team() { TeamName = teamName.TeamName };
+            team.Usernames = _teamRepository.GetAllByTeam(teamName.TeamName).Select(p => p.Username).ToList();
+            if (team.Usernames.Any())
+                return true;
+            else
+                return false;
         }
     }
 }

From aa2cd2ae87ecf61e652837fc9d5032caa52d847b Mon Sep 17 00:00:00 2001
From: ALEXXXANDRO <alkolegov2011@yandex.ru>
Date: Mon, 30 Aug 2021 12:14:01 +0300
Subject: [PATCH 7/7] fix async void

---
 .../Client/Pages/Dashboards/TeamDashboard.razor.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
index 8dc1bca..7bc12fc 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/Dashboards/TeamDashboard.razor.cs
@@ -14,7 +14,7 @@ public partial class TeamDashboard
         private TeamResponse _team;
         private bool _statsIsVisible = true;
 
-        private async void GenerateBarChart()
+        private async Task GenerateBarChart()
         {
             await GetStat();
             StateHasChanged();