Updated docs

davidfowl · DamianEdwards · commit bf4bca699a59 · 2019-10-01T17:37:07.000-07:00
diff --git a/docs/4. Add auth features.md b/docs/4. Add auth features.md
@@ -680,10 +680,8 @@ We're currently using `if` blocks to determine whether to show parts of the UI b
 			<a asp-page="Speaker" asp-route-id="@speaker.Id">@speaker.Name</a>
 		    </li>
 		}
-		<li authz-policy="Admin">
-		    <a asp-page="/Admin/EditSession" asp-route-id="@session.Id" class="btn btn-default btn-xs">Edit</a>
-		</li>
-	    </ul>
+        </ul>
+        <a authz-policy="Admin" asp-page="/Admin/EditSession" asp-route-id="@session.Id" class="btn btn-default btn-xs">Edit</a>
 	</div>
     ```
     
diff --git a/docs/5. Add personal agenda.md b/docs/5. Add personal agenda.md
@@ -329,25 +329,26 @@ dotnet aspnet-codegenerator identity --dbContext FrontEnd.Data.IdentityDbContext
 
     public async Task<List<SessionResponse>> GetSessionsByAttendeeAsync(string name)
     {
-        // TODO: Would be better to add backend API for this
+        var response = await _httpClient.GetAsync($"/api/attendees/{name}/sessions");
 
-        var sessionsTask = GetSessionsAsync();
-        var attendeeTask = GetAttendeeAsync(name);
-
-        await Task.WhenAll(sessionsTask, attendeeTask);
-
-        var sessions = await sessionsTask;
-        var attendee = await attendeeTask;
-
-        if (attendee == null)
-        {
-            return new List<SessionResponse>();
-        }
-
-        var sessionIds = attendee.Sessions.Select(s => s.Id);
-
-        sessions.RemoveAll(s => !sessionIds.Contains(s.Id));
+        response.EnsureSuccessStatusCode();
 
+        return await response.Content.ReadAsAsync<List<SessionResponse>>();
+    }
+    ```
+### Add the BackEnd API to get sessions by an attendee
+1. Add an action called `GetSessions` to the `AttendeesController` in the `BackEnd` project:
+    ```c#
+    [HttpGet("{username}/sessions")]
+    public async Task<ActionResult<List<SessionResponse>>> GetSessions(string username)
+    {
+        var sessions = await _db.Sessions.AsNoTracking()
+                                            .Include(s => s.Track)
+                                            .Include(s => s.SessionSpeakers)
+                                                .ThenInclude(ss => ss.Speaker)
+                                            .Where(s => s.SessionAttendees.Any(sa => sa.Attendee.UserName == username))
+                                            .Select(m => m.MapSessionResponse())
+                                            .ToListAsync();
         return sessions;
     }
     ```
@@ -361,9 +362,12 @@ dotnet aspnet-codegenerator identity --dbContext FrontEnd.Data.IdentityDbContext
 1. Compute the value of that property in `OnGetAsync`:
 
     ```csharp
-    var sessions = await _apiClient.GetSessionsByAttendeeAsync(User.Identity.Name);
+    if (User.Identity.IsAuthenticated)
+    {
+        var sessions = await _apiClient.GetSessionsByAttendeeAsync(User.Identity.Name);
 
-    IsInPersonalAgenda = sessions.Any(s => s.Id == id);
+        IsInPersonalAgenda = sessions.Any(s => s.Id == id);
+    }
     ```
 1. Add a form to the bottom of `Session.cshtml` razor page that adds the ability to add/remove the session to the attendee's personal agenda:
     
@@ -470,70 +474,37 @@ dotnet aspnet-codegenerator identity --dbContext FrontEnd.Data.IdentityDbContext
         }
     }
     ```
-1. Add the HTML to render the list of sessions on the attendee's personal agenda to `MyAgenda.cshtml`:
-
+1. Refactor the `Index.cshtml` into a `_AgendaPartial.cshtml` under the `Pages\Shared` folder. It should have the following content:
     ```html
-    @page
-    @model MyAgendaModel
-    @{
-        ViewData["Title"] = "My Agenda";
-    }
-
-    @if (Model.ShowMessage)
-    {
-        <div class="alert alert-success alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span>   </button>
-            @Model.Message
-        </div>
-    }
+    @model IndexModel
 
     <div class="agenda">
