Change ProjectFilters.mine/isMember to mean _active_ membership

Author: CarsonF

src/components/project/dto/list-projects.dto.ts

@@ -1,6 +1,7 @@
 import { InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
+import { set } from 'lodash';
 import {
   DateFilter,
   DateTimeFilter,
@@ -14,6 +15,7 @@ import {
   type Sensitivity,
   SortablePaginationInput,
 } from '~/common';
+import { Transform } from '~/common/transform.decorator';
 import { LocationFilters } from '../../location/dto';
 import { PartnershipFilters } from '../../partnership/dto';
 import { ProjectMemberFilters } from '../project-member/dto';
@@ -88,21 +90,17 @@ export abstract class ProjectFilters {
   @ValidateNested()
   readonly mouEnd?: DateFilter;
 
-  @OptionalField({
-    description: 'only mine',
-    deprecationReason: 'Use `isMember` instead.',
-  })
-  readonly mine?: boolean;
-
-  @OptionalField({
-    description: 'Only projects that the requesting user is a member of',
-  })
-  readonly isMember?: boolean;
-
   @FilterField(() => ProjectMemberFilters, {
     description:
       "Only projects with the requesting user's membership that matches these filters",
   })
+  @Transform(({ value, obj }) => {
+    // Only ran when GQL specifies membership
+    if (value.active == null && (obj.mine || obj.isMember)) {
+      value.active = true;
+    }
+    return value;
+  })
   readonly membership?: ProjectMemberFilters & {};
 
   @FilterField(() => ProjectMemberFilters, {
@@ -138,6 +136,28 @@ export abstract class ProjectFilters {
   readonly primaryLocation?: LocationFilters & {};
 }
 
+Object.defineProperty(ProjectFilters.prototype, 'mine', {
+  set(value: boolean) {
+    // Ensure this is set when membership has not been declared
+    value && !this.membership && set(this, 'membership.active', true);
+  },
+});
+OptionalField(() => Boolean, {
+  description: 'only mine',
+  deprecationReason: 'Use `isMember` instead.',
+})(ProjectFilters.prototype, 'mine');
+
+Object.defineProperty(ProjectFilters.prototype, 'isMember', {
+  set(value: boolean) {
+    // Ensure this is set when membership has not been declared
+    value && !this.membership && set(this, 'membership.active', true);
+  },
+});
+OptionalField(() => Boolean, {
+  description:
+    'Only projects that the requesting user is an active member of. false does nothing.',
+})(ProjectFilters.prototype, 'isMember');
+
 @InputType()
 export class ProjectListInput extends SortablePaginationInput<keyof IProject>({
   defaultSort: 'name',

src/components/project/project-filters.query.ts

@@ -30,13 +30,6 @@ export const projectFilters = filter.define(() => ProjectFilters, {
   modifiedAt: filter.dateTimeProp(),
   mouStart: filter.dateTimeProp(),
   mouEnd: filter.dateTimeProp(),
-  mine: filter.pathExistsWhenTrue([
-    currentUser,
-    relation('in', '', 'user'),
-    node('', 'ProjectMember'),
-    relation('in', '', 'member', ACTIVE),
-    node('node'),
-  ]),
   languageId: filter.pathExists((id) => [
     node('node'),
     relation('out', '', 'engagement', ACTIVE),
@@ -51,13 +44,6 @@ export const projectFilters = filter.define(() => ProjectFilters, {
     relation('out', '', 'partner', ACTIVE),
     node('', 'Partner', { id }),
   ]),
-  isMember: filter.pathExistsWhenTrue([
-    currentUser,
-    relation('in', '', 'user'),
-    node('', 'ProjectMember'),
-    relation('in', '', 'member', ACTIVE),
-    node('node'),
-  ]),
   membership: filter.sub(() => projectMemberFilters)((sub) =>
     sub.match([
       currentUser,

src/components/project/project.gel.repository.ts

@@ -172,7 +172,8 @@ export class ProjectGelRepository
               e.op(project.modifiedAt, '<=', input.modifiedAt.beforeInclusive),
           ]
         : []),
-      input.isMember != null && e.op(project.isMember, '=', input.isMember),
+      input.membership != null && e.op('exists', project.membership),
+      input.membership?.active && e.op(project.membership.active, '?=', true),
       input.pinned != null && e.op(project.pinned, '=', input.pinned),
       input.languageId &&
         e.op(