Merge pull request #3042 from SeedCompany/agl/add-project-sorting

Author: CarsonF

src/components/project/dto/project.dto.ts

@@ -4,12 +4,14 @@ import { stripIndent } from 'common-tags';
 import { DateTime } from 'luxon';
 import { keys as keysOf } from 'ts-transformer-keys';
 import { MergeExclusive } from 'type-fest';
+import { sortingForEnumIndex } from '~/core/database/query';
 import { abstractType, e } from '~/core/edgedb';
 import { RegisterResource } from '~/core/resources';
 import {
   DateInterval,
   DateTimeField,
   DbLabel,
+  DbSort,
   DbUnique,
   ID,
   IntersectionType,
@@ -44,7 +46,7 @@ import { Postable } from '../../post/dto';
 import { ProjectChangeRequest } from '../../project-change-request/dto';
 import { ProjectMember } from '../project-member/dto';
 import { ProjectStatus } from './project-status.enum';
-import { SecuredProjectStep } from './project-step.enum';
+import { ProjectStep, SecuredProjectStep } from './project-step.enum';
 import { ProjectType } from './project-type.enum';
 
 type AnyProject = MergeExclusive<TranslationProject, InternshipProject>;
@@ -114,10 +116,12 @@ class Project extends Interfaces {
     middleware: [parentIdMiddleware],
   })
   @DbLabel('ProjectStep')
+  @DbSort(sortingForEnumIndex(ProjectStep))
   readonly step: SecuredProjectStep;
 
   @Field(() => ProjectStatus)
   @DbLabel('ProjectStatus')
+  @DbSort(sortingForEnumIndex(ProjectStatus))
   readonly status: ProjectStatus;
 
   readonly primaryLocation: Secured<ID | null>;

src/components/project/project.repository.ts

@@ -286,6 +286,14 @@ export class ProjectRepository extends CommonRepository {
             query
               .apply(matchProjectSens('node'))
               .return<{ sortValue: string }>('sensitivity as sortValue'),
+          engagements: (query) =>
+            query
+              .match([
+                node('node'),
+                relation('out', '', 'engagement'),
+                node('engagement', 'LanguageEngagement'),
+              ])
+              .return<{ sortValue: number }>('count(engagement) as sortValue'),
         }),
       )
       .apply(paginate(input, this.hydrate(session.userId)))

src/core/database/query/cypher-functions.ts

@@ -69,6 +69,7 @@ export const apoc = {
   },
   coll: {
     flatten: fn1('apoc.coll.flatten'),
+    indexOf: fn('apoc.coll.indexOf'),
   },
   convert: {
     /** Converts Neo4j node to object/map of the node's properties */

src/core/database/query/lists.ts

@@ -3,13 +3,14 @@ import { identity } from 'rxjs';
 import {
   getDbSortTransformer,
   ID,
+  MadeEnum,
   Order,
   PaginatedListType,
   PaginationInput,
   Resource,
   ResourceShape,
 } from '~/common';
-import { collect } from './cypher-functions';
+import { apoc, collect } from './cypher-functions';
 import { ACTIVE } from './matching';
 
 /**
@@ -97,7 +98,7 @@ export const sorting =
     return query.comment`sorting(${sort})`
       .subQuery('*', matcher)
       .with('*')
-      .orderBy(sortTransformer('sortValue'), order);
+      .orderBy(`${sortTransformer('sortValue')}`, order);
   };
 
 const matchPropSort = (prop: string) => (query: Query) =>
@@ -112,6 +113,14 @@ const matchPropSort = (prop: string) => (query: Query) =>
 const matchBasePropSort = (prop: string) => (query: Query) =>
   query.return(`node.${prop} as sortValue`);
 
+export const sortingForEnumIndex =
+  <T extends string>(theEnum: MadeEnum<T>) =>
+  (variable: string) =>
+    apoc.coll.indexOf(
+      [...theEnum.values].map((v) => `"${v}"`),
+      variable,
+    );
+
 export const whereNotDeletedInChangeset = (changeset?: ID) => (query: Query) =>
   changeset
     ? query.raw(