Merge pull request #990 from HDRUK/preprod

GAT-2058: GAT Live Release - v4.0.1

.github/workflows/dev_deployment.yaml

@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - 'dev'
-    # paths:
-    #   - 'Chart.yaml'
+#    paths:
+#      - 'Chart.yaml'
 
 env:
   PROJECT_ID: '${{ secrets.PROJECT_ID }}' # TODO: update Google Cloud project id.
@@ -155,4 +155,4 @@ jobs:
           channel: ${{ env.SLACK_CHANNEL }}
           message: Deploying {{ env.GITHUB_REF_NAME }} branch
         if: always()
-      # If required, use the Cloud Run url output in later steps
+      # If required, use the Cloud Run url output in later steps

Chart.yaml

@@ -1 +1 @@
-v4.0.0
+v4.0.1

src/resources/search/search.repository.js

@@ -17,6 +17,7 @@ import moment from 'moment';
 import helperUtil from '../utilities/helper.util';
 
 export async function getObjectResult(type, searchAll, searchQuery, startIndex, maxResults, sort, authorID, form) {
+
 	let collection = Data;
 	if (type === 'course') {
 		collection = Course;
@@ -278,6 +279,33 @@ export async function getObjectResult(type, searchAll, searchQuery, startIndex,
 					as: 'relatedResourcesCourses',
 				},
 			},
+			{
+				$lookup: {
+					from: 'datauseregisters',
+					let: {
+						pid: '$pid',
+					},
+					pipeline: [
+						{ $unwind: '$relatedObjects' },
+						{
+							$match: {
+								$expr: {
+									$and: [
+										{
+											$eq: ['$relatedObjects.pid', '$$pid'],
+										},
+										{
+											$eq: ['$activeflag', 'active'],
+										},
+									],
+								},
+							},
+						},
+						{ $group: { _id: null, count: { $sum: 1 } } },
+					],
+					as: 'relatedResourcesDataUseRegister',
+				},
+			},
 			{
 				$project: {
 					_id: 0,
@@ -353,11 +381,19 @@ export async function getObjectResult(type, searchAll, searchQuery, startIndex,
 									else: { $first: '$relatedResourcesCourses.count' },
 								},
 							},
+							{
+								$cond: {
+									if: { $eq: [{ $size: '$relatedResourcesDataUseRegister' }, 0] },
+									then: 0,
+									else: { $first: '$relatedResourcesDataUseRegister.count' },
+								},
+							},
 						],
 					},
 				},
 			},
 		];
+
 	} else {
 		queryObject = [
 			{ $match: newSearchQuery },