Merge remote-tracking branch 'origin/develop'

Author: bryanjnelson

src/common/exceptions/duplicate.exception.ts

@@ -1,3 +1,10 @@
+import { ArgumentsHost } from '@nestjs/common';
+import {
+  GqlContextType as ContextKey,
+  GqlExecutionContext,
+} from '@nestjs/graphql';
+import { lowerCase, upperFirst } from 'lodash';
+import type { ExclusivityViolationError } from '~/core/edgedb';
 import { InputException } from './input.exception';
 
 /**
@@ -11,4 +18,47 @@ export class DuplicateException extends InputException {
       previous,
     );
   }
+
+  static fromDB(exception: ExclusivityViolationError, context?: ArgumentsHost) {
+    let property = exception.property;
+    const message = `${upperFirst(
+      lowerCase(property),
+    )} already exists and needs to be unique`;
+
+    // Attempt to add path prefix automatically to the property name, based
+    // on given GQL input.
+    if (context && context.getType<ContextKey>() === 'graphql') {
+      let gqlArgs = GqlExecutionContext.create(context as any).getArgs();
+
+      // unwind single `input` argument, based on our own conventions
+      if (Object.keys(gqlArgs).length === 1 && 'input' in gqlArgs) {
+        gqlArgs = gqlArgs.input;
+      }
+
+      const flattened = flattenObject(gqlArgs);
+      // Guess the correct path based on property name.
+      // This kinda assumes the property name will be unique amongst all the input.
+      const guessedPath = Object.keys(flattened).find(
+        (path) => property === path || path.endsWith('.' + property),
+      );
+      property = guessedPath ?? property;
+    }
+
+    const ex = new DuplicateException(property, message, exception);
+    ex.stack = exception.stack;
+    return ex;
+  }
 }
+
+const flattenObject = (obj: object, prefix = '') => {
+  const result: Record<string, any> = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+      const nestedObj = flattenObject(value, prefix + key + '.');
+      Object.assign(result, nestedObj);
+    } else {
+      result[prefix + key] = value;
+    }
+  }
+  return result;
+};

src/common/exceptions/exception.ts

@@ -29,8 +29,10 @@ export const hasPrevious = (e: Error): e is Error & { previous: Error } =>
 export function getPreviousList(ex: Error, includeSelf: boolean) {
   const previous: Error[] = includeSelf ? [ex] : [];
   let current = ex;
-  while (hasPrevious(current)) {
-    current = current.previous;
+  while (current.cause instanceof Error || hasPrevious(current)) {
+    current = hasPrevious(current)
+      ? current.previous
+      : (current.cause as Error);
     previous.push(current);
   }
   return previous;

src/components/authentication/authentication.edgedb.repository.ts

@@ -108,6 +108,9 @@ export class AuthenticationEdgeDBRepository
       ),
     }));
     const result = await this.db.run(query);
+    if (!result) {
+      return undefined;
+    }
     return {
       userId: result?.user?.id,
       roles: result?.user?.scopedRoles ?? [],

src/components/partner/dto/create-partner.dto.ts

@@ -2,7 +2,15 @@ import { Field, ID as IDType, InputType, ObjectType } from '@nestjs/graphql';
 import { Transform, Type } from 'class-transformer';
 import { Matches, ValidateNested } from 'class-validator';
 import { uniq } from 'lodash';
-import { ID, IdField, IdOf, IsId, NameField } from '../../../common';
+import {
+  CalendarDate,
+  DateField,
+  ID,
+  IdField,
+  IdOf,
+  IsId,
+  NameField,
+} from '../../../common';
 import { Location } from '../../../components/location';
 import { FieldRegion } from '../../field-region';
 import type { Language } from '../../language';
@@ -57,6 +65,9 @@ export abstract class CreatePartner {
   @Field(() => [IDType], { name: 'languagesOfConsulting', nullable: true })
   @Transform(({ value }) => uniq(value))
   readonly languagesOfConsulting?: ReadonlyArray<IdOf<Language>> = [];
+
+  @DateField({ nullable: true })
+  readonly startDate?: CalendarDate;
 }
 
 @InputType()

src/components/partner/dto/partner.dto.ts

@@ -13,6 +13,7 @@ import {
   ResourceRelationsShape,
   Secured,
   SecuredBoolean,
+  SecuredDateNullable,
   SecuredEnumList,
   SecuredProperty,
   SecuredProps,
@@ -88,6 +89,9 @@ export class Partner extends Interfaces {
     Secured<ReadonlyArray<IdOf<Language>>>
   >;
 
+  @Field()
+  readonly startDate: SecuredDateNullable;
+
   @DateTimeField()
   readonly modifiedAt: DateTime;
 

src/components/partner/dto/update-partner.dto.ts

@@ -2,7 +2,15 @@ import { Field, ID as IDType, InputType, ObjectType } from '@nestjs/graphql';
 import { Transform, Type } from 'class-transformer';
 import { Matches, ValidateNested } from 'class-validator';
 import { uniq } from 'lodash';
-import { ID, IdField, IdOf, IsId, NameField } from '../../../common';
+import {
+  CalendarDate,
+  DateField,
+  ID,
+  IdField,
+  IdOf,
+  IsId,
+  NameField,
+} from '../../../common';
 import { Location } from '../../../components/location';
 import { FieldRegion } from '../../field-region';
 import type { Language } from '../../language';
@@ -57,6 +65,9 @@ export abstract class UpdatePartner {
   @Field(() => [IDType], { name: 'languagesOfConsulting', nullable: true })
   @Transform(({ value }) => (value ? uniq(value) : undefined))
   readonly languagesOfConsulting?: ReadonlyArray<IdOf<Language>>;
+
+  @DateField({ nullable: true })
+  readonly startDate?: CalendarDate | null;
 }
 
 @InputType()

src/components/partner/partner.repository.ts

@@ -3,6 +3,7 @@ import { node, Query, relation } from 'cypher-query-builder';
 import { DateTime } from 'luxon';
 import { ChangesOf } from '~/core/database/changes';
 import {
+  CalendarDate,
   ID,
   InputException,
   ServerException,
@@ -54,6 +55,7 @@ export class PartnerRepository extends DtoRepository<
       pmcEntityCode: input.pmcEntityCode,
       globalInnovationsClient: input.globalInnovationsClient,
       active: input.active,
+      startDate: input.startDate ?? CalendarDate.local(),
       address: input.address,
       modifiedAt: DateTime.local(),
       canDelete: true,

src/components/periodic-report/periodic-report.repository.ts

@@ -182,7 +182,7 @@ export class PeriodicReportRepository extends DtoRepository<
     const filters = { type, parent, start, end };
     const result = await this.db
       .query()
-      .matchNode('node', `${type || ''}Report`)
+      .matchNode('node', 'PeriodicReport')
       .apply(
         filter.builder(filters, {
           parent: filter.pathExists((id) => [
@@ -192,8 +192,7 @@ export class PeriodicReportRepository extends DtoRepository<
           ]),
           start: filter.dateTimeProp(),
           end: filter.dateTimeProp(),
-          //TODO: determine how to fix this type filter
-          type: ({ value }) => hasLabel(`${value}Report`),
+          type: ({ value }) => ({ node: hasLabel(`${value}Report`) }),
         }),
       )
       .apply(sorting(resource, input))

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

@@ -117,7 +117,9 @@ export class ProjectMemberRepository extends DtoRepository<
           node('user', 'User'),
         ])
         .subQuery('user', (sub) =>
-          sub.with('user as node').apply(this.users.hydrate(session.userId)),
+          sub
+            .with('user as node')
+            .apply(this.users.hydrateAsNeo4j(session.userId)),
         )
         .return<{ dto: UnsecuredDto<ProjectMember> }>(
           merge('props', { user: 'dto' }).as('dto'),

src/components/user/user.edgedb.repository.ts

@@ -1,111 +1,43 @@
 import { Injectable } from '@nestjs/common';
+import { NotImplementedException, PublicOf } from '~/common';
+import { e, RepoFor, ScopeOf } from '~/core/edgedb';
 import {
-  DuplicateException,
-  ID,
-  NotFoundException,
-  ServerException,
-  Session,
-} from '~/common';
-import { e, EdgeDB, isExclusivityViolation } from '~/core/edgedb';
-import { CreatePerson, User, UserListInput } from './dto';
-import { UserRepository } from './user.repository';
-
-const hydrate = e.shape(e.User, (user) => ({
-  ...user['*'],
-  // Other links if needed
-}));
+  AssignOrganizationToUser,
+  RemoveOrganizationFromUser,
+  User,
+  UserListInput,
+} from './dto';
+import type { UserRepository } from './user.repository';
 
 @Injectable()
-export class UserEdgedbRepository extends UserRepository {
-  constructor(private readonly edgedb: EdgeDB) {
-    super();
-  }
-
-  async readOne(id: ID, _session: Session | ID) {
-    const query = e.select(e.User, (user) => ({
-      ...hydrate(user),
-      filter_single: { id },
-    }));
-    const user = await this.edgedb.run(query);
-    if (!user) {
-      throw new NotFoundException('Could not find user');
-    }
-    return user;
-  }
-
-  async readMany(ids: readonly ID[], _session: Session | ID) {
-    const query = e.params({ ids: e.array(e.uuid) }, ({ ids }) =>
-      e.select(e.User, (user) => ({
-        ...hydrate(user),
-        filter: e.op(user.id, 'in', e.array_unpack(ids)),
-      })),
-    );
-    const users = await this.edgedb.run(query, { ids });
-    return users;
-  }
-
+export class UserEdgeDBRepository
+  extends RepoFor(User).withDefaults()
+  implements PublicOf<UserRepository>
+{
   async doesEmailAddressExist(email: string) {
     const query = e.select(e.User, () => ({
       filter_single: { email },
     }));
-    const result = await this.edgedb.run(query);
+    const result = await this.db.run(query);
     return !!result;
   }
 
-  async list(input: UserListInput, _session: Session) {
-    const sortKey = input.sort as keyof (typeof e.User)['*'];
-    const all = e.select(e.User, (user) => ({
-      filter: e.all(
-        input.filter.pinned != null
-          ? e.op(user.pinned, '=', input.filter.pinned)
-          : true,
-        // More filters here when needed...
-      ),
-      order_by: {
-        expression: user[sortKey],
-        direction: input.order,
-      },
-    }));
-    const thisPage = e.select(all, () => ({
-      offset: (input.page - 1) * input.count,
-      limit: input.count + 1,
-    }));
-    const query = e.select({
-      items: e.select(thisPage, (user) => ({
-        ...hydrate(user),
-        limit: input.count,
-      })),
-      total: e.count(all),
-      hasMore: e.op(e.count(thisPage), '>', input.count),
-    });
-    return await this.edgedb.run(query);
+  protected listFilters(user: ScopeOf<typeof e.User>, input: UserListInput) {
+    return [
+      input.filter.pinned != null &&
+        e.op(user.pinned, '=', input.filter.pinned),
+      // More filters here when needed...
+    ];
   }
 
-  async create(input: CreatePerson) {
-    const query = e.insert(e.User, { ...input });
-    try {
-      const result = await this.edgedb.run(query);
-      return result.id;
-    } catch (e) {
-      if (isExclusivityViolation(e, 'email')) {
-        throw new DuplicateException(
-          'person.email',
-          'Email address is already in use',
-          e,
-        );
-      }
-      throw new ServerException('Failed to create user', e);
-    }
+  assignOrganizationToUser(args: AssignOrganizationToUser): Promise<void> {
+    throw new NotImplementedException().with(args);
+  }
+  removeOrganizationFromUser(args: RemoveOrganizationFromUser): Promise<void> {
+    throw new NotImplementedException().with(args);
   }
 
-  async delete(id: ID, _session: Session, _object: User): Promise<void> {
-    const query = e.delete(e.User, () => ({
-      filter_single: { id },
-    }));
-    try {
-      await this.edgedb.run(query);
-    } catch (exception) {
-      throw new ServerException('Failed to delete', exception);
-    }
+  hydrateAsNeo4j(_session: unknown): any {
+    throw new NotImplementedException();
   }
 }