From 8ac23910a767a4775e9c31f97214eed4d361d10e Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Wed, 3 Feb 2021 16:22:25 +0300
Subject: [PATCH] Refactoring

---
 .../Pages/Organizations/Profile.cshtml        | 24 +++++++++----------
 .../OrganizationAppServiceTests.cs            |  6 ++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index fbe2ab9..5a001d4 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -34,12 +34,12 @@
                         <abp-card-text class="mt-3">
                             @Model.Organization.Description
 
-                            @if (!Model.Organization.Website.IsNullOrEmpty() || !Model.Organization.TwitterUsername.IsNullOrEmpty() ||
-                                 !Model.Organization.GitHubUsername.IsNullOrEmpty() || !Model.Organization.InstagramUsername.IsNullOrEmpty() ||
-                                 !Model.Organization.GitHubUsername.IsNullOrEmpty() || !Model.Organization.MediumUsername.IsNullOrEmpty())
+                            @if (!Model.Organization.Website.IsNullOrWhiteSpace() || !Model.Organization.TwitterUsername.IsNullOrWhiteSpace() ||
+                                 !Model.Organization.GitHubUsername.IsNullOrWhiteSpace() || !Model.Organization.InstagramUsername.IsNullOrWhiteSpace() ||
+                                 !Model.Organization.FacebookUsername.IsNullOrWhiteSpace() || !Model.Organization.MediumUsername.IsNullOrWhiteSpace())
                             {
                                 <hr/>
-                                @if (Model.Organization.Website != null)
+                                @if (!Model.Organization.Website.IsNullOrWhiteSpace())
                                 {
                                     <div class="mt-4 text-center">
                                         <small class="text-muted text-uppercase">@L["PersonalWebsite"]</small>
@@ -53,37 +53,37 @@
                                         </h5>
                                     </div>
                                 }
-                                @if (Model.Organization.TwitterUsername != null || Model.Organization.GitHubUsername != null || 
-                                     Model.Organization.InstagramUsername != null || Model.Organization.GitHubUsername != null || 
-                                     Model.Organization.MediumUsername != null)
+                                @if (!Model.Organization.TwitterUsername.IsNullOrWhiteSpace() || !Model.Organization.GitHubUsername.IsNullOrWhiteSpace() || 
+                                     !Model.Organization.InstagramUsername.IsNullOrWhiteSpace() || !Model.Organization.FacebookUsername.IsNullOrWhiteSpace() || 
+                                     !Model.Organization.MediumUsername.IsNullOrWhiteSpace())
                                 {
                                     <div class="profile-icons mt-4 text-center">
                                         <small class="text-muted text-uppercase">@L["SocialMedia"]</small><br/>
-                                        @if (Model.Organization.TwitterUsername != null)
+                                        @if (!Model.Organization.TwitterUsername.IsNullOrWhiteSpace())
                                         {
                                             <a href="https://twitter.com/@Model.Organization.TwitterUsername" class="text-twitter text-decoration-none" target="_blank" style="font-size: 1.5rem">
                                                 <i class="fab fa-twitter"></i>
                                             </a>
                                         }
-                                        @if (Model.Organization.GitHubUsername != null)
+                                        @if (!Model.Organization.GitHubUsername.IsNullOrWhiteSpace())
                                         {
                                             <a href="https://github.com/@Model.Organization.GitHubUsername" class="text-github text-decoration-none" target="_blank" style="font-size: 1.5rem">
                                                 <i class="fab fa-github"></i>
                                             </a>
                                         }
-                                        @if (Model.Organization.InstagramUsername != null)
+                                        @if (!Model.Organization.InstagramUsername.IsNullOrWhiteSpace())
                                         {
                                             <a href="https://www.instagram.com/@Model.Organization.InstagramUsername" class="text-instagram text-decoration-none" target="_blank" style="font-size: 1.5rem">
                                                 <i class="fab fa-instagram"></i>
                                             </a>
                                         }
-                                        @if (Model.Organization.FacebookUsername != null)
+                                        @if (!Model.Organization.FacebookUsername.IsNullOrWhiteSpace())
                                         {
                                             <a href="https://www.facebook.com/@Model.Organization.FacebookUsername" class="text-facebook text-decoration-none" target="_blank" style="font-size: 1.5rem">
                                                 <i class="fab fa-facebook"></i>
                                             </a>
                                         }
-                                        @if (Model.Organization.MediumUsername != null)
+                                        @if (!Model.Organization.MediumUsername.IsNullOrWhiteSpace())
                                         {
                                             <a href="https://medium.com/@Html.Raw("@")@Model.Organization.MediumUsername" class="text-medium text-decoration-none" target="_blank" style="font-size: 1.5rem">
                                                 <i class="fab fa-medium"></i>
diff --git a/test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs b/test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs
index 7b90118..607ded8 100644
--- a/test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs
+++ b/test/EventHub.Application.Tests/Organizations/OrganizationAppServiceTests.cs
@@ -6,7 +6,6 @@ using Shouldly;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Authorization;
-using Volo.Abp.MultiTenancy;
 using Volo.Abp.Users;
 using Xunit;
 
@@ -100,6 +99,11 @@ namespace EventHub.Organizations
                     Website = "https://volosoft.com/",
                     MediumUsername = "volosoft"
                 });
+
+            var organization = await GetOrganizationOrNullAsync(_testData.OrganizationVolosoftName);
+            organization.ShouldNotBeNull();
+            organization.DisplayName.ShouldBe("VOLOSOFT");
+            organization.Description.ShouldBe("Test description text that is valid and long enough for updating!");
         }
 
         [Fact]