End points major version

Author: Phil-NHS

OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs

@@ -32,6 +32,7 @@ public ResourceMetadataViewModel(
             string description,
             List<ResourceReferenceViewModel> references,
             string resourceType,
+            int? majorVersion,
             decimal rating,
             List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
         {
@@ -40,6 +41,7 @@ public ResourceMetadataViewModel(
             this.Description = description;
             this.References = references;
             this.ResourceType = resourceType;
+            this.MajorVersion = majorVersion;
             this.Rating = rating;
             this.UserSummaryActivityStatuses = userSummaryActivityStatuses;
         }
@@ -69,6 +71,11 @@ public ResourceMetadataViewModel(
         /// </summary>
         public string ResourceType { get; set; }
 
+        /// <summary>
+        /// Gets or sets <see cref="MajorVersion"/>.
+        /// </summary>
+        public int? MajorVersion { get; set; }
+
 
         /// <summary>
         /// Gets or sets <see cref="Rating"/>.

OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs

@@ -1,3 +1,6 @@
+using LearningHub.Nhs.Models.Entities.Activity;
+using System.Collections.Generic;
+
 namespace LearningHub.Nhs.OpenApi.Models.ViewModels
 {
     /// <summary>
@@ -16,24 +19,28 @@ public class ResourceReferenceWithResourceDetailsViewModel
         /// <param name="resourceType"><see cref="ResourceType"/>.</param>
         /// <param name="rating"><see cref="Rating"/>.</param>
         /// <param name="link"><see cref="Link"/>.</param>
-        public ResourceReferenceWithResourceDetailsViewModel(
+        public ResourceReferenceWithResourceDetailsViewModel( // qqqq may need major version id adding
             int resourceId,
             int refId,
             string title,
             string description,
             CatalogueViewModel catalogueViewModel,
             string resourceType,
+            int? majorVersion,
             decimal rating,
-            string link)
+            string link,
+            List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
         {
             this.ResourceId = resourceId;
             this.RefId = refId;
             this.Title = title;
             this.Description = description;
             this.Catalogue = catalogueViewModel;
+            this.MajorVersion = majorVersion;
             this.ResourceType = resourceType;
             this.Rating = rating;
             this.Link = link;
+            this.UserSummaryActivityStatuses = userSummaryActivityStatuses;
         }
 
         /// <summary>
@@ -66,14 +73,27 @@ public ResourceReferenceWithResourceDetailsViewModel(
         /// </summary>
         public string ResourceType { get; }
 
+
+        /// <summary>
+        /// Gets <see cref="MajorVersion"/>.
+        /// </summary>
+        public int? MajorVersion { get; }
+
         /// <summary>
         /// Gets <see cref="Rating"/>.
         /// </summary>
+        /// 
+
         public decimal Rating { get; }
 
         /// <summary>
         /// Gets <see cref="Link"/>.
         /// </summary>
         public string Link { get; }
+
+        /// <summary>
+        /// Gets <see cref="UserSummaryActivityStatuses"/>.
+        /// </summary>
+        public List<MajorVersionIdActivityStatusDescription>? UserSummaryActivityStatuses { get; }
     }
 }

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/ResourceVersionMap.cs

@@ -39,6 +39,9 @@ protected override void InternalMap(EntityTypeBuilder<ResourceVersion> modelBuil
                     .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ResourceVersion_Resource");
 
+            modelBuilder.Property(e => e.ResourceAccessibilityEnum).HasColumnName("ResourceAccessibilityId")
+            .HasConversion<int>();
+
             modelBuilder.Property(e => e.VersionStatusEnum).HasColumnName("VersionStatusId")
                .HasConversion<int>();
 

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs

@@ -8,6 +8,7 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
+    using LearningHub.Nhs.Models.ViewModels.Helpers;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
@@ -76,7 +77,7 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
                     resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
                 }
 
-                return this.GetResourceReferenceWithResourceDetailsViewModel(resourceReference);
+                return this.GetResourceReferenceWithResourceDetailsViewModel(resourceReference, resourceActivities);
             }
             catch (InvalidOperationException exception)
             {
@@ -92,6 +93,9 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
         /// <returns>the resource.</returns>
         public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds, int? currentUserId)
         {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
+            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
+
             var resourceReferences = await this.resourceRepository.GetResourceReferencesByOriginalResourceReferenceIds(originalResourceReferenceIds);
             var resourceReferencesList = resourceReferences.ToList();
             var matchedIds = resourceReferencesList.Select(r => r.OriginalResourceReferenceId).ToList();
@@ -107,18 +111,33 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
                 this.logger.LogWarning($"Multiple resource references found with OriginalResourceReferenceId {duplicateIds.First()}");
             }
 
-            var matchedResources = resourceReferencesList
-                .Select(this.GetResourceReferenceWithResourceDetailsViewModel)
-                .ToList();
+            if (currentUserId.HasValue)
+            {
+                List<int> resourceIds = resourceReferencesList.Select(rrl => rrl.ResourceId).ToList();
+                List<int> userIds = new List<int>() { currentUserId.Value };
+
+                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            }
+
+            List<ResourceReferenceWithResourceDetailsViewModel> matchedResources = resourceReferencesList
+            .Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities.Where(ra => ra.ResourceId == rr.ResourceId).ToList()))
+            .ToList<ResourceReferenceWithResourceDetailsViewModel>();
 
             return new BulkResourceReferenceViewModel(matchedResources, unmatchedIds);
         }
 
