Updated pinned to use currentUser & new shortcut

Author: CarsonF

src/components/language/language.repository.ts

@@ -38,6 +38,7 @@ import {
   merge,
   oncePerProject,
   paginate,
+  pinned,
   propSorter,
   rankSens,
   requestingUser,
@@ -225,7 +226,7 @@ export class LanguageRepository extends DtoRepository<
           merge('props', 'changedProps', {
             __typename: '"Language"',
             ethnologue: 'ethProps',
-            pinned: 'exists((:User { id: $requestingUser })-[:pinned]->(node))',
+            pinned,
             presetInventory: 'presetInventory',
             firstScriptureEngagement: 'firstScriptureEngagement { .id }',
             scope: 'scopedRoles',

src/components/partner/partner.repository.ts

@@ -27,6 +27,7 @@ import {
   merge,
   oncePerProject,
   paginate,
+  pinned,
   rankSens,
   requestingUser,
   sortWith,
@@ -291,7 +292,7 @@ export class PartnerRepository extends DtoRepository<
             languagesOfConsulting: 'languagesOfConsulting',
             departmentIdBlock: 'departmentIdBlock',
             scope: 'scopedRoles',
-            pinned: 'exists((:User { id: $requestingUser })-[:pinned]->(node))',
+            pinned,
           }).as('dto'),
         );
   }

src/components/project/project.repository.ts

@@ -26,6 +26,7 @@ import {
   merge,
   paginate,
   path,
+  pinned,
   requestingUser,
   type SortCol,
   sortWith,
@@ -134,7 +135,7 @@ export class ProjectRepository extends CommonRepository {
         .return<{ dto: UnsecuredDto<Project> }>(
           merge('props', 'changedProps', {
             type: 'node.type',
-            pinned: 'exists((:User { id: $requestingUser })-[:pinned]->(node))',
+            pinned,
             isMember: '"member:true" in props.scope',
             rootDirectory: 'rootDirectory { .id }',
             primaryPartnership: 'primaryPartnership { .id }',

src/components/user/user.repository.ts

@@ -25,6 +25,7 @@ import {
   multiPropsAsSortString,
   paginate,
   path,
+  pinned,
   property,
   requestingUser,
   type SortCol,
@@ -145,7 +146,7 @@ export class UserRepository extends DtoRepository<typeof User, [Session | ID]>(
           merge({ email: null }, 'props', {
             __typename: '"User"',
             roles: 'roles',
-            pinned: 'exists((requestingUser)-[:pinned]->(node))',
+            pinned,
           }).as('dto'),
         );
   }

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

@@ -46,6 +46,8 @@ export const count = fn1('count');
  */
 export const coalesce = fn('coalesce');
 
+export const exists = fn1('exists');
+
 /**
  * Merges maps together.
  * Note: If one expression is given, it is assumed to be a list.

src/core/database/query/filters.ts

@@ -25,7 +25,7 @@ import { variable } from '../query-augmentation/condition-variables';
 import { intersects } from './comparators';
 import { collect } from './cypher-functions';
 import { escapeLuceneSyntax, type FullTextIndex } from './full-text';
-import { ACTIVE } from './matching';
+import { ACTIVE, currentUser } from './matching';
 import { path as pathPattern } from './where-path';
 
 export type Builder<T, K extends keyof T = keyof T> = (
@@ -175,7 +175,7 @@ export const pathExistsWhenTrue: typeof pathExists = (pattern) => (args) =>
   args.value ? pathExists(pattern)(args) : null;
 
 export const isPinned = pathExists<{ pinned?: boolean }, 'pinned'>([
-  node('requestingUser'),
+  currentUser,
   relation('out', '', 'pinned'),
   node('node'),
 ]);

src/core/database/query/matching.ts

@@ -17,7 +17,7 @@ import {
   type Session,
 } from '~/common';
 import { variable } from '../query-augmentation/condition-variables';
-import { apoc, collect, listConcat, merge } from './cypher-functions';
+import { apoc, collect, exists, listConcat, merge } from './cypher-functions';
 
 const currentUserFlag = Symbol();
 const makeCurrentUser = (name: string) =>
@@ -146,3 +146,9 @@ export const property = (
     }),
   ],
 ];
+
+export const pinned = exists([
+  currentUser,
+  relation('out', '', 'pinned'),
+  node('node'),
+]);