Merge pull request #3188 from SeedCompany/bugfix/unavailability

Author: CarsonF

dbschema/migrations/00005.edgeql

@@ -46,6 +46,8 @@ module User {
   type Unavailability extending default::Resource {
     required description: str;
     required dates: range<datetime>;
+    `start` := assert_exists(range_get_lower(.dates));
+    `end` := assert_exists(range_get_upper(.dates));
   }
 
   scalar type Status extending enum<Active, Disabled>;

dbschema/user.esdl

@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { Range } from 'edgedb';
 import { ID, PublicOf } from '~/common';
-import { e, RepoFor } from '~/core/edgedb';
+import { e, RepoFor, ScopeOf } from '~/core/edgedb';
 import {
   CreateUnavailability,
   Unavailability,
+  UnavailabilityListInput,
   UpdateUnavailability,
 } from './dto';
 import { UnavailabilityRepository } from './unavailability.repository';
@@ -14,8 +15,6 @@ export class UnavailabilityEdgeDBRepository
   extends RepoFor(Unavailability, {
     hydrate: (unavailability) => ({
       ...unavailability['*'],
-      start: e.assert_exists(e.range_get_lower(unavailability.dates)),
-      end: e.assert_exists(e.range_get_upper(unavailability.dates)),
     }),
   }).customize((cls) => {
     return class extends cls {
@@ -32,7 +31,7 @@ export class UnavailabilityEdgeDBRepository
         }));
         const query = e.select(inserted, (u) => ({
           ...this.hydrate(u),
-          updatedUser, // Attach to query, so it is executed.
+          updatedUser: e.alias(updatedUser), // Attach to query, so it is executed.
         }));
         return await this.db.run(query);
       }
@@ -67,4 +66,18 @@ export class UnavailabilityEdgeDBRepository
     );
     return await this.db.run(query);
   }
+
+  protected listFilters(
+    unavailability: ScopeOf<typeof e.User.Unavailability>,
+    { filter: input }: UnavailabilityListInput,
+  ) {
+    return [
+      input.userId &&
+        e.op(
+          e.cast(e.User, e.uuid(input.userId)),
+          'in',
+          unavailability['<unavailabilities[is User]'],
+        ),
+    ];
+  }
 }

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

@@ -12,6 +12,7 @@ import { LazyGetter as Once } from 'lazy-get-decorator';
 import { lowerCase } from 'lodash';
 import { AbstractClass } from 'type-fest';
 import {
+  ClientException,
   DBName,
   EnhancedResource,
   EnumType,
@@ -162,7 +163,11 @@ export const RepoFor = <
       scope: ScopeOf<Root>,
       input: SortablePaginationInput,
     ): OrderByExpression {
-      // TODO Validate this is a valid sort key
+      if (!(input.sort in scope.__element__.__pointers__)) {
+        throw new ClientException(
+          `'${input.sort}' is not a valid sort key for '${resource.name}'`,
+        );
+      }
       return {
         expression: (scope as any)[input.sort],
         direction: input.order,