-        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference)
+        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
         {
             var hasCurrentResourceVersion = resourceReference.Resource.CurrentResourceVersion != null;
             var hasRating = resourceReference.Resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;
 
+            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
+
+            if (resourceActivities != null && resourceActivities.Count != 0)
+            {
+                majorVersionIdActivityStatusDescription = ActivityStatusHelper.GetMajorVersionIdActivityStatusDescriptionLSPerResource(resourceReference.Resource, resourceActivities).ToList();
+            }
+
             if (resourceReference.Resource == null)
             {
                 throw new Exception("No matching resource");
@@ -147,8 +166,10 @@ private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithRe
                 resourceReference.Resource.CurrentResourceVersion?.Description ?? string.Empty,
                 resourceReference.GetCatalogue(),
                 resourceTypeNameOrEmpty,
+                resourceReference.Resource?.CurrentResourceVersion?.MajorVersion ?? 0,
                 resourceReference.Resource?.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0,
-                this.learningHubService.GetResourceLaunchUrl(resourceReference.OriginalResourceReferenceId));
+                this.learningHubService.GetResourceLaunchUrl(resourceReference.OriginalResourceReferenceId),
+                majorVersionIdActivityStatusDescription);
         }
     }
 }

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs

@@ -82,6 +82,7 @@ public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query,
         private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModels(
             FindwiseResultModel findwiseResultModel, int? currentUserId)
         {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
             var documentsFound = findwiseResultModel.SearchResults?.DocumentList.Documents?.ToList() ??
                                  new List<Document>();
             var findwiseResourceIds = documentsFound.Select(d => int.Parse(d.Id)).ToList();
@@ -93,7 +94,7 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
 
             var resourcesFound = await this.resourceRepository.GetResourcesFromIds(findwiseResourceIds);
 
-            var resourceMetadataViewModels = resourcesFound.Select(this.MapToViewModel)
+            List<ResourceMetadataViewModel> resourceMetadataViewModels = resourcesFound.Select(resource => MapToViewModel(resource, resourceActivities.Where(x => x.ResourceId == resource.Id).ToList()))
                 .OrderBySequence(findwiseResourceIds)
                 .ToList();
 
@@ -108,6 +109,13 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
                     unmatchedResourcesIdsString);
             }
 
+            if (currentUserId.HasValue)
+            {
+                List<int> resourceIds = resourcesFound.Select(x => x.Id).ToList();
+                List<int> userIds = new List<int>() { currentUserId.Value };
+
+                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            }
             return resourceMetadataViewModels;
         }
 
@@ -149,6 +157,7 @@ private ResourceMetadataViewModel MapToViewModel(Resource resource, List<Resourc
                 resource.CurrentResourceVersion?.Description ?? string.Empty,
                 resource.ResourceReference.Select(this.GetResourceReferenceViewModel).ToList(),
                 resourceTypeNameOrEmpty,
+                resource.CurrentResourceVersion?.MajorVersion ?? 0,
                 resource.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0.0m,
                 majorVersionIdActivityStatusDescription
                 );