Merge pull request #293 from ever-co/feat/#124-register-proposal

feat: register proposal implemented

apps/api/src/app/app.module.ts

@@ -22,6 +22,7 @@ import { OrganizationPositionsModule } from './organization-positions';
 import { OrganizationProjectsModule } from './organization-projects';
 import { OrganizationVendorsModule } from './organization-vendors';
 import { OrganizationTeamsModule } from './organization-teams';
+import { ProposalModule } from './proposal';
 
 @Module({
 	imports: [
@@ -79,6 +80,10 @@ import { OrganizationTeamsModule } from './organization-teams';
 					{
 						path: '/organization-teams',
 						module: OrganizationTeamsModule
+					},
+					{
+						path: '/proposal',
+						module: ProposalModule
 					}
 				]
 			}
@@ -101,7 +106,8 @@ import { OrganizationTeamsModule } from './organization-teams';
 		OrganizationProjectsModule,
 		OrganizationVendorsModule,
 		EmployeeRecurringExpenseModule,
-		OrganizationTeamsModule
+		OrganizationTeamsModule,
+		ProposalModule
 	],
 	controllers: [AppController],
 	providers: [AppService, SeedDataService],

apps/api/src/app/core/core.module.ts

@@ -23,6 +23,7 @@ import { OrganizationPositions } from '../organization-positions';
 import { OrganizationVendors } from '../organization-vendors';
 import { OrganizationProjects } from '../organization-projects';
 import { OrganizationTeams } from '../organization-teams';
