Merge pull request #3175 from SeedCompany/bugfix/edgedb-stuff

Author: CarsonF

dbschema/language.esdl

@@ -71,7 +71,9 @@ module default {
       (exists .firstScriptureEngagement and not .hasExternalFirstScripture)
       or not exists .firstScriptureEngagement
     );
-    
+
+    multi locations: Location;
+
     engagements := (
       # Similar to previous version but avoids https://github.com/edgedb/edgedb/issues/5846
       select LanguageEngagement filter __source__ = .language

dbschema/migrations/00004.edgeql

@@ -9,6 +9,8 @@ module default {
     multi types: Organization::Type;
     multi reach: Organization::Reach;
 
+    multi locations: Location;
+
     overloaded link projectContext: Project::Context {
       default := (insert Project::Context);
       on source delete delete target;

dbschema/organization.esdl

@@ -162,7 +162,10 @@ with
           union (
             insert User::Unavailability {
               description := <str>unavailability['description'],
-              dates := range(<cal::local_date>unavailability['start'], <cal::local_date>unavailability['end'])
+              dates := range(
+                to_datetime(<cal::local_datetime><cal::local_date>unavailability['start'], 'America/Chicago'),
+                to_datetime(<cal::local_datetime><cal::local_date>unavailability['end'], 'America/Chicago')
+              )
             }
           )
         )

dbschema/seeds/004.users.edgeql

@@ -26,10 +26,13 @@ module default {
     }
     multi link education: User::Education {
       on target delete allow;
+      on source delete delete target;
     }
     multi link unavailabilities: User::Unavailability {
       on target delete allow;
+      on source delete delete target;
     }
+    multi locations: Location;
   }
 }
 