-        <h1>My Conference @System.DateTime.Now.Year</h1>
-
-        @if (Model.UserSessions.Count == 0)
-        {
-            <p>
-                You have not yet added any sessions to your agenda. Add sessions to your personal agenda
-                by browsing the <a asp-page="/Index">conference agenda</a> or <a asp-page="/Search">searching</a>
-                for sessions and speakers and clicking the star button.
-            </p>
-        }
-
-        <ul class="nav nav-pills">
-            @foreach (var day in Model.DayOffsets)
-            {
-                <li role="presentation" class="@(Model.CurrentDayOffset == day.Offset ? "active" : null)">
-                    <a asp-route-day="@day.Offset">@day.DayofWeek?.ToString()</a>
-                </li>
-            }
-        </ul>
-
         @foreach (var timeSlot in Model.Sessions)
         {
             <h4>@timeSlot.Key?.ToString("HH:mm")</h4>
             <div class="row">
                 @foreach (var session in timeSlot)
                 {
-                <div class="col-md-3 mb-4">
-                    <div class="card shadow session h-100">
-                        <div class="card-header">@session.Track?.Name</div>
-                        <div class="card-body">
-                            <h5 class="card-title"><a asp-page="Session" asp-route-id="@session.ID">@session.Title</a></h5>
-                        </div>
-                        <div class="card-footer">
-                            <ul class="list-inline mb-0">
-                                @foreach (var speaker in session.Speakers)
-                                {
-                                    <li class="list-inline-item">
-                                        <a asp-page="Speaker" asp-route-id="@speaker.Id">@speaker.Name</a>
-                                    </li>
-                                }
-                            </ul>
-                            <form authz="true" method="post">
+                    <div class="col-md-3 mb-4">
+                        <div class="card shadow session h-100">
+                            <div class="card-header">@session.Track?.Name</div>
+                            <div class="card-body">
+                                <h5 class="card-title"><a asp-page="Session" asp-route-id="@session.Id">@session.Title</a></h5>
+                            </div>
+                            <div class="card-footer">
+                                <ul class="list-inline mb-0">
+                                    @foreach (var speaker in session.Speakers)
+                                    {
+                                        <li class="list-inline-item">
+                                            <a asp-page="Speaker" asp-route-id="@speaker.Id">@speaker.Name</a>
+                                        </li>
+                                    }
+                                </ul>
+                                <form authz method="post">
                                 <input type="hidden" name="sessionId" value="@session.Id" />
                                 <p class="mb-0">
-                                    <a authz-policy="Admin" asp-page="/Admin/EditSession" asp-route-id="@session.Id" class="btn btn-default btn-sm">Edit</a>
-                                    @if (Model.UserSessions.Contains(session.ID))
+                                    <a authz-policy="Admin" asp-page="/Admin/EditSession" asp-route-id="@session.Id" class="btn btn-default btn-xs">Edit</a>
+                                    @if (Model.UserSessions.Contains(session.Id))
                                     {
                                         <button type="submit" asp-page-handler="Remove" class="btn btn-default btn-sm bg-transparent" title="Remove from my personal agenda">
                                             <i class="icon ion-md-star" aria-hidden="true"></i>
@@ -546,15 +517,41 @@ dotnet aspnet-codegenerator identity --dbContext FrontEnd.Data.IdentityDbContext
                                         </button>
                                     }
                                 </p>
-                            </form>
+                                </form>
+                            </div>
                         </div>
                     </div>
-                </div>
                 }
             </div>
         }
     </div>
     ```
+1. Update the `Index.cshtml` to use the new `_AgendaPartial`. Replace the entire div with the "agenda" css class and replace it with the following:
+    ```html
+    <h1 class="mb-4">My Conference @System.DateTime.Now.Year</h1>
+
+    <partial name="_AgendaPartial" model="Model" />
+    ```
+1. Next, use the `_AgendaPartial` on the `MyAgenda.cshtml` page.
+    ```html
+    @page
+    @model MyAgendaModel
+    @{
+        ViewData["Title"] = "My Agenda";
+    }
+
+    @if (Model.ShowMessage)
+    {
+        <div class="alert alert-success alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            @Model.Message
+        </div>
+    }
+
+    <h1 class="mb-4">My Agenda - My Conference @System.DateTime.Now.Year</h1>
+
+    <partial name="_AgendaPartial" model="Model" />
+    ```
 
 ## Add the My Agenda link to the Layout
 1. Go to the layout file `_Layout.cshtml`.
@@ -581,50 +578,45 @@ dotnet aspnet-codegenerator identity --dbContext FrontEnd.Data.IdentityDbContext
             </li>
         </ul>
     </div>
-    ```    
-1. Add a `[TempData]` backed `Message` property to `IndexModel`, similar to the property we added to the `EditSession` page:
-    ```csharp
-        [TempData]
-        public string Message { get; set; }
-
-        public bool ShowMessage => !string.IsNullOrEmpty(Message);
-    ```  
+    ```
 1. You should be able to login as an attendee, add/remove sessions to your personal agenda and click on MyAgenda to have them show up.
 
 ## Update IndexModel to include User Sessions
 1. Add a `UserSessions` property to the `IndexModel`:
     ```csharp
-    public List<int> UserSessions { get; set; }
-    ```      
+    public List<int> UserSessions { get; set; } = new List<int>();
+    ```
 1. Update the `OnGet` method to fetch the `UserSessions`:
 
     ```csharp
     public async Task OnGet(int day = 0)
     {
         CurrentDayOffset = day;
 
-        var userSessions = await _apiClient.GetSessionsByAttendeeAsync(User.Identity.Name);
-        UserSessions = userSessions.Select(u => u.Id).ToList();
+        if (User.Identity.IsAuthenticated)
+        {
+            var userSessions = await _apiClient.GetSessionsByAttendeeAsync(User.Identity.Name);
+            UserSessions = userSessions.Select(u => u.Id).ToList();
+        }
 
         var sessions = await GetSessionsAsync();
         //...
     ```
 1. Add the following two methods to the `IndexModel` to handle adding and removing sessions from your agenda fron the `Index` page:
     ```csharp
-    
-          public async Task<IActionResult> OnPostAsync(int sessionId)
-        {
-            await _apiClient.AddSessionToAttendeeAsync(User.Identity.Name, sessionId);
+    public async Task<IActionResult> OnPostAsync(int sessionId)
+    {
+        await _apiClient.AddSessionToAttendeeAsync(User.Identity.Name, sessionId);
 
-            return RedirectToPage();
-        }
+        return RedirectToPage();
+    }
 
-        public async Task<IActionResult> OnPostRemoveAsync(int sessionId)
-        {
-            await _apiClient.RemoveSessionFromAttendeeAsync(User.Identity.Name, sessionId);
+    public async Task<IActionResult> OnPostRemoveAsync(int sessionId)
+    {
+        await _apiClient.RemoveSessionFromAttendeeAsync(User.Identity.Name, sessionId);
 
-            return RedirectToPage();
-        }
+        return RedirectToPage();
+    }
     ```
 1. Run the application and test logging in and managing your agenda from the `Index` page, individual session details, and from the `My Agenda` page.
 
