[Feat] Employee weekly schedule planning

packages/contracts/src/lib/employee-availability.model.ts

@@ -1,6 +1,5 @@
-import { IBasePerTenantAndOrganizationEntityModel } from './base-entity.model';
+import { IBasePerTenantAndOrganizationEntityModel, ID } from './base-entity.model';
 import { IEmployee } from './employee.model';
-import { IOrganization } from './organization.model';
 
 /**
  * Enum representing the availability status of an employee.
@@ -13,7 +12,7 @@ export enum AvailabilityStatusEnum {
 
 export interface IEmployeeAvailability extends IBasePerTenantAndOrganizationEntityModel {
 	employee: IEmployee;
-	employeeId: string;
+	employeeId: ID;
 	startDate: Date;
 	endDate: Date;
 	dayOfWeek: number; // 0 = Sunday, 6 = Saturday
@@ -25,7 +24,7 @@ export interface IEmployeeAvailability extends IBasePerTenantAndOrganizationEnti
  * Input interface for finding Employee Availability records.
  */
 export interface IEmployeeAvailabilityFindInput {
-	employeeId?: string;
+	employeeId?: ID;
 	availabilityStatus?: AvailabilityStatusEnum;
 	startDate?: Date;
 	endDate?: Date;
@@ -35,7 +34,7 @@ export interface IEmployeeAvailabilityFindInput {
  * Input interface for creating new Employee Availability records.
  */
 export interface IEmployeeAvailabilityCreateInput extends IBasePerTenantAndOrganizationEntityModel {
-	employeeId: string;
+	employeeId: ID;
 	startDate: Date;
 	endDate: Date;
 	dayOfWeek: number; // 0 = Sunday, 6 = Saturday
@@ -47,7 +46,7 @@ export interface IEmployeeAvailabilityCreateInput extends IBasePerTenantAndOrgan
  * Input interface for updating Employee Availability records.
  */
 export interface IEmployeeAvailabilityUpdateInput extends IBasePerTenantAndOrganizationEntityModel {
-	employeeId?: string;
+	employeeId?: ID;
 	startDate?: Date;
 	endDate?: Date;
 	dayOfWeek?: number; // 0 = Sunday, 6 = Saturday

packages/core/src/lib/employee-availability/commands/employee-availability.bulk.create.command.ts

@@ -2,7 +2,7 @@ import { ICommand } from '@nestjs/cqrs';
 import { IEmployeeAvailabilityCreateInput } from '@gauzy/contracts';
 
 export class EmployeeAvailabilityBulkCreateCommand implements ICommand {
-	static readonly type = '[Employee Bulk Availability ] Register';
+	static readonly type = '[Employee Bulk Availability ] Create';
 
 	constructor(public readonly input: IEmployeeAvailabilityCreateInput[]) {}
 }

packages/core/src/lib/employee-availability/commands/handlers/employee-availability.create.handler.ts

@@ -4,6 +4,7 @@ import { RequestContext } from '../../../core/context';
 import { EmployeeAvailabilityService } from '../../employee-availability.service';
 import { EmployeeAvailability } from '../../employee-availability.entity';
 import { EmployeeAvailabilityCreateCommand } from '../employee-availability.create.command';
+import { BadRequestException } from '@nestjs/common';
 
 @CommandHandler(EmployeeAvailabilityCreateCommand)
 export class EmployeeAvailabilityCreateHandler implements ICommandHandler<EmployeeAvailabilityCreateCommand> {
@@ -12,7 +13,9 @@ export class EmployeeAvailabilityCreateHandler implements ICommandHandler<Employ
 	public async execute(command: EmployeeAvailabilityCreateCommand): Promise<IEmployeeAvailability> {
 		const { input } = command;
 		const { startDate, endDate } = input;
-		if (!startDate || !endDate) return;
+		if (!startDate || !endDate) {
+			throw new BadRequestException('Start date and end date are required.');
+		}
 		const tenantId = RequestContext.currentTenantId();
 
 		const availability = new EmployeeAvailability({

packages/core/src/lib/employee-availability/employee-availability.controller.ts

@@ -1,12 +1,12 @@
+import { UpdateResult } from 'typeorm';
 import { Body, Controller, Get, HttpCode, HttpStatus, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
 import { CommandBus } from '@nestjs/cqrs';
-import { EmployeeAvailabilityService } from './employee-availability.service';
-import { EmployeeAvailability } from './employee-availability.entity';
-import { CrudController } from '../core';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { ParseJsonPipe, TenantPermissionGuard, UUIDValidationPipe } from '../shared';
 import { ID, IEmployeeAvailability, IEmployeeAvailabilityCreateInput, IPagination } from '@gauzy/contracts';
-import { UpdateResult } from 'typeorm';
+import { EmployeeAvailabilityService } from './employee-availability.service';
+import { EmployeeAvailability } from './employee-availability.entity';
+import { CrudController, PaginationParams } from '../core';
+import { TenantPermissionGuard, UUIDValidationPipe } from '../shared';
 import { EmployeeAvailabilityBulkCreateCommand, EmployeeAvailabilityCreateCommand } from './commands';
 
 @ApiTags('EmployeeAvailability')
@@ -57,9 +57,10 @@ export class EmployeeAvailabilityController extends CrudController<EmployeeAvail
 		description: 'No availability records found.'
 	})
 	@Get()
-	async findAll(@Query('data', ParseJsonPipe) data: any): Promise<IPagination<IEmployeeAvailability>> {
-		const { relations, findInput } = data;
-		return this.availabilityService.findAll({ where: findInput, relations });
+	async findAll(
+		@Query() filter: PaginationParams<EmployeeAvailability>
+	): Promise<IPagination<IEmployeeAvailability>> {
+		return this.availabilityService.findAll(filter);
 	}
 
 	/**

packages/core/src/lib/employee-availability/employee-availability.entity.ts

@@ -23,15 +23,13 @@ export class EmployeeAvailability extends TenantOrganizationBaseEntity implement
 	@ApiProperty({ type: () => Number, description: 'Day of the week (0 = Sunday, 6 = Saturday)' })
 	@IsInt()
 	@IsNotEmpty()
-	@MultiORMColumn({ type: 'int', check: 'day_of_week BETWEEN 0 AND 6' })
+	@MultiORMColumn({ check: 'day_of_week BETWEEN 0 AND 6' })
 	dayOfWeek: number;
 
 	@ApiProperty({ enum: AvailabilityStatusEnum })
 	@IsOptional()
 	@IsEnum(AvailabilityStatusEnum)
 	@MultiORMColumn({
-		type: 'int',
-		nullable: true,
 		transformer: new AvailabilityStatusTransformer()
 	})
 	availabilityStatus: AvailabilityStatusEnum;
@@ -43,7 +41,7 @@ export class EmployeeAvailability extends TenantOrganizationBaseEntity implement
 	})
 	@IsString()
 	@IsOptional()
-	@MultiORMColumn({ type: 'text', nullable: true })
+	@MultiORMColumn({ nullable: true })
 	availabilityNotes?: string;
 
 	/*
@@ -56,14 +54,13 @@ export class EmployeeAvailability extends TenantOrganizationBaseEntity implement
 	 * Employee
 	 */
 	@MultiORMManyToOne(() => Employee, {
-		nullable: false,
 		onDelete: 'CASCADE'
 	})
 	@JoinColumn()
 	employee: Employee;
 
 	@ApiProperty({ type: () => String })
 	@RelationId((it: EmployeeAvailability) => it.employee)
-	@MultiORMColumn({ type: 'uuid' })
+	@MultiORMColumn()
 	employeeId: ID;
 }

packages/core/src/lib/employee-availability/employee-availability.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { TypeOrmEmployeeAvailabilityRepository } from './repository/type-orm-employee-availability.repository';
 import { MikroOrmEmployeeAvailabilityRepository } from './repository/micro-orm-employee-availability.repository';
-import { EmployeeAvailability, TenantAwareCrudService } from '../core';
+import { TenantAwareCrudService } from './../core/crud';
+import { EmployeeAvailability } from './employee-availability.entity';
 
 @Injectable()
 export class EmployeeAvailabilityService extends TenantAwareCrudService<EmployeeAvailability> {

packages/core/src/lib/shared/pipes/employee-availability-status.pipe.ts

@@ -1,5 +1,5 @@
-import { AvailabilityStatusEnum } from '@gauzy/contracts';
 import { ValueTransformer } from 'typeorm';
+import { AvailabilityStatusEnum } from '@gauzy/contracts';
 
 /**
  * Transformer to handle the conversion between the enum values