@@ -42,7 +45,7 @@ module User {
 
   type Unavailability extending default::Resource {
     required description: str;
-    required dates: range<cal::local_date>;
+    required dates: range<datetime>;
   }
 
   scalar type Status extending enum<Active, Disabled>;

dbschema/user.esdl

@@ -5,6 +5,7 @@ import JWT from 'jsonwebtoken';
 import { DateTime } from 'luxon';
 import { Writable } from 'ts-essentials';
 import { sessionFromContext } from '~/common/session';
+import { disableAccessPolicies, EdgeDB } from '~/core/edgedb';
 import {
   DuplicateException,
   GqlContextType,
@@ -38,6 +39,7 @@ export class AuthenticationService {
     private readonly privileges: Privileges,
     @Logger('authentication:service') private readonly logger: ILogger,
     private readonly repo: AuthenticationRepository,
+    private readonly edgedb: EdgeDB,
     private readonly moduleRef: ModuleRef,
   ) {}
 
@@ -48,7 +50,10 @@ export class AuthenticationService {
     return token;
   }
 
-  async register(input: RegisterInput, session?: Session): Promise<ID> {
+  async register(
+    { password, ...input }: RegisterInput,
+    session?: Session,
+  ): Promise<ID> {
     // ensure no other tokens are associated with this user
     if (session) {
       await this.logout(session.token);
@@ -58,7 +63,10 @@ export class AuthenticationService {
     try {
       const userMod = await import('../user');
       const users = this.moduleRef.get(userMod.UserService, { strict: false });
-      userId = await users.create(input, session);
+      userId = await this.edgedb.usingOptions(
+        disableAccessPolicies,
+        async () => await users.create(input, session),
+      );
     } catch (e) {
       // remap field prop as `email` field is at a different location in register() than createPerson()
       if (e instanceof DuplicateException && e.field === 'person.email') {
@@ -67,7 +75,7 @@ export class AuthenticationService {
       throw e;
     }
 
-    const passwordHash = await this.crypto.hash(input.password);
+    const passwordHash = await this.crypto.hash(password);
     await this.repo.savePasswordHashOnUser(userId, passwordHash);
 
     return userId;

src/components/authentication/authentication.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, Type } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
+import { LazyGetter } from 'lazy-get-decorator';
 import { PublicOf, SortablePaginationInput, UnsecuredDto } from '~/common';
-import { grabInstances, InstanceMapOf } from '~/common/instance-maps';
+import { grabInstances } from '~/common/instance-maps';
 import { ChangesOf } from '~/core/database/changes';
 import { castToEnum, e, RepoFor, ScopeOf } from '~/core/edgedb';
 import {
@@ -57,18 +58,21 @@ export class ProjectEdgeDBRepository
   })
   implements PublicOf<Neo4jRepository>
 {
-  protected readonly concretes: InstanceMapOf<typeof ConcreteRepos>;
-
-  constructor(moduleRef: ModuleRef) {
+  constructor(private readonly moduleRef: ModuleRef) {
     super();
-    this.concretes = grabInstances(moduleRef, ConcreteRepos);
+  }
+
+  @LazyGetter() protected get concretes() {
+    return grabInstances(this.moduleRef, ConcreteRepos);
   }
 
   async create(input: CreateProject) {
-    const { type, sensitivity, ...props } = input;
+    const { type, sensitivity, otherLocationIds, presetInventory, ...props } =
+      input;
     return await this.concretes[input.type].create({
       ...props,
       ownSensitivity: sensitivity,
+      otherLocations: otherLocationIds,
     });
   }
 

src/components/project/project.edgedb.repository.ts

@@ -1,4 +1,5 @@
 import { sample, times } from 'lodash';
+import { v1 as uuid } from 'uuid';
 import { CalendarDate, ID } from '../src/common';
 import { Role } from '../src/components/authorization';
 import { PartnerType } from '../src/components/partner';
@@ -275,7 +276,7 @@ describe('Partnership e2e', () => {
     await expect(
       createPartnership(app, {
         projectId: project.id,
-        partnerId: 'fakePartner' as ID,
+        partnerId: uuid() as ID,
       }),
     ).rejects.toThrowGqlError(
       errors.notFound({
@@ -288,7 +289,7 @@ describe('Partnership e2e', () => {
   it('create partnership does not create if projectId is invalid', async () => {
     await expect(
       createPartnership(app, {
-        projectId: 'fakeProject' as ID,
+        projectId: uuid() as ID,
       }),
     ).rejects.toThrowGqlError(
       errors.notFound({

test/partnership.e2e-spec.ts

@@ -1,6 +1,7 @@
 import { faker } from '@faker-js/faker';
 import { intersection, times } from 'lodash';
 import { DateTime } from 'luxon';
+import { v1 as uuid } from 'uuid';
 import {
   CalendarDate,
   generateId,
@@ -201,7 +202,7 @@ describe('Project e2e', () => {
       createProject(app, {
         name: faker.string.uuid(),
         type: ProjectType.MomentumTranslation,
-        fieldRegionId: 'invalid-location-id' as ID,
+        fieldRegionId: uuid() as ID,
       }),
     ).rejects.toThrowGqlError(
       errors.notFound({

test/project.e2e-spec.ts

@@ -7,12 +7,15 @@ export const ephemeralEdgeDB = async () => {
   }
 
   const db = createClient();
+  const config = await db.resolveConnectionParams();
+  // Workaround old default fallback. Didn't hit locally, but did in CI.
+  const main = config.branch === 'edgedb' ? 'main' : config.branch;
 
   await dropStale(db);
 
   const branch = `test_${Date.now()}`;
 
-  await db.execute(`create schema branch ${branch} from main`);
+  await db.execute(`create schema branch ${branch} from ${main}`);
 
   const cleanup = async () => {
     await db.execute(`drop branch ${branch}`);
@@ -27,21 +30,18 @@ export const ephemeralEdgeDB = async () => {
 async function dropStale(db: Client) {
   const branches = await db.query<string>('select sys::Database.name');
 
-  const stale = branches.flatMap((name) => {
+  const stale = branches.filter((name) => {
     if (!name.startsWith('test_')) {
-      return [];
+      return false;
     }
     const ts = Number(name.slice(5));
     if (isNaN(ts)) {
-      return [];
+      return false;
     }
     const createdAt = DateTime.fromMillis(ts);
-    return createdAt.diffNow().as('hours') > 4 ? name : [];
-  });
-  if (stale.length === 0) {
-    return;
-  }
-  await db.execute('drop branch array_unpack(<array<string>>$branches)', {
-    branches: stale,
+    // more than 1 hour old
+    return createdAt.diffNow().as('hours') < -1;
   });
+
+  await Promise.all(stale.map((branch) => db.execute(`drop branch ${branch}`)));
 }