Merge pull request #1881 from CSCfi/CSCTTV-4092

fix persons sorts and add default sort by updated timestamp
CSCfi · Nov 26, 2024 · c98e732 · c98e732
2 parents 018ee75 + 486e6d9
commit c98e732
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 20 deletions.
diff --git a/src/app/portal/models/person/person.model.ts b/src/app/portal/models/person/person.model.ts
@@ -44,7 +44,8 @@ export class Person {
     public keywords: string,
     public collaboration: string[],
     public uniqueDataSources: any,
-    public orcidLink?: string
+    public orcidLink?: string,
+    public updated?: string
   ) {}
 }
 
@@ -147,11 +148,11 @@ export class PersonAdapter implements Adapter<Person> {
     const fieldsOfScience = 'Placeholder';
 
     const keywords = data.personal.keywords
-      .map((keyword) => keyword.value)
+      .map((keyword) => keyword.value).sort()
       .join(', ');
 
     const uniqueDataSources = data.uniqueDataSources
-      ?.map((item) => this.utils.checkTranslation('name', item.organization))
+      ?.map((item) => this.utils.checkTranslation('name', item.organization)).sort()
       .join(', ');
 
     return new Person(
@@ -172,7 +173,8 @@ export class PersonAdapter implements Adapter<Person> {
       fieldsOfScience,
       keywords,
       collaboration,
-      uniqueDataSources
+      uniqueDataSources,
+      data.updated
     );
   }
 }
diff --git a/src/app/portal/services/filters/aggregation.service.ts b/src/app/portal/services/filters/aggregation.service.ts
@@ -664,6 +664,8 @@ export class AggregationService {
           },
         };
         break;
+
+      // Researchers
       case 'persons':
         payLoad.aggs.organization = {
           nested: {

diff --git a/src/app/portal/services/filters/filter.service.ts b/src/app/portal/services/filters/filter.service.ts
@@ -1062,16 +1062,8 @@ export class FilterService {
       // If publications are searched without a search term then set sort as publicationYear
       if (tab === 'publications') {
         sortOrder.push({publicationYear: {order:'desc'}});
-      } else {
-        sortOrder.push('_score');
       }
-    } else {
-      if (tab === 'publications') {
         sortOrder.push('_score');
-        sortOrder.push({publicationYear: {order:'desc'}});
-      } else {
-        sortOrder.push('_score');
-      }
     }
 
     const queryPayload = searchTerm.length > 0 ? query : randomQuery;

diff --git a/src/app/portal/services/sort.service.ts b/src/app/portal/services/sort.service.ts
@@ -144,16 +144,78 @@ export class SortService {
         break;
       }
       case 'persons': {
-        this.sort = [
-          {
-            'personal.names.lastName.keyword': {
-              order: this.sortDirection ? 'desc' : 'asc',
-              unmapped_type: 'long',
-            },
-          },
-        ];
+        switch (this.sortColumn) {
+          case 'name': {
+            this.sort = [
+              {
+                'personal.names.lastName.keyword': {
+                  order: this.sortDirection ? 'desc' : 'asc',
+                  mode: "min",
+                  unmapped_type : "long",
+                },
+              },
+            ];
+            break;
+          }
+          case 'organization': {
+            const organizationSortString = 'activity.affiliations.organizationName' +
+              this.localeC +
+              '.keyword';
+            this.sort = [
+              {
+                [organizationSortString]: {
+                  order: this.sortDirection ? 'desc' : 'asc',
+                  mode: "min",
+                  nested: this.generateNested('activity.affiliations'),
+                  unmapped_type : "long",
+                },
+              },
+            ];
+            break;
+          }
+          case 'positionName': {
+            const organizationSortString = 'activity.affiliations.positionName' +
+              this.localeC +
+              '.keyword';
+            this.sort = [
+              {
+                [organizationSortString]: {
+                  order: this.sortDirection ? 'desc' : 'asc',
+                  mode: "min",
+                  nested: this.generateNested('activity.affiliations'),
+                  unmapped_type : "long",
+                },
+              },
+            ];
+            break;
+          }
+          case 'keywords': {
+            this.sort = [
+              {
+                'personal.keywords.value.keyword': {
+                  order: this.sortDirection ? 'desc' : 'asc',
+                  mode: "min",
+                  unmapped_type : "long",
+                },
+              },
+            ];
+            break;
+          }
+          default: {
+            this.sort = [
+              {
+                'updated': {
+                  order: 'desc',
+                  unmapped_type : "long",
+                },
+              }
+            ];
+            break;
+          }
+        }
         break;
       }
+
       case 'fundings': {
         this.yearField = 'fundingStartYear';
         switch (this.sortColumn) {