Merge pull request #91 from 00sOrg/Fix/90

🔨 [Fix] Fix get events api
00sOrg · Sep 19, 2024 · c0d617e · c0d617e
2 parents d9e7d7e + 9620e09
commit c0d617e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/src/modules/events/dto/find-nearyby-events.dto.ts b/src/modules/events/dto/find-nearyby-events.dto.ts
@@ -1,6 +1,7 @@
 import { Event } from '../entities';
 import { ApiProperty } from '@nestjs/swagger';
 import { EventType } from '../entities/enum/event-type.enum';
+import { DisasterLevel } from '../entities/enum/disaster-level.enum';
 
 export class nearbyEvent {
   @ApiProperty()
@@ -13,18 +14,22 @@ export class nearbyEvent {
   media?: string;
   @ApiProperty()
   eventType: EventType;
+  @ApiProperty()
+  eventLevel: DisasterLevel;
   constructor(
     id: number,
     longitude: number,
     latitude: number,
     eventType: EventType,
+    eventLevel: DisasterLevel,
     media?: string,
   ) {
     this.id = id;
     this.latitude = latitude;
     this.longitude = longitude;
     this.media = media;
     this.eventType = eventType;
+    this.eventLevel = eventLevel;
   }
 }
 
@@ -41,6 +46,7 @@ export class FindNearybyDto {
           event.longitude,
           event.latitude,
           event.type!,
+          event.disasterLevel,
           event.media,
         ),
     );

diff --git a/src/modules/events/repository/events.repository.ts b/src/modules/events/repository/events.repository.ts
@@ -33,16 +33,16 @@ export class EventsRepository {
     maxLng: number,
     level: string,
   ) {
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
+    // const yesterday = new Date();
+    // yesterday.setDate(yesterday.getDate() - 1);
     const query = this.eventRepository
       .createQueryBuilder('event')
       .where('event.latitude between :minLat AND :maxLat', { minLat, maxLat })
       .andWhere('event.longitude between :minLng AND :maxLng', {
         minLng,
         maxLng,
-      })
-      .andWhere('event.createdAt > :yesterday', { yesterday });
+      });
+    // .andWhere('event.createdAt > :yesterday', { yesterday });
 
     if (
       level.toUpperCase() === DisasterLevel.PRIMARY ||
@@ -55,25 +55,29 @@ export class EventsRepository {
   }
 
   async findNearbyAll(address: string): Promise<Event[]> {
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
-    return this.eventRepository
-      .createQueryBuilder('event')
-      .where('event.address = :address', { address })
-      .andWhere('event.createdAt > :yesterday', { yesterday })
-      .addOrderBy('event.likesCount', 'DESC')
-      .getMany();
+    // const yesterday = new Date();
+    // yesterday.setDate(yesterday.getDate() - 1);
+    return (
+      this.eventRepository
+        .createQueryBuilder('event')
+        .where('event.address = :address', { address })
+        // .andWhere('event.createdAt > :yesterday', { yesterday })
+        .addOrderBy('event.likesCount', 'DESC')
+        .getMany()
+    );
   }
 
   async findEventsOrderByLikes(): Promise<Event[]> {
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
-    return this.eventRepository
-      .createQueryBuilder('event')
-      .where('event.createdAt > :yesterday', { yesterday })
-      .addOrderBy('event.likesCount', 'DESC')
-      .addOrderBy('event.createdAt', 'DESC')
-      .getMany();
+    // const yesterday = new Date();
+    // yesterday.setDate(yesterday.getDate() - 1);
+    return (
+      this.eventRepository
+        .createQueryBuilder('event')
+        // .where('event.createdAt > :yesterday', { yesterday })
+        .addOrderBy('event.likesCount', 'DESC')
+        .addOrderBy('event.createdAt', 'DESC')
+        .getMany()
+    );
   }
 
   async update(event: Partial<Event>): Promise<void> {