Merge pull request #3304 from SeedCompany/drop-deprecations

Drop deprecated ceremony / project member GQL queries

Author: CarsonF

src/components/ceremony/ceremony.resolver.ts

@@ -1,51 +1,12 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import {
-  AnonSession,
-  ID,
-  IdArg,
-  ListArg,
-  LoggedInSession,
-  Session,
-} from '~/common';
-import { Loader, LoaderOf } from '~/core';
-import { CeremonyLoader, CeremonyService } from '../ceremony';
-import {
-  Ceremony,
-  CeremonyListInput,
-  CeremonyListOutput,
-  UpdateCeremonyInput,
-  UpdateCeremonyOutput,
-} from './dto';
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { LoggedInSession, Session } from '~/common';
+import { CeremonyService } from '../ceremony';
+import { UpdateCeremonyInput, UpdateCeremonyOutput } from './dto';
 
 @Resolver()
 export class CeremonyResolver {
   constructor(private readonly service: CeremonyService) {}
 
-  @Query(() => Ceremony, {
-    description: 'Look up a ceremony by its ID',
-    deprecationReason: 'Query via engagement instead',
-  })
-  async ceremony(
-    @IdArg() id: ID,
-    @Loader(CeremonyLoader) ceremonies: LoaderOf<CeremonyLoader>,
-  ): Promise<Ceremony> {
-    return await ceremonies.load(id);
-  }
-
-  @Query(() => CeremonyListOutput, {
-    description: 'Look up ceremonies',
-    deprecationReason: 'Query via engagement instead',
-  })
-  async ceremonies(
-    @AnonSession() session: Session,
-    @ListArg(CeremonyListInput) input: CeremonyListInput,
-    @Loader(CeremonyLoader) ceremonies: LoaderOf<CeremonyLoader>,
-  ): Promise<CeremonyListOutput> {
-    const list = await this.service.list(input, session);
-    ceremonies.primeAll(list.items);
-    return list;
-  }
-
   @Mutation(() => UpdateCeremonyOutput, {
     description: 'Update a ceremony',
   })
@@ -56,10 +17,4 @@ export class CeremonyResolver {
     const ceremony = await this.service.update(input, session);
     return { ceremony };
   }
-
-  // Ceremonies are created automatically via engagements
-  // async createCeremony() {}
-
-  // Ceremonies are deleted automatically via engagements
-  // async deleteCeremony() {}
 }

src/components/ceremony/ceremony.service.ts

@@ -10,13 +10,7 @@ import {
 import { HandleIdLookup, ILogger, Logger } from '~/core';
 import { Privileges } from '../authorization';
 import { CeremonyRepository } from './ceremony.repository';
-import {
-  Ceremony,
-  CeremonyListInput,
-  CeremonyListOutput,
-  CreateCeremony,
-  UpdateCeremony,
-} from './dto';
+import { Ceremony, CreateCeremony, UpdateCeremony } from './dto';
 
 @Injectable()
 export class CeremonyService {
@@ -85,15 +79,4 @@ export class CeremonyService {
       throw new ServerException('Failed to delete Ceremony');
     }
   }
-
-  async list(
-    input: CeremonyListInput,
-    session: Session,
-  ): Promise<CeremonyListOutput> {
-    const results = await this.repo.list(input, session);
-    return {
-      ...results,
-      items: results.items.map((dto) => this.secure(dto, session)),
-    };
-  }
 }

src/components/ceremony/dto/list-ceremony.dto.ts

@@ -1,5 +1,5 @@
-import { Field, InputType, ObjectType } from '@nestjs/graphql';
-import { FilterField, PaginatedList, SortablePaginationInput } from '~/common';
+import { Field, InputType } from '@nestjs/graphql';
+import { FilterField, SortablePaginationInput } from '~/common';
 import { CeremonyType } from './ceremony-type.enum';
 import { Ceremony } from './ceremony.dto';
 
@@ -21,6 +21,3 @@ export class CeremonyListInput extends SortablePaginationInput<
   @FilterField(() => CeremonyFilters)
   readonly filter?: CeremonyFilters;
 }
-
-@ObjectType()
-export class CeremonyListOutput extends PaginatedList(Ceremony) {}

src/components/project/project-member/project-member.resolver.ts

@@ -1,21 +1,10 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import {
-  AnonSession,
-  ID,
-  IdArg,
-  ListArg,
-  LoggedInSession,
-  Session,
-} from '~/common';
-import { Loader, LoaderOf } from '~/core';
-import { ProjectMemberLoader, ProjectMemberService } from '../project-member';
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { ID, IdArg, LoggedInSession, Session } from '~/common';
+import { ProjectMemberService } from '../project-member';
 import {
   CreateProjectMemberInput,
   CreateProjectMemberOutput,
   DeleteProjectMemberOutput,
-  ProjectMember,
-  ProjectMemberListInput,
-  ProjectMemberListOutput,
   UpdateProjectMemberInput,
   UpdateProjectMemberOutput,
 } from './dto';
@@ -35,31 +24,6 @@ export class ProjectMemberResolver {
     return { projectMember };
   }
 
