Clean up old match requesting user helpers

Author: CarsonF

src/components/authentication/authentication.repository.ts

@@ -224,7 +224,7 @@ export class AuthenticationRepository {
     const result = await this.db
       .query()
       .match([
-        node('requestingUser', 'User', { id: session.userId }),
+        requestingUser(session),
         relation('out', '', 'password', ACTIVE),
         node('password', 'Property'),
       ])

src/components/pin/pin.repository.ts

@@ -3,7 +3,7 @@ import { node, relation } from 'cypher-query-builder';
 import { DateTime } from 'luxon';
 import { ID, Session } from '../../common';
 import { DatabaseService } from '../../core';
-import { matchRequestingUser, requestingUser } from '../../core/database/query';
+import { requestingUser } from '../../core/database/query';
 
 @Injectable()
 export class PinRepository {
@@ -27,7 +27,7 @@ export class PinRepository {
     await this.db
       .query()
       .match(node('node', 'BaseNode', { id }))
-      .apply(matchRequestingUser(session))
+      .match(requestingUser(session))
       .merge([
         node('requestingUser'),
         relation('out', 'rel', 'pinned'),

src/core/database/query/matching.ts

@@ -21,11 +21,6 @@ export const requestingUser = (session: Session | ID) => {
   return n;
 };
 
-export const matchRequestingUser =
-  ({ userId }: Pick<Session, 'userId'>) =>
-  (query: Query) =>
-    query.match(requestingUser(userId));
-
 /**
  * Same as `{ active: true }` but it doesn't create a bound parameter
  */
@@ -127,30 +122,3 @@ export const property = (
     }),
   ],
 ];
-
-export const matchSession = (
-  session: Session,
-  {
-    // eslint-disable-next-line @seedcompany/no-unused-vars
-    withAclEdit,
-    // eslint-disable-next-line @seedcompany/no-unused-vars
-    withAclRead,
-    requestingUserConditions = {},
-  }: {
-    withAclEdit?: string;
-    withAclRead?: string;
-    requestingUserConditions?: Record<string, any>;
-  } = {},
-) => [
-  node('token', 'Token', {
-    active: true,
-    value: session.token,
-  }),
-  relation('in', '', 'token', {
-    active: true,
-  }),
-  node('requestingUser', 'User', {
-    id: session.userId,
-    ...requestingUserConditions,
-  }),
-];