Drop requestingUser / replace with currentUser

Author: CarsonF

src/components/authentication/authentication.repository.ts

@@ -5,8 +5,8 @@ import { type ID, ServerException, type Session } from '~/common';
 import { DatabaseService, DbTraceLayer, OnIndex } from '~/core/database';
 import {
   ACTIVE,
+  currentUser,
   matchUserGloballyScopedRoles,
-  requestingUser,
   variable,
 } from '~/core/database/query';
 import { type ScopedRole } from '../authorization/dto';
@@ -226,7 +226,7 @@ export class AuthenticationRepository {
     const result = await this.db
       .query()
       .match([
-        requestingUser(session),
+        currentUser,
         relation('out', '', 'password', ACTIVE),
         node('password', 'Property'),
       ])
@@ -243,7 +243,7 @@ export class AuthenticationRepository {
     await this.db
       .query()
       .match([
-        requestingUser(session),
+        currentUser,
         relation('out', '', 'password', ACTIVE),
         node('password', 'Property'),
       ])
@@ -331,7 +331,7 @@ export class AuthenticationRepository {
     await this.db
       .query()
       .match([
-        requestingUser(session),
+        currentUser,
         relation('out', 'oldRel', 'token', ACTIVE),
         node('token', 'Token'),
       ])

src/components/budget/budget.repository.ts

@@ -22,7 +22,6 @@ import {
   merge,
   oncePerProject,
   paginate,
-  requestingUser,
   sorting,
 } from '~/core/database/query';
 import { type FileId } from '../file/dto';
@@ -110,7 +109,6 @@ export class BudgetRepository extends DtoRepository<
         relation('in', '', 'budget', ACTIVE),
         node('project', 'Project', pickBy({ id: filter?.projectId })),
       ])
-      .match(requestingUser(session))
       .apply(
         this.privileges.forUser(session).filterToReadable({
           wrapContext: oncePerProject,

src/components/ceremony/ceremony.repository.ts

@@ -13,7 +13,6 @@ import {
   matchPropsAndProjectSensAndScopedRoles,
   oncePerProject,
   paginate,
-  requestingUser,
   sorting,
 } from '~/core/database/query';
 import {
@@ -84,7 +83,6 @@ export class CeremonyRepository extends DtoRepository<
             ]
           : []),
       ])
-      .match(requestingUser(session))
       .apply(
         this.privileges.forUser(session).filterToReadable({
           wrapContext: oncePerProject,

src/components/comments/comment-thread.repository.ts

@@ -8,7 +8,6 @@ import {
   createRelationships,
   merge,
   paginate,
-  requestingUser,
   sorting,
 } from '~/core/database/query';
 import { CommentRepository } from './comment.repository';
@@ -83,7 +82,6 @@ export class CommentThreadRepository extends DtoRepository(CommentThread) {
   ) {
     const result = await this.db
       .query()
-      .match(requestingUser(session))
       .match([
         node('node', 'CommentThread'),
         ...(parent

src/components/comments/comment.repository.ts

@@ -11,7 +11,6 @@ import {
   matchProps,
   merge,
   paginate,
-  requestingUser,
   sorting,
   variable,
 } from '~/core/database/query';
@@ -92,7 +91,6 @@ export class CommentRepository extends DtoRepository(Comment) {
   async list(threadId: ID, input: CommentListInput, session: Session) {
     const result = await this.db
       .query()
-      .match(requestingUser(session))
       .match([
         node('thread', 'CommentThread', { id: threadId }),
         relation('out', '', 'comment', ACTIVE),

src/components/engagement/engagement.repository.ts

@@ -46,7 +46,6 @@ import {
   multiPropsAsSortString,
   oncePerProject,
   paginate,
-  requestingUser,
   type SortCol,
   sortWith,
   textJoinMaybe,
@@ -547,7 +546,7 @@ export class EngagementRepository extends CommonRepository {
               : q,
           ),
       )
-      .match(requestingUser(session))
+      .with('*') // needed between call & where
       .apply(engagementFilters(input.filter))
       .apply(
         this.privileges.for(session, IEngagement).filterToReadable({
@@ -857,10 +856,7 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
     separateQueryForEachWord: true,
     minScore: 0.9,
   }),
-  project: filter.sub(
-    () => projectFilters,
-    'requestingUser',
-  )((sub) =>
+  project: filter.sub(() => projectFilters)((sub) =>
     sub.match([
       node('outer'),
       relation('in', '', 'engagement'),

src/components/field-region/field-region.repository.ts

@@ -18,7 +18,6 @@ import {
   matchProps,
   merge,
   paginate,
-  requestingUser,
   sorting,
 } from '~/core/database/query';
 import {
@@ -111,7 +110,6 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
     }
     const result = await this.db
       .query()
-      .match(requestingUser(session))
       .match(node('node', 'FieldRegion'))
       .apply(sorting(FieldRegion, input))
       .apply(paginate(input, this.hydrate()))

src/components/field-zone/field-zone.repository.ts

@@ -19,7 +19,6 @@ import {
   matchProps,
   merge,
   paginate,
-  requestingUser,
   sorting,
 } from '~/core/database/query';
 import {
@@ -129,7 +128,6 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
     }
     const result = await this.db
       .query()
-      .match(requestingUser(session))
       .match(node('node', 'FieldZone'))
       .apply(sorting(FieldZone, input))
       .apply(paginate(input, this.hydrate()))

src/components/funding-account/funding-account.repository.ts

@@ -9,7 +9,6 @@ import {
   matchProps,
   merge,
   paginate,
-  requestingUser,
   sorting,
   variable,
 } from '~/core/database/query';
@@ -96,7 +95,6 @@ export class FundingAccountRepository extends DtoRepository(FundingAccount) {
   async list(input: FundingAccountListInput, session: Session) {
     const result = await this.db
       .query()
-      .match(requestingUser(session))
       .match(node('node', 'FundingAccount'))
       .apply(sorting(FundingAccount, input))
       .apply(paginate(input, this.hydrate()))

src/components/language/language.repository.ts

@@ -41,7 +41,6 @@ import {
   pinned,
   propSorter,
   rankSens,
-  requestingUser,
   sortWith,
   variable,
 } from '~/core/database/query';
@@ -246,8 +245,6 @@ export class LanguageRepository extends DtoRepository<
         relation('out', '', 'language'),
         node('node'),
       ])
-      // match requesting user once (instead of once per row)
-      .match(requestingUser(session))
       .apply(languageFilters(input.filter))
       .apply(
         this.privileges.forUser(session).filterToReadable({