@flusys/nestjs-event-manager 4.1.1 → 5.0.1

package/fesm/dtos/event.dto.js

@@ -23,20 +23,22 @@ function _ts_metadata(k, v) {
 import { RecurrenceType } from '@flusys/nestjs-shared/enums';
 import { ApiProperty, ApiPropertyOptional, PartialType } from '@nestjs/swagger';
 import { Expose, Type } from 'class-transformer';
-import { IsArray, IsBoolean, IsDate, IsEnum, IsNotEmpty, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
+import { EventParticipantResponseDto } from './event-participant.dto';
+import { IsArray, IsBoolean, IsEnum, IsNotEmpty, IsOptional, IsString, IsUrl, IsUUID, Matches, MaxLength } from 'class-validator';
 export class CreateEventDto {
     constructor(){
         _define_property(this, "title", void 0);
         _define_property(this, "description", void 0);
-        _define_property(this, "meetingLink", void 0);
-        _define_property(this, "startDateTime", void 0);
-        _define_property(this, "endDateTime", void 0);
+        _define_property(this, "eventDate", void 0);
+        _define_property(this, "startTime", void 0);
+        _define_property(this, "endTime", void 0);
         _define_property(this, "isAllDay", void 0);
         _define_property(this, "recurrenceType", void 0);
         _define_property(this, "recurrenceEndDate", void 0);
+        _define_property(this, "weekDays", void 0);
         _define_property(this, "color", void 0);
         _define_property(this, "isActive", void 0);
-        _define_property(this, "metadata", void 0);
+        _define_property(this, "meetingLink", void 0);
         _define_property(this, "participantIds", void 0);
     }
 }
@@ -60,35 +62,41 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateEventDto.prototype, "description", void 0);
 _ts_decorate([
-    ApiPropertyOptional({
-        description: 'Meeting link URL',
-        maxLength: 500
+    ApiProperty({
+        description: 'Event date (YYYY-MM-DD)',
+        example: '2024-01-15'
     }),
-    IsOptional(),
+    IsNotEmpty(),
     IsString(),
-    MaxLength(500),
+    Matches(/^\d{4}-\d{2}-\d{2}$/, {
+        message: 'eventDate must be in YYYY-MM-DD format'
+    }),
     _ts_metadata("design:type", String)
-], CreateEventDto.prototype, "meetingLink", void 0);
+], CreateEventDto.prototype, "eventDate", void 0);
 _ts_decorate([
     ApiProperty({
-        description: 'Start date and time',
-        example: '2024-01-15T09:00:00Z'
+        description: 'Start time (HH:mm)',
+        example: '09:00'
     }),
     IsNotEmpty(),
-    IsDate(),
-    Type(()=>Date),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], CreateEventDto.prototype, "startDateTime", void 0);
+    IsString(),
+    Matches(/^\d{2}:\d{2}$/, {
+        message: 'startTime must be in HH:mm format'
+    }),
+    _ts_metadata("design:type", String)
+], CreateEventDto.prototype, "startTime", void 0);
 _ts_decorate([
     ApiProperty({
-        description: 'End date and time',
-        example: '2024-01-15T10:00:00Z'
+        description: 'End time (HH:mm)',
+        example: '10:00'
     }),
     IsNotEmpty(),
-    IsDate(),
-    Type(()=>Date),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], CreateEventDto.prototype, "endDateTime", void 0);
+    IsString(),
+    Matches(/^\d{2}:\d{2}$/, {
+        message: 'endTime must be in HH:mm format'
+    }),
+    _ts_metadata("design:type", String)
+], CreateEventDto.prototype, "endTime", void 0);
 _ts_decorate([
     ApiPropertyOptional({
         description: 'All day event flag',
@@ -110,13 +118,30 @@ _ts_decorate([
 ], CreateEventDto.prototype, "recurrenceType", void 0);
 _ts_decorate([
     ApiPropertyOptional({
-        description: 'Recurrence end date'
+        description: 'Recurrence end date (YYYY-MM-DD)',
+        example: '2024-12-31'
     }),
     IsOptional(),
-    IsDate(),
-    Type(()=>Date),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
+    IsString(),
+    Matches(/^\d{4}-\d{2}-\d{2}$/, {
+        message: 'recurrenceEndDate must be in YYYY-MM-DD format'
+    }),
+    _ts_metadata("design:type", Object)
 ], CreateEventDto.prototype, "recurrenceEndDate", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        description: 'Selected weekdays for WEEKLY recurrence (e.g. ["MON","WED"])',
+        type: [
+            String
+        ]
+    }),
+    IsOptional(),
+    IsArray(),
+    IsString({
+        each: true
+    }),
+    _ts_metadata("design:type", Object)
+], CreateEventDto.prototype, "weekDays", void 0);
 _ts_decorate([
     ApiPropertyOptional({
         description: 'Event color (hex)',
@@ -139,11 +164,17 @@ _ts_decorate([
 ], CreateEventDto.prototype, "isActive", void 0);
 _ts_decorate([
     ApiPropertyOptional({
-        description: 'Additional metadata'
+        description: 'Meeting link URL (e.g. video call)',
+        example: 'https://meet.google.com/abc-def-ghi'
     }),
     IsOptional(),
-    _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
-], CreateEventDto.prototype, "metadata", void 0);
+    IsString(),
+    IsUrl({}, {
+        message: 'meetingLink must be a valid URL'
+    }),
+    MaxLength(500),
+    _ts_metadata("design:type", Object)
+], CreateEventDto.prototype, "meetingLink", void 0);
 _ts_decorate([
     ApiPropertyOptional({
         description: 'Participant user IDs',
@@ -177,18 +208,20 @@ export class EventResponseDto {
         _define_property(this, "id", void 0);
         _define_property(this, "title", void 0);
         _define_property(this, "description", void 0);
-        _define_property(this, "meetingLink", void 0);
-        _define_property(this, "startDateTime", void 0);
-        _define_property(this, "endDateTime", void 0);
+        _define_property(this, "eventDate", void 0);
+        _define_property(this, "startTime", void 0);
+        _define_property(this, "endTime", void 0);
         _define_property(this, "isAllDay", void 0);
         _define_property(this, "recurrenceType", void 0);
         _define_property(this, "recurrenceEndDate", void 0);
+        _define_property(this, "weekDays", void 0);
         _define_property(this, "color", void 0);
+        _define_property(this, "meetingLink", void 0);
         _define_property(this, "isActive", void 0);
-        _define_property(this, "metadata", void 0);
         _define_property(this, "companyId", void 0);
         _define_property(this, "createdAt", void 0);
         _define_property(this, "updatedAt", void 0);
+        _define_property(this, "participants", void 0);
     }
 }
 _ts_decorate([
@@ -208,19 +241,19 @@ _ts_decorate([
 ], EventResponseDto.prototype, "description", void 0);
 _ts_decorate([
     Expose(),
-    ApiPropertyOptional(),
-    _ts_metadata("design:type", Object)
-], EventResponseDto.prototype, "meetingLink", void 0);
+    ApiProperty(),
+    _ts_metadata("design:type", String)
+], EventResponseDto.prototype, "eventDate", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], EventResponseDto.prototype, "startDateTime", void 0);
+    _ts_metadata("design:type", String)
+], EventResponseDto.prototype, "startTime", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], EventResponseDto.prototype, "endDateTime", void 0);
+    _ts_metadata("design:type", String)
+], EventResponseDto.prototype, "endTime", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),
@@ -238,21 +271,30 @@ _ts_decorate([
     ApiPropertyOptional(),
     _ts_metadata("design:type", Object)
 ], EventResponseDto.prototype, "recurrenceEndDate", void 0);
