Merge branch 'develop'

src/app.module.ts

@@ -18,6 +18,7 @@ import { FilmModule } from './components/film/film.module';
 import { FundingAccountModule } from './components/funding-account/funding-account.module';
 import { LanguageModule } from './components/language/language.module';
 import { LocationModule } from './components/location/location.module';
+import { NotificationModule } from './components/notifications/notification.module';
 import { OrganizationModule } from './components/organization/organization.module';
 import { PartnerModule } from './components/partner/partner.module';
 import { PartnershipProducingMediumModule } from './components/partnership-producing-medium/partnership-producing-medium.module';
@@ -89,6 +90,7 @@ if (process.env.NODE_ENV !== 'production') {
     ProgressReportModule,
     PromptsModule,
     PnpExtractionResultModule,
+    NotificationModule,
   ],
 })
 export class AppModule {}

src/components/notifications/dto/index.ts

@@ -0,0 +1,3 @@
+export * from './notification.dto';
+export * from './notification-list.input';
+export * from './mark-notification-read.args';

src/components/notifications/dto/mark-notification-read.args.ts

@@ -0,0 +1,11 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+import { ID, IdField } from '~/common';
+
+@ArgsType()
+export abstract class MarkNotificationReadArgs {
+  @IdField()
+  readonly id: ID<'Notification'>;
+
+  @Field(() => Boolean, { nullable: true })
+  readonly unread = false;
+}

src/components/notifications/dto/notification-list.input.ts

@@ -0,0 +1,26 @@
+import { Field, InputType, Int, ObjectType } from '@nestjs/graphql';
+import { FilterField, PaginatedList, PaginationInput } from '~/common';
+import { Notification } from './notification.dto';
+
+@InputType()
+export abstract class NotificationFilters {
+  @Field(() => Boolean, {
+    description: 'Only read/unread notifications',
+    nullable: true,
+  })
+  readonly unread?: boolean;
+}
+
+@InputType()
+export class NotificationListInput extends PaginationInput {
+  @FilterField(() => NotificationFilters)
+  readonly filter?: NotificationFilters;
+}
+
+@ObjectType()
+export class NotificationList extends PaginatedList(Notification) {
+  @Field(() => Int, {
+    description: 'The total number of unread notifications',
+  })
+  readonly totalUnread: number;
+}

src/components/notifications/dto/notification.dto.ts

@@ -0,0 +1,35 @@
+import { Field, InterfaceType, ObjectType } from '@nestjs/graphql';
+import { keys as keysOf } from 'ts-transformer-keys';
+import { Resource, SecuredProps } from '~/common';
+import { LinkTo, RegisterResource } from '~/core/resources';
+
+@RegisterResource()
+@InterfaceType({
+  implements: [Resource],
+})
+export class Notification extends Resource {
+  static readonly Props = keysOf<Notification>();
+  static readonly SecuredProps = keysOf<SecuredProps<Notification>>();
+
+  readonly owner: LinkTo<'User'>;
+
+  @Field(() => Boolean)
+  readonly unread: boolean;
+}
+
+@ObjectType({
+  implements: [Notification],
+})
+export class SimpleTextNotification extends Notification {
+  @Field(() => String)
+  readonly content: string;
+}
+
+declare module '~/core/resources/map' {
+  interface ResourceMap {
+    Notification: typeof Notification;
+  }
+  // interface ResourceDBMap {
+  //   Notification: typeof e.Notification;
+  // }
+}

src/components/notifications/notification.module.ts

@@ -0,0 +1,7 @@
+import { Module } from '@nestjs/common';
+import { NotificationResolver } from './notification.resolver';
+
+@Module({
+  providers: [NotificationResolver],
+})
+export class NotificationModule {}

src/components/notifications/notification.resolver.ts

@@ -0,0 +1,32 @@
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import {
+  ListArg,
+  LoggedInSession,
+  NotImplementedException,
+  Session,
+} from '~/common';
+import {
+  MarkNotificationReadArgs,
+  Notification,
+  NotificationList,
+  NotificationListInput,
+} from './dto';
+
+@Resolver()
+export class NotificationResolver {
+  @Query(() => NotificationList)
+  async notifications(
+    @LoggedInSession() session: Session,
+    @ListArg(NotificationListInput) input: NotificationListInput,
+  ): Promise<NotificationList> {
+    throw new NotImplementedException().with(input, session);
+  }
+
+  @Mutation(() => Notification)
+  async readNotification(
+    @LoggedInSession() session: Session,
+    @Args() input: MarkNotificationReadArgs,
+  ): Promise<Notification> {
+    throw new NotImplementedException().with(input, session);
+  }
+}

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

@@ -42,7 +42,6 @@ export class ProgressReportRepository extends DtoRepository<
         relation('in', '', 'engagement'),
         node('project', 'Project'),
       ])
-      .logIt()
       .match(requestingUser(session))
       .apply(progressReportFilters(input.filter))
       .apply(