+import { Proposal } from '../proposal';
 
 const entities = [
 	User,
@@ -40,7 +41,8 @@ const entities = [
 	OrganizationVendors,
 	OrganizationRecurringExpense,
 	EmployeeRecurringExpense,
-	OrganizationTeams
+	OrganizationTeams,
+	Proposal
 ];
 
 @Module({

apps/api/src/app/organization-projects/organization-projects.entity.ts

@@ -15,7 +15,6 @@ import {
 	IsEnum
 } from 'class-validator';
 import { Base } from '../core/entities/base';
-import { Organization } from '../organization/organization.entity';
 import {
 	OrganizationProjects as IOrganizationProjects,
 	CurrenciesEnum

apps/api/src/app/proposal/index.ts

@@ -0,0 +1,3 @@
+export { ProposalModule } from './proposal.module';
+export { Proposal } from './proposal.entity';
+export { ProposalService } from './proposal.service';

apps/api/src/app/proposal/proposal.controller.ts

@@ -0,0 +1,57 @@
+import { Controller, HttpStatus, Post, Body, Get, Query } from '@nestjs/common';
+import { ApiUseTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
+import { ProposalService } from './proposal.service';
+import { Proposal } from './proposal.entity';
+import { CrudController } from '../core/crud/crud.controller';
+import {
+	ProposalCreateInput as IProposalCreateInput,
+	Proposal as IProposal
+} from '@gauzy/models';
+import { IPagination } from '../core';
+
+@ApiUseTags('Proposal')
+@Controller()
+export class ProposalController extends CrudController<Proposal> {
+	constructor(private readonly proposalService: ProposalService) {
+		super(proposalService);
+	}
+
+	@ApiOperation({ title: 'Find all proposals.' })
+	@ApiResponse({
+		status: HttpStatus.OK,
+		description: 'Found proposals',
+		type: Proposal
+	})
+	@ApiResponse({
+		status: HttpStatus.NOT_FOUND,
+		description: 'Record not found'
+	})
+	@Get()
+	async findAllProposals(
+		@Query('data') data: string
+	): Promise<IPagination<IProposal>> {
+		const { relations, findInput, filterDate } = JSON.parse(data);
+		return this.proposalService.getAllProposals(
+			{ where: findInput, relations },
+			filterDate
+		);
+	}
+
+	@ApiOperation({ title: 'Create new record' })
+	@ApiResponse({
+		status: HttpStatus.CREATED,
+		description: 'The record has been successfully created.' /*, type: T*/
+	})
+	@ApiResponse({
+		status: HttpStatus.BAD_REQUEST,
+		description:
+			'Invalid input, The response body may contain clues as to what went wrong'
+	})
+	@Post('/create')
+	async createOrganizationTeam(
+		@Body() entity: IProposalCreateInput,
+		...options: any[]
+	): Promise<Proposal> {
+		return this.proposalService.create(entity);
+	}
+}

apps/api/src/app/proposal/proposal.entity.ts

@@ -0,0 +1,59 @@
+import {
+	Column,
+	Entity,
+	Index,
+	JoinColumn,
+	RelationId,
+	ManyToOne
+} from 'typeorm';
+import { ApiModelProperty, ApiModelPropertyOptional } from '@nestjs/swagger';
+import {
+	IsNotEmpty,
+	IsString,
+	IsNumber,
+	IsOptional,
+	IsDate,
+	IsEnum
+} from 'class-validator';
+import { Base } from '../core/entities/base';
+import { Proposal as IProposal } from '@gauzy/models';
+import { Employee } from '../employee';
+
+@Entity('proposal')
+export class Proposal extends Base implements IProposal {
+	@ApiModelProperty({ type: Employee })
+	@ManyToOne((type) => Employee, { nullable: true, onDelete: 'CASCADE' })
+	@JoinColumn()
+	employee: Employee;
+
+	@ApiModelProperty({ type: String, readOnly: true })
+	@RelationId((proposal: Proposal) => proposal.employee)
+	@IsString()
+	@Column({ nullable: true })
+	readonly employeeId?: string;
+
+	@ApiModelProperty({ type: String })
+	@Index()
+	@IsString()
+	@IsNotEmpty()
+	@Column({ nullable: true })
+	jobPostUrl: string;
+
+	@ApiModelPropertyOptional({ type: Date })
+	@IsDate()
+	@IsOptional()
+	@Column({ nullable: true })
+	valueDate?: Date;
+
+	@ApiModelPropertyOptional({ type: String })
+	@IsString()
+	@IsOptional()
+	@Column()
+	jobPostContent?: string;
+
+	@ApiModelPropertyOptional({ type: String })
+	@IsString()
+	@IsOptional()
+	@Column()
+	proposalContent?: string;
+}

apps/api/src/app/proposal/proposal.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Proposal } from './/proposal.entity';
+import { ProposalController } from './/proposal.controller';
+import { ProposalService } from './proposal.service';
+import { Employee } from '../employee';
+
+@Module({
+	imports: [TypeOrmModule.forFeature([Proposal, Employee])],
+	controllers: [ProposalController],
+	providers: [ProposalService],
+	exports: [ProposalService]
+})
+export class ProposalModule {}

apps/api/src/app/proposal/proposal.service.ts

@@ -0,0 +1,60 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository, FindManyOptions } from 'typeorm';
+import { Proposal } from './proposal.entity';
+import { CrudService } from '../core/crud/crud.service';
+import { IPagination } from '../core';
+import {
+	ProposalCreateInput as IProposalCreateInput,
+	Proposal as IProposal
+} from '@gauzy/models';
+import { Employee } from '../employee';
+
+@Injectable()
+export class ProposalService extends CrudService<Proposal> {
+	constructor(
+		@InjectRepository(Proposal)
+		private readonly proposalRepository: Repository<Proposal>,
+		@InjectRepository(Employee)
+		private readonly employeeRepository: Repository<Employee>
+	) {
+		super(proposalRepository);
+	}
+
+	async getAllProposals(
+		filter?: FindManyOptions<Proposal>,
+		filterDate?: string
+	): Promise<IPagination<IProposal>> {
+		const total = await this.repository.count(filter);
+		let items = await this.repository.find(filter);
+
+		if (filterDate) {
+			const dateObject = new Date(filterDate);
+
+			const month = dateObject.getMonth() + 1;
+			const year = dateObject.getFullYear();
+
+			items = items.filter((i) => {
+				const currentItemMonth = i.valueDate.getMonth() + 1;
+				const currentItemYear = i.valueDate.getFullYear();
+				return currentItemMonth === month && currentItemYear === year;
+			});
+		}
+
+		return { items, total };
+	}
+
+	async createProposal(entity: IProposalCreateInput): Promise<Proposal> {
+		const proposal = new Proposal();
+		proposal.jobPostUrl = entity.jobPostUrl;
+		proposal.valueDate = entity.valueDate;
+		proposal.jobPostContent = entity.jobPostContent;
+		proposal.proposalContent = entity.proposalContent;
+
+		const employee = await this.employeeRepository.findOneOrFail(
+			entity.employeeId
+		);
+
+		return this.proposalRepository.save(proposal);
+	}
+}

apps/gauzy/src/app/@core/services/proposals.service.ts

@@ -0,0 +1,16 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { first } from 'rxjs/operators';
+import { Proposal, ProposalCreateInput } from '@gauzy/models';
+
+@Injectable()
+export class ProposalsService {
+	constructor(private http: HttpClient) {}
+
+	create(createInput: ProposalCreateInput): Promise<Proposal> {
+		return this.http
+			.post<Proposal>('/api/proposal/create', createInput)
+			.pipe(first())
+			.toPromise();
+	}
+}

apps/gauzy/src/app/pages/proposals/proposals.module.ts

@@ -13,6 +13,7 @@ import { ProposalsComponent } from './proposals.component';
 import { ProposalsRoutingModule } from './proposals-routing.module';
 import { ProposalRegisterComponent } from './register/proposal-register.component';
 import { EmployeeSelectorsModule } from '../../@theme/components/header/selectors/employee/employee.module';
+import { ProposalsService } from '../../@core/services/proposals.service';
 
 @NgModule({
 	imports: [
@@ -23,12 +24,14 @@ import { EmployeeSelectorsModule } from '../../@theme/components/header/selector
 		ReactiveFormsModule,
 		NbButtonModule,
 		NbInputModule,
+		NbDatepickerModule,
 		NbIconModule,
 		NbSpinnerModule,
 		NbDatepickerModule,
 		EmployeeSelectorsModule
 	],
 	entryComponents: [ProposalRegisterComponent],
-	declarations: [ProposalsComponent, ProposalRegisterComponent]
+	declarations: [ProposalsComponent, ProposalRegisterComponent],
+	providers: [ProposalsService]
 })
 export class ProposalsModule {}

apps/gauzy/src/app/pages/proposals/register/proposal-register.component.html

@@ -6,7 +6,7 @@ <h3>
 	</nb-card-header>
 
 	<nb-card-body>
-		<form [formGroup]="form">
+		<form [formGroup]="form" *ngIf="form">
 			<div class="row">
 				<div class="col-sm-4">
 					<div class="form-group">
@@ -20,7 +20,6 @@ <h3>
 						</ga-employee-selector>
 					</div>
 				</div>
-
 				<div class="col-sm-4">
 					<div class="form-group">
 						<label class="label">Job Post URL</label>
@@ -34,7 +33,6 @@ <h3>
 						/>
 					</div>
 				</div>
-
 				<div class="col-sm-4">
 					<div class="form-group">
 						<label class="label">Pick a Date</label>
@@ -48,7 +46,6 @@ <h3>
 						<nb-datepicker #formpicker></nb-datepicker>
 					</div>
 				</div>
-
 				<div class="col-sm-6">
 					<div class="form-group">
 						<label class="label">Job Post Content</label>
@@ -66,7 +63,6 @@ <h3>
 						</button>
 					</div>
 				</div>
-
 				<div class="col-sm-6">
 					<div class="form-group">
 						<label class="label">Proposal Content</label>
@@ -88,7 +84,13 @@ <h3>
 		</form>
 	</nb-card-body>
 	<nb-card-footer class="text-right">
-		<button class="register-btn" status="success" nbButton>
+		<button
+			[disabled]="form.invalid"
+			(click)="registerProposal()"
+			class="register-btn"
+			status="success"
+			nbButton
+		>
 			Register Proposal
 		</button>
 	</nb-card-footer>