From adc3585f38962ae9e916479f8014a2c52f30e3a4 Mon Sep 17 00:00:00 2001
From: Berkan Sasmaz <berkansasmazz@gmail.com>
Date: Tue, 18 May 2021 16:45:09 +0300
Subject: [PATCH] Change GetMyOrganizationsAsync to
 GetOrganizationsByUserIdAsync method

---
 .../Organizations/IOrganizationAppService.cs  |  2 +-
 .../Organizations/OrganizationAppService.cs   |  6 ++---
 src/EventHub.Web/Pages/Members/Profile.cshtml | 24 ++++++++++++++++---
 .../Pages/Members/Profile.cshtml.cs           |  3 +--
 .../Pages/Organizations/Profile.cshtml        | 10 +++++++-
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/EventHub.Application.Contracts/Organizations/IOrganizationAppService.cs b/src/EventHub.Application.Contracts/Organizations/IOrganizationAppService.cs
index 8e94ddb..0516a30 100644
--- a/src/EventHub.Application.Contracts/Organizations/IOrganizationAppService.cs
+++ b/src/EventHub.Application.Contracts/Organizations/IOrganizationAppService.cs
@@ -13,7 +13,7 @@ namespace EventHub.Organizations
 
         Task<OrganizationProfileDto> GetProfileAsync(string name);
 
-        Task<ListResultDto<OrganizationInListDto>> GetMyOrganizationsAsync();
+        Task<ListResultDto<OrganizationInListDto>> GetOrganizationsByUserIdAsync(Guid userId);
 
         Task<bool> IsOrganizationOwnerAsync(Guid organizationId);
 
diff --git a/src/EventHub.Application/Organizations/OrganizationAppService.cs b/src/EventHub.Application/Organizations/OrganizationAppService.cs
index afbb847..50aa906 100644
--- a/src/EventHub.Application/Organizations/OrganizationAppService.cs
+++ b/src/EventHub.Application/Organizations/OrganizationAppService.cs
@@ -109,11 +109,9 @@ namespace EventHub.Organizations
             return organizationProfileDto;
         }
 
-        [Authorize]
-        public async Task<ListResultDto<OrganizationInListDto>> GetMyOrganizationsAsync()
+        public async Task<ListResultDto<OrganizationInListDto>> GetOrganizationsByUserIdAsync(Guid userId)
         {
-            var currentUserId = CurrentUser.GetId();
-            var query = (await _organizationRepository.GetQueryableAsync()).Where(o => o.OwnerUserId == currentUserId);
+            var query = (await _organizationRepository.GetQueryableAsync()).Where(o => o.OwnerUserId == userId);
             var organizations = await AsyncExecuter.ToListAsync(query);
 
             var organizationDto = ObjectMapper.Map<List<Organization>, List<OrganizationInListDto>>(organizations);
diff --git a/src/EventHub.Web/Pages/Members/Profile.cshtml b/src/EventHub.Web/Pages/Members/Profile.cshtml
index cbea45e..d34f378 100644
--- a/src/EventHub.Web/Pages/Members/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Members/Profile.cshtml
@@ -1,11 +1,14 @@
 @page
 @using System.Globalization
+@using EventHub.Localization
 @using EventHub.Web.Pages.Events.Components.EventsArea
 @using EventHub.Web.Pages.Organizations.Components.OrganizationsArea
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Timing
 @using Volo.Abp.Users
 @inject ICurrentUser CurrentUser
 @inject IClock Clock
+@inject IHtmlLocalizer<EventHubResource> L
 @model EventHub.Web.Pages.Members.ProfileModel
 <div class="container pt-4">
     <div class="row py-4">
@@ -59,9 +62,24 @@
                             <div class="card">
                                 <div class="card-body" style="min-height: 496px">
                                     <div>
-                                        <h3 class="mb-4">Ownered Organizations</h3>
-                                        <partial name="~/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml" model="@Model.Organizations"/>
-                                    </div>
+                                        <div class="row mb-4">
+                                            <div class="col-8">
+                                                <h3>
+                                                    Ownered Organizations
+                                                </h3>
+                                            </div>
+                                            @if (CurrentUser.IsAuthenticated)
+                                            {
+                                                @if (CurrentUser.Id == Model.User.Id)
+                                                {
+                                                    <div class="col-4 text-right">
+                                                        <a abp-button="Primary" size="Small" href="@Url.Page("/Organizations/New")">@L["CreateAnOrganization"]</a>
+                                                    </div>       
+                                                }
+                                            }
+                                        </div>
+                                            <partial name="~/Pages/Organizations/Components/OrganizationsArea/_organizationListSection.cshtml" model="@Model.Organizations"/>
+                                        </div>
                                     <div>
                                         <h3 class="mb-4">Membership Organizations</h3>
                                         @await Component.InvokeAsync(typeof(OrganizationsAreaViewComponent), new
diff --git a/src/EventHub.Web/Pages/Members/Profile.cshtml.cs b/src/EventHub.Web/Pages/Members/Profile.cshtml.cs
index 5b5175f..16ce570 100644
--- a/src/EventHub.Web/Pages/Members/Profile.cshtml.cs
+++ b/src/EventHub.Web/Pages/Members/Profile.cshtml.cs
@@ -27,8 +27,6 @@ namespace EventHub.Web.Pages.Members
 
         public async Task<IActionResult> OnGetAsync(string userName)
         {
-            Organizations = (await _organizationAppService.GetMyOrganizationsAsync()).Items.ToList();
-
             if (userName.IsNullOrWhiteSpace())
             {
                 if (CurrentUser.IsAuthenticated)
@@ -42,6 +40,7 @@ namespace EventHub.Web.Pages.Members
             }
             
             User = await _memberAppService.FindByUserNameAsync(userName);
+            Organizations = (await _organizationAppService.GetOrganizationsByUserIdAsync(User.Id)).Items.ToList();
 
             if (User != null)
             {
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index 633e2e8..b17d781 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -1,6 +1,8 @@
 @page "/organizations/{name}"
 @inject IHtmlLocalizer<EventHubResource> L
 @using EventHub.Localization
+@using EventHub.Web.Helpers
+@using EventHub.Web.Pages.Events
 @using EventHub.Web.Pages.Events.Components.EventsArea
 @using EventHub.Web.Pages.Organizations.Components.JoinArea
 @using EventHub.Web.Pages.Organizations.Components.MembersArea
@@ -20,7 +22,13 @@
                 <div class="detail-image">
                     @if (Model.Organization.ProfilePictureContent == null)
                     {
-                        <img src="/assets/org-detail-top.png" alt="@Model.Organization.Name">
+                        <div class="rounded detail-span text-center" style="background: @(CoverImageHelper.GetRandomColor(Model.Organization.Name))">
+                            <span>
+                                @CoverImageHelper.GetContentOfImage(Model.Organization.DisplayName.TruncateWithPostfix(80))
+                                <br>
+                                <small>@CoverImageHelper.GetContentOfImage("EventHub")</small>
+                            </span>
+                        </div>
                     }
                     else
                     {