File tree Expand file tree Collapse file tree 1 file changed +9
-8
lines changed
OpenAPI/LearningHub.Nhs.OpenApi.Services/Services Expand file tree Collapse file tree 1 file changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,15 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
9494
9595 var resourcesFound = await this . resourceRepository . GetResourcesFromIds ( findwiseResourceIds ) ;
9696
97- List < ResourceMetadataViewModel > resourceMetadataViewModels = resourcesFound . Select ( resource => MapToViewModel ( resource , resourceActivities . Where ( x => x . ResourceId == resource . Id ) . ToList ( ) ) )
97+ if ( currentUserId . HasValue )
98+ {
99+ List < int > resourceIds = resourcesFound . Select ( x => x . Id ) . ToList ( ) ;
100+ List < int > userIds = new List < int > ( ) { currentUserId . Value } ;
101+
102+ resourceActivities = ( await this . resourceRepository . GetResourceActivityPerResourceMajorVersion ( resourceIds , userIds ) ) ? . ToList ( ) ?? new List < ResourceActivityDTO > ( ) { } ;
103+ }
104+
105+ List < ResourceMetadataViewModel > resourceMetadataViewModels = resourcesFound . Select ( resource => this . MapToViewModel ( resource , resourceActivities . Where ( x => x . ResourceId == resource . Id ) . ToList ( ) ) )
98106 . OrderBySequence ( findwiseResourceIds )
99107 . ToList ( ) ;
100108
@@ -109,13 +117,6 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
109117 unmatchedResourcesIdsString ) ;
110118 }
111119
112- if ( currentUserId . HasValue )
113- {
114- List < int > resourceIds = resourcesFound . Select ( x => x . Id ) . ToList ( ) ;
115- List < int > userIds = new List < int > ( ) { currentUserId . Value } ;
116-
117- resourceActivities = ( await this . resourceRepository . GetResourceActivityPerResourceMajorVersion ( resourceIds , userIds ) ) ? . ToList ( ) ?? new List < ResourceActivityDTO > ( ) { } ;
118- }
119120 return resourceMetadataViewModels ;
120121 }
121122
You can’t perform that action at this time.
0 commit comments