-  @Query(() => ProjectMember, {
-    description: 'Look up a project member by ID',
-    deprecationReason: 'Query via project instead',
-  })
-  async projectMember(
-    @Loader(ProjectMemberLoader) projectMembers: LoaderOf<ProjectMemberLoader>,
-    @IdArg() id: ID,
-  ): Promise<ProjectMember> {
-    return await projectMembers.load(id);
-  }
-
-  @Query(() => ProjectMemberListOutput, {
-    description: 'Look up project members',
-    deprecationReason: 'Query via project instead',
-  })
-  async projectMembers(
-    @AnonSession() session: Session,
-    @ListArg(ProjectMemberListInput) input: ProjectMemberListInput,
-    @Loader(ProjectMemberLoader) projectMembers: LoaderOf<ProjectMemberLoader>,
-  ): Promise<ProjectMemberListOutput> {
-    const list = await this.service.list(input, session);
-    projectMembers.primeAll(list.items);
-    return list;
-  }
-
   @Mutation(() => UpdateProjectMemberOutput, {
     description: 'Update a project member',
   })

test/engagement.e2e-spec.ts

@@ -569,12 +569,20 @@ describe('Engagement e2e', () => {
 
     await registerUser(app, { roles: [Role.FieldOperationsDirector] });
     const date = '2020-05-13';
-    await app.graphql.mutate(
+    const result = await app.graphql.mutate(
       gql`
         mutation updateCeremony($input: UpdateCeremonyInput!) {
           updateCeremony(input: $input) {
             ceremony {
               id
+              planned {
+                value
+              }
+              estimatedDate {
+                value
+                canRead
+                canEdit
+              }
             }
           }
         }
@@ -589,28 +597,8 @@ describe('Engagement e2e', () => {
         },
       },
     );
-    const result = await app.graphql.query(
-      gql`
-        query ceremony($id: ID!) {
-          ceremony(id: $id) {
-            id
-            planned {
-              value
-            }
-            estimatedDate {
-              value
-              canRead
-              canEdit
-            }
-          }
-        }
-      `,
-      {
-        id: languageEngagementRead?.engagement?.ceremony?.value?.id,
-      },
-    );
-    expect(result.ceremony.planned.value).toBeTruthy();
-    expect(result.ceremony.estimatedDate.value).toBe(date);
+    expect(result.updateCeremony.ceremony.planned.value).toBeTruthy();
+    expect(result.updateCeremony.ceremony.estimatedDate.value).toBe(date);
 
     await user.login();
   });
@@ -645,12 +633,20 @@ describe('Engagement e2e', () => {
 
     await registerUser(app, { roles: [Role.FieldOperationsDirector] });
     const date = '2020-05-13';
-    await app.graphql.mutate(
+    const result = await app.graphql.mutate(
       gql`
         mutation updateCeremony($input: UpdateCeremonyInput!) {
           updateCeremony(input: $input) {
             ceremony {
               id
+              planned {
+                value
+              }
+              estimatedDate {
+                value
+                canRead
+                canEdit
+              }
             }
           }
         }
@@ -665,28 +661,8 @@ describe('Engagement e2e', () => {
         },
       },
     );
-    const result = await app.graphql.query(
-      gql`
-        query ceremony($id: ID!) {
-          ceremony(id: $id) {
-            id
-            planned {
-              value
-            }
-            estimatedDate {
-              value
-              canRead
-              canEdit
-            }
-          }
-        }
-      `,
-      {
-        id: internshipEngagementRead?.engagement?.ceremony?.value?.id,
-      },
-    );
-    expect(result.ceremony.planned.value).toBeTruthy();
-    expect(result.ceremony.estimatedDate.value).toBe(date);
+    expect(result.updateCeremony.ceremony.planned.value).toBeTruthy();
+    expect(result.updateCeremony.ceremony.estimatedDate.value).toBe(date);
 
     await user.login();
   });

test/project-member.e2e-spec.ts

@@ -1,6 +1,5 @@
-import { times } from 'lodash';
 import { DateTime, Interval } from 'luxon';
-import { isValidId, Role } from '~/common';
+import { Role } from '~/common';
 import { Project } from '../src/components/project/dto';
 import { ProjectMember } from '../src/components/project/project-member/dto';
 import {
@@ -71,72 +70,6 @@ describe('ProjectMember e2e', () => {
     );
   });
 
-  it('read one projectMember by id', async () => {
-    const member = await createPerson(app);
-    const projectMember = await createProjectMember(app, {
-      userId: member.id,
-      projectId: project.id,
-    });
-    const result = await app.graphql.query(
-      gql`
-        query projectMember($id: ID!) {
-          projectMember(id: $id) {
-            ...projectMember
-          }
-        }
-        ${fragments.projectMember}
-      `,
-      {
-        id: projectMember.id,
-      },
-    );
-
-    const actual: ProjectMember = result.projectMember;
-    expect(actual.id).toBe(projectMember.id);
-    expect(isValidId(actual.id)).toBe(true);
-    expect(actual.user.value?.id).toBe(member.id);
-  });
-
-  it.skip('list view of ProjectMember', async () => {
-    const numProjectMembers = 2;
-    const userForList = await createPerson(app);
-    const userId = userForList.id;
-    const projectIds = await Promise.all(
-      times(numProjectMembers).map(async () => {
-        await createPerson(app);
-        const project = await createProject(app);
-        return project.id;
-      }),
-    );
-
-    await Promise.all(
-      times(numProjectMembers, async (index) => {
-        await createProjectMember(app, {
-          userId: userId,
-          projectId: projectIds[index],
-          roles: [Role.Consultant],
-        });
-      }),
-    );
-
-    const { projectMembers } = await app.graphql.query(
-      gql`
-        query {
-          projectMembers(input: { filter: { roles: [Consultant] } }) {
-            items {
-              id
-            }
-            hasMore
-            total
-          }
-        }
-      `,
-    );
-    expect(projectMembers.items.length).toBeGreaterThanOrEqual(
-      numProjectMembers,
-    );
-  });
-
   it.skip('delete projectMember', async () => {
     const member = await createPerson(app);
     const projectMember = await createProjectMember(app, {