+_ts_decorate([
+    Expose(),
+    ApiPropertyOptional({
+        type: [
+            String
+        ]
+    }),
+    _ts_metadata("design:type", Object)
+], EventResponseDto.prototype, "weekDays", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),
     _ts_metadata("design:type", String)
 ], EventResponseDto.prototype, "color", void 0);
+_ts_decorate([
+    Expose(),
+    ApiPropertyOptional(),
+    _ts_metadata("design:type", Object)
+], EventResponseDto.prototype, "meetingLink", void 0);
 _ts_decorate([
     Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Boolean)
 ], EventResponseDto.prototype, "isActive", void 0);
-_ts_decorate([
-    Expose(),
-    ApiPropertyOptional(),
-    _ts_metadata("design:type", Object)
-], EventResponseDto.prototype, "metadata", void 0);
 _ts_decorate([
     Expose(),
     ApiPropertyOptional(),
@@ -268,3 +310,13 @@ _ts_decorate([
     ApiProperty(),
     _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
 ], EventResponseDto.prototype, "updatedAt", void 0);
+_ts_decorate([
+    Expose(),
+    ApiPropertyOptional({
+        type: ()=>[
+                EventParticipantResponseDto
+            ]
+    }),
+    Type(()=>EventParticipantResponseDto),
+    _ts_metadata("design:type", Array)
+], EventResponseDto.prototype, "participants", void 0);

package/fesm/entities/event-participant.entity.js

@@ -25,7 +25,7 @@ import { Identity } from '@flusys/nestjs-shared/entities';
 import { Column, Entity, Index } from 'typeorm';
 export class EventParticipant extends Identity {
     constructor(...args){
-        super(...args), _define_property(this, "eventId", void 0), _define_property(this, "userId", void 0), _define_property(this, "status", void 0), _define_property(this, "isOrganizer", void 0), _define_property(this, "metadata", void 0);
+        super(...args), _define_property(this, "eventId", void 0), _define_property(this, "userId", void 0), _define_property(this, "status", void 0), _define_property(this, "isOrganizer", void 0);
     }
 }
 _ts_decorate([
@@ -63,13 +63,6 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Boolean)
 ], EventParticipant.prototype, "isOrganizer", void 0);
-_ts_decorate([
-    Column({
-        type: 'simple-json',
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], EventParticipant.prototype, "metadata", void 0);
 EventParticipant = _ts_decorate([
     Entity({
         name: 'event_participant'

package/fesm/entities/event.entity.js

@@ -20,12 +20,13 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
-import { RecurrenceType } from '@flusys/nestjs-shared/enums';
+import { getJsonColumnType } from '@flusys/nestjs-shared';
 import { Identity } from '@flusys/nestjs-shared/entities';
+import { RecurrenceType } from '@flusys/nestjs-shared/enums';
 import { Column, Entity, Index } from 'typeorm';
 export class Event extends Identity {
     constructor(...args){
-        super(...args), _define_property(this, "title", void 0), _define_property(this, "description", void 0), _define_property(this, "meetingLink", void 0), _define_property(this, "startDateTime", void 0), _define_property(this, "endDateTime", void 0), _define_property(this, "isAllDay", void 0), _define_property(this, "recurrenceType", void 0), _define_property(this, "recurrenceEndDate", void 0), _define_property(this, "color", void 0), _define_property(this, "isActive", void 0), _define_property(this, "metadata", void 0);
+        super(...args), _define_property(this, "title", void 0), _define_property(this, "description", void 0), _define_property(this, "eventDate", void 0), _define_property(this, "startTime", void 0), _define_property(this, "endTime", void 0), _define_property(this, "isAllDay", void 0), _define_property(this, "recurrenceType", void 0), _define_property(this, "recurrenceEndDate", void 0), _define_property(this, "weekDays", void 0), _define_property(this, "color", void 0), _define_property(this, "meetingLink", void 0), _define_property(this, "isActive", void 0);
     }
 }
 _ts_decorate([
@@ -45,28 +46,32 @@ _ts_decorate([
 ], Event.prototype, "description", void 0);
 _ts_decorate([
     Column({
-        type: 'varchar',
-        length: 500,
-        nullable: true
+        name: 'event_date',
+        type: 'date',
+        nullable: false
     }),
-    _ts_metadata("design:type", Object)
-], Event.prototype, "meetingLink", void 0);
+    _ts_metadata("design:type", String)
+], Event.prototype, "eventDate", void 0);
 _ts_decorate([
     Column({
-        name: 'start_date_time',
-        type: 'timestamp',
-        nullable: false
+        name: 'start_time',
+        type: 'varchar',
+        length: 5,
+        nullable: false,
+        default: '00:00'
     }),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], Event.prototype, "startDateTime", void 0);
+    _ts_metadata("design:type", String)
+], Event.prototype, "startTime", void 0);
 _ts_decorate([
     Column({
-        name: 'end_date_time',
-        type: 'timestamp',
-        nullable: false
+        name: 'end_time',
+        type: 'varchar',
+        length: 5,
+        nullable: false,
+        default: '23:59'
     }),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], Event.prototype, "endDateTime", void 0);
+    _ts_metadata("design:type", String)
+], Event.prototype, "endTime", void 0);
 _ts_decorate([
     Column({
         name: 'is_all_day',
@@ -89,11 +94,18 @@ _ts_decorate([
 _ts_decorate([
     Column({
         name: 'recurrence_end_date',
-        type: 'timestamp',
+        type: 'date',
         nullable: true
     }),
     _ts_metadata("design:type", Object)
 ], Event.prototype, "recurrenceEndDate", void 0);
+_ts_decorate([
+    Column({
+        type: getJsonColumnType(),
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Event.prototype, "weekDays", void 0);
 _ts_decorate([
     Column({
         type: 'varchar',
@@ -103,6 +115,15 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", String)
 ], Event.prototype, "color", void 0);
+_ts_decorate([
+    Column({
+        name: 'meeting_link',
+        type: 'varchar',
+        length: 500,
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], Event.prototype, "meetingLink", void 0);
 _ts_decorate([
     Column({
         name: 'is_active',
@@ -112,20 +133,12 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Boolean)
 ], Event.prototype, "isActive", void 0);
-_ts_decorate([
-    Column({
-        type: 'simple-json',
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], Event.prototype, "metadata", void 0);
 Event = _ts_decorate([
     Entity({
         name: 'event'
     }),
     Index([
-        'startDateTime',
-        'endDateTime'
+        'eventDate'
     ]),
     Index([
         'isActive'

package/fesm/modules/event-manager.module.js

@@ -8,19 +8,17 @@ import { CacheModule, UtilsModule } from '@flusys/nestjs-shared/modules';
 import { EVENT_MANAGER_ADAPTER } from '@flusys/nestjs-shared/interfaces';
 import { Module } from '@nestjs/common';
 import { EVENT_MANAGER_MODULE_OPTIONS } from '../config/event-manager.constants';
-import { EventController, EventParticipantController } from '../controllers';
+import { EventController } from '../controllers';
 import { EventManagerAdapter } from '../adapters';
-import { EventManagerConfigService, EventManagerDataSourceProvider, EventManagerHelperService, EventParticipantService, EventService } from '../services';
+import { EventManagerConfigService, EventManagerDataSourceProvider, EventManagerHelperService, EventService } from '../services';
 const CONTROLLERS = [
-    EventController,
-    EventParticipantController
+    EventController
 ];
 const EXPORTED_SERVICES = [
     EventManagerConfigService,
     EventManagerDataSourceProvider,
     EventManagerHelperService,
-    EventService,
-    EventParticipantService
+    EventService
 ];
 const ADAPTER_PROVIDER = {
     provide: EVENT_MANAGER_ADAPTER,

package/fesm/services/event-manager-helper.service.js

@@ -25,9 +25,9 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { EVENT_MESSAGES, EVENT_PARTICIPANT_MESSAGES } from '../config';
+import { EVENT_PARTICIPANT_MESSAGES } from '../config';
 import { Inject, Injectable, NotFoundException } from '@nestjs/common';
-import { In, IsNull } from 'typeorm';
+import { IsNull } from 'typeorm';
 import { HybridCache } from '@flusys/nestjs-shared/classes';
 import { LogAction } from '@flusys/nestjs-shared/decorators';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -53,18 +53,20 @@ export class EventManagerHelperService {
     }
     async createEvent(options) {
         const repo = await this.getEventRepository();
+        const isAllDay = options.isAllDay ?? false;
         const entity = {
             title: options.title,
             description: options.description ?? null,
-            meetingLink: options.meetingLink ?? null,
-            startDateTime: options.startDateTime,
-            endDateTime: options.endDateTime,
-            isAllDay: options.isAllDay ?? false,
+            eventDate: options.eventDate,
+            startTime: isAllDay ? '00:00' : options.startTime,
+            endTime: isAllDay ? '23:59' : options.endTime,
+            isAllDay,
             recurrenceType: options.recurrenceType ?? RecurrenceType.NONE,
             recurrenceEndDate: options.recurrenceEndDate ?? null,
+            weekDays: options.weekDays ?? null,
             color: options.color ?? this.configService.getDefaultColor(),
-            isActive: true,
-            metadata: options.metadata ?? null
+            meetingLink: options.meetingLink ?? null,
+            isActive: true
         };
         if (this.configService.isCompanyFeatureEnabled() && options.companyId) {
             entity.companyId = options.companyId;
@@ -74,52 +76,6 @@ export class EventManagerHelperService {
         await this.clearCache();
         return this.toEventResult(saved);
     }
-    async addParticipants(eventId, userIds, _companyId) {
-        const eventRepo = await this.getEventRepository();
-        const participantRepo = await this.getParticipantRepository();
-        const event = await eventRepo.findOne({
-            where: {
-                id: eventId,
-                deletedAt: IsNull()
-            }
-        });
-        if (!event) {
-            throw new NotFoundException({
-                message: 'Event not found',
-                messageKey: EVENT_MESSAGES.NOT_FOUND
-            });
-        }
-        const existingParticipants = await participantRepo.find({
-            where: {
-                eventId,
-                userId: In(userIds),
-                deletedAt: IsNull()
-            }
-        });
-        const existingUserIds = new Set(existingParticipants.map((p)=>p.userId));
-        const newParticipants = userIds.filter((userId)=>!existingUserIds.has(userId)).map((userId)=>({
-                eventId,
-                userId,
-                status: ParticipantStatus.PENDING,
-                isOrganizer: false
-            }));
-        if (newParticipants.length > 0) {
-            await participantRepo.save(newParticipants);
-        }
-    }
-    async removeParticipant(eventId, userId) {
-        const participantRepo = await this.getParticipantRepository();
-        const participant = await participantRepo.findOne({
-            where: {
-                eventId,
-                userId,
-                deletedAt: IsNull()
-            }
-        });
-        if (participant) {
-            await participantRepo.softRemove(participant);
-        }
-    }
     async updateParticipantStatus(participantId, status) {
         const participantRepo = await this.getParticipantRepository();
         const participant = await participantRepo.findOne({
@@ -151,9 +107,9 @@ export class EventManagerHelperService {
             eventIds
         }).andWhere('event.deletedAt IS NULL').andWhere('event.isActive = :isActive', {
             isActive: true
-        }).andWhere('event.startDateTime <= :endDate', {
+        }).andWhere('event.eventDate <= :endDate', {
             endDate
-        }).andWhere('event.endDateTime >= :startDate', {
+        }).andWhere('event.eventDate >= :startDate', {
             startDate
         });
         if (this.configService.isCompanyFeatureEnabled() && companyId) {
@@ -197,15 +153,16 @@ export class EventManagerHelperService {
             id: event.id,
             title: event.title,
             description: event.description,
-            meetingLink: event.meetingLink,
-            startDateTime: event.startDateTime,
-            endDateTime: event.endDateTime,
+            eventDate: event.eventDate,
+            startTime: event.startTime,
+            endTime: event.endTime,
             isAllDay: event.isAllDay,
             recurrenceType: event.recurrenceType,
             recurrenceEndDate: event.recurrenceEndDate,
+            weekDays: event.weekDays,
             color: event.color,
+            meetingLink: event.meetingLink ?? null,
             isActive: event.isActive,
-            metadata: event.metadata,
             companyId: eventExt.companyId ?? null,
             createdAt: event.createdAt,
             updatedAt: event.updatedAt
@@ -240,31 +197,6 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], EventManagerHelperService.prototype, "createEvent", null);
-_ts_decorate([
-    LogAction({
-        action: 'eventParticipant.addMany',
-        module: 'event-manager'
-    }),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        String,
-        Array,
-        String
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], EventManagerHelperService.prototype, "addParticipants", null);
-_ts_decorate([
-    LogAction({
-        action: 'eventParticipant.remove',
-        module: 'event-manager'
-    }),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        String,
-        String
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], EventManagerHelperService.prototype, "removeParticipant", null);
 _ts_decorate([
     LogAction({
         action: 'eventParticipant.updateStatus',