Add Columns To Organization Project Employee Entity

packages/contracts/src/base-entity.model.ts

@@ -29,6 +29,7 @@ export interface IBaseEntityModel extends IBaseSoftDeleteEntityModel {
 
 	isActive?: boolean; // Indicates if the record is currently active
 	isArchived?: boolean; // Indicates if the record is archived
+	// archivedAt?: Date; // Date when the record was archived
 }
 
 // Common properties for entities associated with a tenant

packages/contracts/src/employee.model.ts

@@ -61,6 +61,7 @@ export interface IEmployee extends IBasePerTenantAndOrganizationEntityModel, ITa
 	organizationDepartments?: IOrganizationDepartment[];
 	organizationContacts?: IOrganizationContact[];
 	projects?: IOrganizationProject[];
+	projectDefaultAssignments?: IOrganizationProject[];
 	organizationPosition?: IOrganizationPosition;
 	skills?: ISkill[];
 	awards?: IEmployeeAward[];

packages/contracts/src/organization-projects.model.ts

@@ -1,4 +1,4 @@
-import { IEmployee } from './employee.model';
+import { IEmployee, IRelationalEmployee } from './employee.model';
 import { IOrganizationContact, IRelationalOrganizationContact } from './organization-contact.model';
 import { CrudActionEnum, ProjectBillingEnum, ProjectOwnerEnum } from './organization.model';
 import { ITag } from './tag.model';
@@ -12,6 +12,8 @@ import { IRelationalImageAsset } from './image-asset.model';
 import { IOrganizationTeam } from './organization-team.model';
 import { CustomFieldsObject } from './shared-types';
 import { IOrganizationProjectModule } from './organization-project-module.model';
+import { TaskStatusEnum } from './task-status.model';
+import { IRelationalRole } from './role.model';
 
 export interface IRelationalOrganizationProject {
 	project?: IOrganizationProject;
@@ -36,6 +38,7 @@ export interface IOrganizationProject
 	currency: CurrenciesEnum;
 	members?: IEmployee[];
 	public: boolean;
+	status?: TaskStatusEnum; // Defines the project stage / progression / step
 	tags: ITag[];
 	owner: ProjectOwnerEnum;
 	tasks?: ITask[];
@@ -50,6 +53,8 @@ export interface IOrganizationProject
 	description?: string;
 	// the color of project which is used in UI
 	color?: string;
+	// The project icon used on UI
+	icon?: string;
 	// is project billable?
 	billable?: boolean;
 	// true if the project is flat rate, false if the project is time / materials billable
@@ -61,6 +66,12 @@ export interface IOrganizationProject
 	budgetType?: OrganizationProjectBudgetTypeEnum;
 	membersCount?: number;
 	imageUrl?: string;
+	// Default project assignee
+	defaultAssignee?: IEmployee;
+	defaultAssigneeId?: ID;
+	// automation
+	archiveTasksIn?: number; // Expressed in months, all completed (done) and canceled tasks related to the project will be auto-archived after the period reached
+	closeTasksIn?: number; // Expressed in months, all completed (done) and canceled tasks related to the project will be auto-closed after the period reached
 }
 
 export enum TaskListTypeEnum {
@@ -94,19 +105,25 @@ export interface IOrganizationProjectCreateInput
 	billing?: ProjectBillingEnum;
 	currency?: CurrenciesEnum;
 	members?: IEmployee[];
+	managers?: IOrganizationProjectEmployee[];
 	public?: boolean;
+	icon?: string;
 	tags?: ITag[];
 	owner?: ProjectOwnerEnum;
 	code?: string;
 	description?: string;
 	color?: string;
 	billable?: boolean;
 	billingFlat?: boolean;
-	status?: string;
+	status?: TaskStatusEnum;
 	openSource?: boolean;
 	projectUrl?: string;
 	openSourceProjectUrl?: string;
 	taskListType?: TaskListTypeEnum;
+	defaultAssignee?: IEmployee;
+	defaultAssigneeId?: ID;
+	archiveTasksIn?: number;
+	closeTasksIn?: number;
 }
 
 export interface IOrganizationProjectUpdateInput extends IOrganizationProjectCreateInput, IOrganizationProjectSetting {
@@ -117,3 +134,9 @@ export interface IOrganizationProjectStoreState {
 	project: IOrganizationProject;
 	action: CrudActionEnum;
 }
+
+export interface IOrganizationProjectEmployee
+	extends IBasePerTenantAndOrganizationEntityModel,
+		IRelationalOrganizationProject,
+		IRelationalEmployee,
+		IRelationalRole {}

packages/core/src/core/entities/base.entity.ts

@@ -2,12 +2,7 @@
 // MIT License, see https://github.com/xmlking/ngx-starter-kit/blob/develop/LICENSE
 // Copyright (c) 2018 Sumanth Chinthagunta
 
-import {
-	PrimaryGeneratedColumn,
-	UpdateDateColumn,
-	CreateDateColumn,
-	DeleteDateColumn
-} from 'typeorm';
+import { PrimaryGeneratedColumn, UpdateDateColumn, CreateDateColumn, DeleteDateColumn } from 'typeorm';
 import { ApiPropertyOptional } from '@nestjs/swagger';
 import { IsBoolean, IsDateString, IsOptional } from 'class-validator';
 import { SoftDeletable } from 'mikro-orm-soft-delete';
@@ -70,7 +65,7 @@ export abstract class BaseEntity extends SoftDeletableBaseEntity implements IBas
 	@CreateDateColumn() // TypeORM decorator for creation date
 	@Property({
 		// Automatically set the property value when entity gets created, executed during flush operation.
-		onCreate: () => new Date(), // Set creation date on record creation
+		onCreate: () => new Date() // Set creation date on record creation
 	})
 	createdAt?: Date;
 
@@ -85,7 +80,7 @@ export abstract class BaseEntity extends SoftDeletableBaseEntity implements IBas
 		// Automatically set the property value when entity gets created, executed during flush operation.
 		onCreate: () => new Date(), // Set at record creation
 		// Automatically update the property value every time entity gets updated, executed during flush operation.
-		onUpdate: () => new Date(), // Update every time the entity is changed
+		onUpdate: () => new Date() // Update every time the entity is changed
 	})
 	updatedAt?: Date;
 
