DeveloperParana · guiseek · Dec 21, 2024 · Dec 21, 2024
diff --git a/packages/event/data-access/src/lib/application/event.facade.ts b/packages/event/data-access/src/lib/application/event.facade.ts
@@ -12,6 +12,7 @@ import {
   CopyEventUseCase,
   FindMyEventsUseCase,
   FindEventsUntilUseCase,
+  FindEventsDateRangeUseCase,
 } from '@devmx/event-domain/client';
 
 export class EventFacade extends EntityFacade<Event> {
@@ -28,6 +29,7 @@ export class EventFacade extends EntityFacade<Event> {
     private findMyEventsUseCase: FindMyEventsUseCase,
     private findAllEventsUseCase: FindAllEventsUseCase,
     private findEventsUntilUseCase: FindEventsUntilUseCase,
+    private findEventsDateRangeUseCase: FindEventsDateRangeUseCase,
     private findEventByIDUseCase: FindEventByIDUseCase,
     private updateEventUseCase: UpdateEventUseCase,
     private copyEventUseCase: CopyEventUseCase,
@@ -53,6 +55,11 @@ export class EventFacade extends EntityFacade<Event> {
     this.onLoad(this.findAllEventsUseCase.execute(this.state.params));
   }
 
+  loadDateRange(start: Date, end: Date) {
+    const params = { start, end, ...this.state.params };
+    this.onLoad(this.findEventsDateRangeUseCase.execute(params));
+  }
+
   loadUntil() {
     this.onLoad(this.findEventsUntilUseCase.execute(this.state.params));
   }
@@ -101,6 +108,7 @@ export function provideEventFacade() {
     FindMyEventsUseCase,
     FindAllEventsUseCase,
     FindEventsUntilUseCase,
+    FindEventsDateRangeUseCase,
     FindEventByIDUseCase,
     UpdateEventUseCase,
     CopyEventUseCase,

diff --git a/packages/event/data-access/src/lib/infrastructure/event.http.service.impl.ts b/packages/event/data-access/src/lib/infrastructure/event.http.service.impl.ts
@@ -25,6 +25,14 @@ export class EventHttpServiceImpl
     return this.http.get<Page<Event>>(url.join('?'));
   }
 
+  findDateRange(start: Date, end: Date, params: QueryParams<Event>) {
+    const url = [
+      `${this.url}/range/${start}/${end}`,
+      createQueryParams(params),
+    ];
+    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('?'));

diff --git a/packages/event/data-access/src/lib/providers/event.ts b/packages/event/data-access/src/lib/providers/event.ts
@@ -6,6 +6,7 @@ import {
   provideDeleteEventUseCase,
   provideFindAllEventsUseCase,
   provideFindEventByIDUseCase,
+  provideFindEventsDateRangeUseCase,
   provideFindEventsUntilUseCase,
   provideFindEventsUseCase,
   provideFindMyEventsUseCase,
@@ -21,6 +22,7 @@ export function provideEvent() {
     provideFindMyEventsUseCase(),
     provideFindAllEventsUseCase(),
     provideFindEventsUntilUseCase(),
+    provideFindEventsDateRangeUseCase(),
     provideFindEventByIDUseCase(),
     provideUpdateEventUseCase(),
     provideDeleteEventUseCase(),

diff --git a/packages/event/data-source/src/lib/application/events.facade.ts b/packages/event/data-source/src/lib/application/events.facade.ts
@@ -4,13 +4,14 @@ import {
   UpdateEventDto,
   CopyEventDto,
 } from '../dtos';
-import { Event } from '@devmx/shared-api-interfaces';
+import { Event, QueryParamsDateRange } from '@devmx/shared-api-interfaces';
 import { plainToInstance } from 'class-transformer';
 import {
   CopyEventUseCase,
   CreateEventUseCase,
   DeleteEventUseCase,
   FindEventByIDUseCase,
+  FindEventsDateRangeUseCase,
   FindEventsFromUseCase,
   FindEventsUntilUseCase,
   FindEventsUseCase,
@@ -30,6 +31,7 @@ export class EventsFacade {
     private findMyEventsUseCase: FindMyEventsUseCase,
     private findEventsFromUseCase: FindEventsFromUseCase,
     private findEventsUntilUseCase: FindEventsUntilUseCase,
+    private findEventsDateRangeUseCase: FindEventsDateRangeUseCase,
     private findEventByIDUseCase: FindEventByIDUseCase,
     private updateEventUseCase: UpdateEventUseCase,
     private copyEventUseCase: CopyEventUseCase,
@@ -60,6 +62,13 @@ export class EventsFacade {
     return new PageDto(events, items, pages);
   }
 
+  async findDateRange(params: QueryParamsDateRange<Event>) {
+    const { data, items, pages } =
+      await this.findEventsDateRangeUseCase.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,
@@ -101,6 +110,7 @@ export function provideEventsFacade() {
     FindMyEventsUseCase,
     FindEventsFromUseCase,
     FindEventsUntilUseCase,
+    FindEventsDateRangeUseCase,
     FindEventByIDUseCase,
     UpdateEventUseCase,
     CopyEventUseCase,

diff --git a/packages/event/data-source/src/lib/infrastructure/events.mongo.service.impl.ts b/packages/event/data-source/src/lib/infrastructure/events.mongo.service.impl.ts
@@ -1,8 +1,12 @@
-import { QueryParams, EditableEntity } from '@devmx/shared-api-interfaces';
 import { Query, RootFilterQuery, SortOrder } from 'mongoose';
 import { EventsService } from '@devmx/event-domain/server';
 import { getModelToken } from '@nestjs/mongoose';
 import { EventCollection } from '../schemas';
+import {
+  QueryParams,
+  EditableEntity,
+  QueryParamsDateRange,
+} from '@devmx/shared-api-interfaces';
 import {
   objectId,
   MongoService,
@@ -13,28 +17,30 @@ export class EventsMongoServiceImpl
   extends MongoService<EventCollection>
   implements EventsService
 {
-  async findMyEvents(params: QueryParams<EventCollection>) {
-    const { page = 0, size = 10, filter, sort } = params;
+  async findDateRange(params: QueryParamsDateRange<EventCollection>) {
+    const { page = 0, size = 10, start, end } = params;
 
     const skip = page * size;
-    const where = this.applyFilter(filter ?? {});
-    const order = this.applySort(sort ?? {});
+    const filter = this.applyFilter(params.filter ?? {});
+    const sort = this.applySort(params.sort ?? {});
 
-    const { owner = '' } = filter ?? {};
+    const where = { ...filter, date: { $gte: start, $lte: end } };
 
-    const query = this.entityModel
-      .find({ leaders: { $in: [objectId(String(owner))] } })
-      .sort(order)
-      .skip(skip)
-      .limit(size);
+    return this.findByWhere(where, sort, skip, size);
+  }
 
-    const entities = await this.applyPopulate(query).exec();
+  async findMyEvents(params: QueryParams<EventCollection>) {
+    const { page = 0, size = 10 } = params;
 
-    const data = entities.map((item) => item.toJSON());
-    const items = await this.entityModel.countDocuments(where).exec();
-    const pages = Math.ceil(items / size);
+    const skip = page * size;
+    const filter = this.applyFilter(params.filter ?? {});
+    const sort = this.applySort(params.sort ?? {});
 
-    return { data, items, pages };
+    const { owner = '' } = params.filter ?? {};
+
+    const where = { ...filter, leaders: { $in: [objectId(String(owner))] } };
+
+    return this.findByWhere(where, sort, skip, size);
   }
 
   async findFrom(date: Date, params: QueryParams<EventCollection>) {

diff --git a/packages/event/data-source/src/lib/providers/event.ts b/packages/event/data-source/src/lib/providers/event.ts
@@ -10,6 +10,7 @@ import {
   provideCopyEventUseCase,
   provideFindMyEventsUseCase,
   provideFindEventsUntilUseCase,
+  provideFindEventsDateRangeUseCase,
 } from '@devmx/event-domain/server';
 
 export function provideEvent() {
@@ -21,6 +22,7 @@ export function provideEvent() {
     provideFindMyEventsUseCase(),
     provideFindEventsFromUseCase(),
     provideFindEventsUntilUseCase(),
+    provideFindEventsDateRangeUseCase(),
     provideFindEventByIDUseCase(),
     provideUpdateEventUseCase(),
     provideDeleteEventUseCase(),

diff --git a/packages/event/domain/src/client/services/event.ts b/packages/event/domain/src/client/services/event.ts
@@ -15,6 +15,8 @@ export abstract class EventService extends EntityService<Event> {
   abstract findAll(params: QueryParams<Event>): Observable<Page<Event>>;
 
   abstract findUntil(params: QueryParams<Event>): Observable<Page<Event>>;
+  // prettier-ignore
+  abstract findDateRange(start: Date, end: Date, params: QueryParams<Event>): Observable<Page<Event>>;
 
   abstract findMyEvents(params: QueryParams<Event>): Observable<Page<Event>>;
 

diff --git a/packages/event/domain/src/client/use-cases/find-events-date-range.ts b/packages/event/domain/src/client/use-cases/find-events-date-range.ts
@@ -0,0 +1,23 @@
+import { createUseCaseProvider } from '@devmx/shared-util-data/client';
+import { EventService } from '../services';
+import {
+  Page,
+  Event,
+  UseCase,
+  QueryParams,
+  QueryParamsDateRange,
+} from '@devmx/shared-api-interfaces';
+
+export class FindEventsDateRangeUseCase
+  implements UseCase<QueryParams<Event>, Page<Event>>
+{
+  constructor(private eventService: EventService) {}
+
+  execute({ start, end, ...params }: QueryParamsDateRange<Event>) {
+    return this.eventService.findDateRange(start, end, params);
+  }
+}
+
+export function provideFindEventsDateRangeUseCase() {
+  return createUseCaseProvider(FindEventsDateRangeUseCase, [EventService]);
+}
diff --git a/packages/event/domain/src/client/use-cases/index.ts b/packages/event/domain/src/client/use-cases/index.ts
@@ -4,6 +4,7 @@ export * from './create-rsvp';
 export * from './delete-event';
 export * from './find-all-events';
 export * from './find-event-by-id';
+export * from './find-events-date-range';
 export * from './find-events-until';
 export * from './find-events';
 export * from './find-my-events';

diff --git a/packages/event/domain/src/server/services/events.ts b/packages/event/domain/src/server/services/events.ts
@@ -1,5 +1,10 @@
 import { EntityService } from '@devmx/shared-api-interfaces/server';
-import { Event, Page, QueryParams } from '@devmx/shared-api-interfaces';
+import {
+  Event,
+  Page,
+  QueryParams,
+  QueryParamsDateRange,
+} from '@devmx/shared-api-interfaces';
 
 export abstract class EventsService extends EntityService<Event> {
   abstract findFrom(
@@ -12,5 +17,9 @@ export abstract class EventsService extends EntityService<Event> {
     params: QueryParams<Event>
   ): Promise<Page<Event>>;
 
+  abstract findDateRange(
+    params: QueryParamsDateRange<Event>
+  ): Promise<Page<Event>>;
+
   abstract findMyEvents(params: QueryParams<Event>): Promise<Page<Event>>;
 }
diff --git a/packages/event/domain/src/server/use-cases/find-events-date-range.ts b/packages/event/domain/src/server/use-cases/find-events-date-range.ts
@@ -0,0 +1,48 @@
+import { createUseCaseProvider } from '@devmx/shared-util-data/server';
+import { EventsService } from '../services';
+import {
+  Page,
+  Event,
+  UseCase,
+  QueryParamsDateRange,
+} from '@devmx/shared-api-interfaces';
+
+export class FindEventsDateRangeUseCase
+  implements UseCase<QueryParamsDateRange<Event>, Page<Event>>
+{
+  constructor(private eventsService: EventsService) {}
+
+  async execute(params: QueryParamsDateRange<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.findDateRange(params);
+  }
+}
+
+export function provideFindEventsDateRangeUseCase() {
+  return createUseCaseProvider(FindEventsDateRangeUseCase, [EventsService]);
+}
diff --git a/packages/event/domain/src/server/use-cases/index.ts b/packages/event/domain/src/server/use-cases/index.ts
@@ -3,6 +3,7 @@ export * from './create-event';
 export * from './create-rsvp';
 export * from './delete-event';
 export * from './find-event-by-id';
+export * from './find-events-date-range';
 export * from './find-events-from';
 export * from './find-events-until';
 export * from './find-events';

diff --git a/packages/event/feature-shell/src/lib/containers/events/events.container.html b/packages/event/feature-shell/src/lib/containers/events/events.container.html
@@ -1,11 +1,15 @@
 <header>
-  <div>
+  <section>
     <devmx-event-filter (filterChange)="onFilterChange($event)" />
 
     <devmx-event-time (timeChange)="onTimeChange($event)" />
-  </div>
+  </section>
 
-  <devmx-sort-direction (sortChange)="onSortChange($event)" />
+  <div>
+    <devmx-event-date-range (rangeChange)="onRangeChange($event)" />
+
+    <devmx-sort-direction (sortChange)="onSortChange($event)" />
+  </div>
 </header>
 
 @defer (on timer(500ms)) {

diff --git a/packages/event/feature-shell/src/lib/containers/events/events.container.scss b/packages/event/feature-shell/src/lib/containers/events/events.container.scss
@@ -8,6 +8,12 @@
     flex-flow: row wrap;
     justify-content: space-between;
     padding: 0.4em 0.8em;
+
+    div {
+      gap: 1em;
+      display: flex;
+      align-items: baseline;
+    }
   }
 
   .events-container {