Optimized GetByOrganization on project controller

Author: niemyjski

Source/Api/Controllers/ProjectController.cs

@@ -76,19 +76,13 @@ public async Task<IHttpActionResult> GetAsync(int page = 1, int limit = 10, stri
         [Route("~/" + API_PREFIX + "/organizations/{organization:objectid}/projects")]
         [ResponseType(typeof(List<ViewProject>))]
         public async Task<IHttpActionResult> GetByOrganizationAsync(string organization, int page = 1, int limit = 10, string mode = null) {
-            if (!String.IsNullOrEmpty(organization) && !CanAccessOrganization(organization))
+            if (String.IsNullOrEmpty(organization) || !CanAccessOrganization(organization))
                 return NotFound();
 
-            var organizationIds = new List<string>();
-            if (!String.IsNullOrEmpty(organization) && CanAccessOrganization(organization))
-                organizationIds.Add(organization);
-            else
-                organizationIds.AddRange(GetAssociatedOrganizationIds());
-
             page = GetPage(page);
             limit = GetLimit(limit);
             var options = new PagingOptions { Page = page, Limit = limit };
-            var projects = await _repository.GetByOrganizationIdsAsync(organizationIds, options);
+            var projects = await _repository.GetByOrganizationIdAsync(organization, options, true);
             var viewProjects = (await MapCollectionAsync<ViewProject>(projects.Documents, true)).ToList();
 
             if (!String.IsNullOrEmpty(mode) && String.Equals(mode, "stats", StringComparison.OrdinalIgnoreCase))

Source/Core/Repositories/Base/RepositoryOwnedByOrganization.cs

@@ -20,7 +20,7 @@ public RepositoryOwnedByOrganization(IIndexType<T> indexType, IValidator<T> vali
 
         public virtual Task<FindResults<T>> GetByOrganizationIdAsync(string organizationId, PagingOptions paging = null, bool useCache = false, TimeSpan? expiresIn = null) {
             if (String.IsNullOrEmpty(organizationId))
-                return Task.FromResult<FindResults<T>>(new FindResults<T>());
+                throw new ArgumentNullException(nameof(organizationId));
 
             string cacheKey = String.Concat("paged:Organization:", organizationId);
             return FindAsync(new ExceptionlessQuery()
@@ -32,7 +32,7 @@ public virtual Task<FindResults<T>> GetByOrganizationIdAsync(string organization
 
         public Task<long> RemoveAllByOrganizationIdAsync(string organizationId) {
             if (String.IsNullOrEmpty(organizationId))
-                return Task.FromResult<long>(0);
+                throw new ArgumentNullException(nameof(organizationId));
 
             return RemoveAllAsync(new ExceptionlessQuery().WithOrganizationId(organizationId));
         }

Source/Core/Repositories/ProjectRepository.cs

@@ -35,13 +35,12 @@ public Task<FindResults<Project>> GetByOrganizationIdsAsync(ICollection<string>
                 throw new ArgumentNullException(nameof(organizationIds));
 
             if (organizationIds.Count == 0)
-                return Task.FromResult<FindResults<Project>>(new FindResults<Project>());
+                return Task.FromResult(new FindResults<Project>());
 
-            string cacheKey = organizationIds.Count == 1 ?  String.Concat("paged:Organization:", organizationIds.Single()) : null;
-            return FindAsync(new ExceptionlessQuery()
-                .WithOrganizationIds(organizationIds)
-                .WithPaging(paging)
-                .WithCacheKey(cacheKey));
+            if (organizationIds.Count == 1)
+                return GetByOrganizationIdAsync(organizationIds.First(), paging, true);
+
+            return FindAsync(new ExceptionlessQuery().WithOrganizationIds(organizationIds).WithPaging(paging));
         }
 
         public Task<FindResults<Project>> GetByNextSummaryNotificationOffsetAsync(byte hourToSendNotificationsAfterUtcMidnight, int limit = 50) {