@@ -110,4 +105,16 @@ export abstract class BaseEntity extends SoftDeletableBaseEntity implements IBas
 	@ColumnIndex()
 	@MultiORMColumn({ nullable: true, default: false }) // TypeORM and Mikro-ORM compatibility
 	isArchived?: boolean;
+
+	// Indicates the date when record was archived
+	// @ApiPropertyOptional({
+	// 	type: 'string',
+	// 	format: 'date-time',
+	// 	example: '2018-11-21T06:20:32.232Z'
+	// })
+	// @IsOptional()
+	// @IsDateString()
+	// @ColumnIndex()
+	// @MultiORMColumn({ nullable: true })
+	// archivedAt?: Date;
 }

packages/core/src/core/entities/index.ts

@@ -77,6 +77,7 @@ import {
 	OrganizationLanguage,
 	OrganizationPosition,
 	OrganizationProject,
+	OrganizationProjectEmployee,
 	OrganizationProjectModule,
 	OrganizationRecurringExpense,
 	OrganizationSprint,
@@ -216,6 +217,7 @@ export const coreEntities = [
 	OrganizationLanguage,
 	OrganizationPosition,
 	OrganizationProject,
+	OrganizationProjectEmployee,
 	OrganizationProjectModule,
 	OrganizationRecurringExpense,
 	OrganizationSprint,

packages/core/src/core/entities/internal.ts

@@ -80,6 +80,7 @@ export * from '../../organization-employment-type/organization-employment-type.e
 export * from '../../organization-language/organization-language.entity';
 export * from '../../organization-position/organization-position.entity';
 export * from '../../organization-project/organization-project.entity';
+export * from '../../organization-project/organization-project-employee.entity';
 export * from '../../organization-project-module/organization-project-module.entity';
 export * from '../../organization-recurring-expense/organization-recurring-expense.entity';
 export * from '../../organization-sprint/organization-sprint.entity';

packages/core/src/database/migrations/1724929664505-CreateProjectModuleTable.ts

@@ -655,7 +655,6 @@ export class CreateProjectModuleTable1724929664505 implements MigrationInterface
 		await queryRunner.query(
 			`CREATE TABLE \`project_module_employee\` (\`organizationProjectModuleId\` varchar(36) NOT NULL, \`employeeId\` varchar(36) NOT NULL, INDEX \`IDX_e9fd7310fc93849b1d55e64d28\` (\`organizationProjectModuleId\`), INDEX \`IDX_18e428e909e48a4b7df43d7e01\` (\`employeeId\`), PRIMARY KEY (\`organizationProjectModuleId\`, \`employeeId\`)) ENGINE=InnoDB`
 		);
-		await queryRunner.query(`ALTER TABLE \`issue_type\` ADD \`isDefault\` tinyint NOT NULL DEFAULT 0`);
 		await queryRunner.query(`ALTER TABLE \`task\` ADD \`projectModuleId\` varchar(255) NULL`);
 		await queryRunner.query(`CREATE INDEX \`IDX_579534d8e12f22d308d6bd5f42\` ON \`task\` (\`projectModuleId\`)`);
 		await queryRunner.query(
@@ -744,7 +743,6 @@ export class CreateProjectModuleTable1724929664505 implements MigrationInterface
 		);
 		await queryRunner.query(`DROP INDEX \`IDX_579534d8e12f22d308d6bd5f42\` ON \`task\``);
 		await queryRunner.query(`ALTER TABLE \`task\` DROP COLUMN \`projectModuleId\``);
-		await queryRunner.query(`ALTER TABLE \`issue_type\` DROP COLUMN \`isDefault\``);
 		await queryRunner.query(`DROP INDEX \`IDX_18e428e909e48a4b7df43d7e01\` ON \`project_module_employee\``);
 		await queryRunner.query(`DROP INDEX \`IDX_e9fd7310fc93849b1d55e64d28\` ON \`project_module_employee\``);
 		await queryRunner.query(`DROP TABLE \`project_module_employee\``);