fix(event): corrige listagem de eventos para líderes vinculados

Author: guiseek

packages/account/feature-auth/src/lib/containers/authentication/authentication.container.ts

@@ -1,4 +1,3 @@
-import { LowerDirective, TrimDirective } from '@devmx/shared-ui-global/forms';
 import { MatStepper, MatStepperModule } from '@angular/material/stepper';
 import { AuthenticationFacade } from '@devmx/account-data-access';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -31,8 +30,6 @@ import {
     MatButtonModule,
     MatInputModule,
     MatCardModule,
-    LowerDirective,
-    TrimDirective,
     RouterLink,
     AsyncPipe,
   ],

packages/event/data-access/src/lib/application/event.facade.ts

@@ -10,6 +10,7 @@ import {
   FindEventByIDUseCase,
   FindAllEventsUseCase,
   CopyEventUseCase,
+  FindMyEventsUseCase,
 } from '@devmx/event-domain/client';
 
 export class EventFacade extends EntityFacade<Event> {
@@ -23,6 +24,7 @@ export class EventFacade extends EntityFacade<Event> {
   constructor(
     private createEventUseCase: CreateEventUseCase,
     private findEventsUseCase: FindEventsUseCase,
+    private findMyEventsUseCase: FindMyEventsUseCase,
     private findAllEventsUseCase: FindAllEventsUseCase,
     private findEventByIDUseCase: FindEventByIDUseCase,
     private updateEventUseCase: UpdateEventUseCase,
@@ -49,6 +51,10 @@ export class EventFacade extends EntityFacade<Event> {
     this.onLoad(this.findAllEventsUseCase.execute(this.state.params));
   }
 
+  loadMyEvents() {
+    this.onLoad(this.findMyEventsUseCase.execute(this.state.params));
+  }
+
   loadOne(id: string) {
     this.onLoadOne(this.findEventByIDUseCase.execute(id));
   }
@@ -86,6 +92,7 @@ export function provideEventFacade() {
   return createClientProvider(EventFacade, [
     CreateEventUseCase,
     FindEventsUseCase,
+    FindMyEventsUseCase,
     FindAllEventsUseCase,
     FindEventByIDUseCase,
     UpdateEventUseCase,

packages/event/data-access/src/lib/infrastructure/event.http.service.impl.ts

@@ -20,6 +20,11 @@ export class EventHttpServiceImpl
     return this.http.get<Page<Event>>(url.join('?'));
   }
 
+  findMyEvents(params: QueryParams<Event>) {
+    const url = [`${this.url}/my`, createQueryParams(params)];
+    return this.http.get<Page<Event>>(url.join('?'));
+  }
+
   copy(id: string, data: CopyEvent) {
     const url = [this.url, id, 'copy'];
     return this.http.patch<Event>(url.join('/'), data);

packages/event/data-access/src/lib/providers/event.ts

@@ -7,6 +7,7 @@ import {
   provideFindAllEventsUseCase,
   provideFindEventByIDUseCase,
   provideFindEventsUseCase,
+  provideFindMyEventsUseCase,
   provideUpdateEventUseCase,
 } from '@devmx/event-domain/client';
 
@@ -16,6 +17,7 @@ export function provideEvent() {
 
     provideCreateEventUseCase(),
     provideFindEventsUseCase(),
+    provideFindMyEventsUseCase(),
     provideFindAllEventsUseCase(),
     provideFindEventByIDUseCase(),
     provideUpdateEventUseCase(),

packages/event/data-source/src/lib/application/events.facade.ts

@@ -1,4 +1,9 @@
-import { EventDto, CreateEventDto, UpdateEventDto, CopyEventDto } from '../dtos';
+import {
+  EventDto,
+  CreateEventDto,
+  UpdateEventDto,
+  CopyEventDto,
+} from '../dtos';
 import { Event } from '@devmx/shared-api-interfaces';
 import { plainToInstance } from 'class-transformer';
 import {
@@ -8,6 +13,7 @@ import {
   FindEventByIDUseCase,
   FindEventsFromUseCase,
   FindEventsUseCase,
+  FindMyEventsUseCase,
   UpdateEventUseCase,
 } from '@devmx/event-domain/server';
 import {
@@ -20,6 +26,7 @@ export class EventsFacade {
   constructor(
     private createEventUseCase: CreateEventUseCase,
     private findEventsUseCase: FindEventsUseCase,
+    private findMyEventsUseCase: FindMyEventsUseCase,
     private findEventsFromUseCase: FindEventsFromUseCase,
     private findEventByIDUseCase: FindEventByIDUseCase,
     private updateEventUseCase: UpdateEventUseCase,
@@ -43,6 +50,14 @@ export class EventsFacade {
     return new PageDto(events, items, pages);
   }
 
+  async findMyEvents(params: QueryParamsDto<Event>) {
+    const { data, items, pages } = await this.findMyEventsUseCase.execute(
+      params
+    );
+    const events = plainToInstance(EventDto, data);
+    return new PageDto(events, items, pages);
+  }
+
   async findFrom(date: Date, params: QueryParamsDto<Event>) {
     const { data, items, pages } = await this.findEventsFromUseCase.execute([
       date,
@@ -72,6 +87,7 @@ export function provideEventsFacade() {
   return createServerProvider(EventsFacade, [
     CreateEventUseCase,
     FindEventsUseCase,
+    FindMyEventsUseCase,
     FindEventsFromUseCase,
     FindEventByIDUseCase,
     UpdateEventUseCase,

packages/event/data-source/src/lib/infrastructure/events.mongo.service.impl.ts

@@ -1,14 +1,42 @@
-import { createServiceProvider, MongoService } from '@devmx/shared-data-source';
-import { EditableEntity, QueryParams } from '@devmx/shared-api-interfaces';
+import { QueryParams, EditableEntity } from '@devmx/shared-api-interfaces';
 import { EventsService } from '@devmx/event-domain/server';
 import { getModelToken } from '@nestjs/mongoose';
 import { EventCollection } from '../schemas';
 import { Query } from 'mongoose';
+import {
+  MongoService,
+  createServiceProvider,
+  objectId,
+} from '@devmx/shared-data-source';
 
 export class EventsMongoServiceImpl
   extends MongoService<EventCollection>
   implements EventsService
 {
+  async findMyEvents(params: QueryParams<EventCollection>) {
+    const { page = 0, size = 10, filter, sort } = params;
+
+    const skip = page * size;
+    const where = this.applyFilter(filter ?? {});
+    const order = this.applySort(sort ?? {});
+
+    const { owner = '' } = filter ?? {};
+
+    const query = this.entityModel
+      .find({ leaders: { $in: [objectId(String(owner))] } })
+      .sort(order)
+      .skip(skip)
+      .limit(size);
+
+    const entities = await this.applyPopulate(query).exec();
+
+    const data = entities.map((item) => item.toJSON());
+    const items = await this.entityModel.countDocuments(where).exec();
+    const pages = Math.ceil(items / size);
+
+    return { data, items, pages };
+  }
+
   async findFrom(date: Date, params: QueryParams<EventCollection>) {
     const { page = 0, size = 10, filter, sort } = params;
 
@@ -50,7 +78,11 @@ export class EventsMongoServiceImpl
   ): U {
     const presentations = (data.presentations ?? []).map((p) => p.id);
     const leaders = (data.leaders ?? []).map((p) => p.id);
+
     const owner = typeof data.owner === 'string' ? data.owner : data.owner.id;
+
+    if (!data.id) leaders.push(owner);
+
     return { ...data, owner, leaders, presentations } as U;
   }
 }

packages/event/data-source/src/lib/providers/event.ts

@@ -8,6 +8,7 @@ import {
   provideFindEventByIDUseCase,
   provideFindEventsFromUseCase,
   provideCopyEventUseCase,
+  provideFindMyEventsUseCase,
 } from '@devmx/event-domain/server';
 
 export function provideEvent() {
@@ -16,6 +17,7 @@ export function provideEvent() {
 
     provideCreateEventUseCase(),
     provideFindEventsUseCase(),
+    provideFindMyEventsUseCase(),
     provideFindEventsFromUseCase(),
     provideFindEventByIDUseCase(),
     provideUpdateEventUseCase(),

packages/event/domain/src/client/services/event.ts

@@ -14,6 +14,8 @@ export abstract class EventService extends EntityService<Event> {
 
   abstract findAll(params: QueryParams<Event>): Observable<Page<Event>>;
 
+  abstract findMyEvents(params: QueryParams<Event>): Observable<Page<Event>>;
+
   abstract createRSVP(event: string, status: RSVPStatus): Observable<RSVP>;
 
   abstract findRSVPByEvent(event: string): Observable<RSVP[]>;

packages/event/domain/src/client/use-cases/find-my-events.ts

@@ -0,0 +1,22 @@
+import { createUseCaseProvider } from '@devmx/shared-util-data/client';
+import { EventService } from '../services';
+import {
+  Page,
+  Event,
+  UseCase,
+  QueryParams,
+} from '@devmx/shared-api-interfaces';
+
+export class FindMyEventsUseCase
+  implements UseCase<QueryParams<Event>, Page<Event>>
+{
+  constructor(private eventService: EventService) {}
+
+  execute(params: QueryParams<Event>) {
+    return this.eventService.findMyEvents(params);
+  }
+}
+
+export function provideFindMyEventsUseCase() {
+  return createUseCaseProvider(FindMyEventsUseCase, [EventService]);
+}

packages/event/domain/src/client/use-cases/index.ts

@@ -5,6 +5,7 @@ export * from './delete-event';
 export * from './find-all-events';
 export * from './find-event-by-id';
 export * from './find-events';
+export * from './find-my-events';
 export * from './find-rsvp-by-event';
 export * from './find-rsvp-confirmed-by-event';
 export * from './update-event';

packages/event/domain/src/server/services/events.ts

@@ -6,5 +6,6 @@ export abstract class EventsService extends EntityService<Event> {
     date: Date,
     params: QueryParams<Event>
   ): Promise<Page<Event>>;
-  // abstract findPast(params: QueryParams<Event>): Promise<Page<Event>>;
+
+  abstract findMyEvents(params: QueryParams<Event>): Promise<Page<Event>>;
 }

packages/event/domain/src/server/use-cases/find-my-events.ts

@@ -0,0 +1,48 @@
+import { createUseCaseProvider } from '@devmx/shared-util-data/server';
+import { EventsService } from '../services';
+import {
+  Event,
+  Page,
+  UseCase,
+  QueryParams,
+} from '@devmx/shared-api-interfaces';
+
+export class FindMyEventsUseCase
+  implements UseCase<QueryParams<Event>, Page<Event>>
+{
+  constructor(private eventsService: EventsService) {}
+
+  async execute(params: QueryParams<Event>) {
+    if (params.filter) {
+      if (params.filter.format) {
+        params.filter.format = new RegExp(params.filter.format, 'i');
+      } else {
+        delete params.filter.format;
+      }
+
+      if (params.filter.title) {
+        params.filter.title = new RegExp(params.filter.title, 'i');
+      } else {
+        delete params.filter.title;
+      }
+
+      if (params.filter.city) {
+        params.filter.city = params.filter.city.toString();
+      } else {
+        delete params.filter.city;
+      }
+
+      if (params.filter.description) {
+        params.filter.description = new RegExp(params.filter.description, 'i');
+      } else {
+        delete params.filter.description;
+      }
+    }
+
+    return await this.eventsService.findMyEvents(params);
+  }
+}
+
+export function provideFindMyEventsUseCase() {
+  return createUseCaseProvider(FindMyEventsUseCase, [EventsService]);
+}

packages/event/domain/src/server/use-cases/index.ts

@@ -5,6 +5,7 @@ export * from './delete-event';
 export * from './find-event-by-id';
 export * from './find-events-from';
 export * from './find-events';
+export * from './find-my-events';
 export * from './find-past-events';
 export * from './find-rsvp-by-event';
 export * from './find-rsvp-confirmed-by-event';

packages/event/feature-admin/src/lib/containers/my-events/my-events.container.ts

@@ -70,7 +70,7 @@ export class MyEventsContainer {
 
     this.eventFacade.setParams({ page, size, filter });
 
-    this.eventFacade.loadAll();
+    this.eventFacade.loadMyEvents();
   };
 
   openRSVP(event: string) {

packages/event/resource/src/lib/controllers/events.ts

@@ -93,6 +93,17 @@ export class EventsController {
     }
   }
 
+  @Get('my')
+  @Allowed()
+  @ApiPage(EventDto)
+  async findMyEvents(@Query() params: QueryParamsDto<Event>) {
+    try {
+      return await this.eventsFacade.findMyEvents(params);
+    } catch (err) {
+      throw exceptionByError(err);
+    }
+  }
+
   @Get('all')
   @Allowed()
   @ApiPage(EventDto)