diff --git a/docs/swagger/swagger-spec.json b/docs/swagger/swagger-spec.json index 14aa1c7..7eb6899 100644 --- a/docs/swagger/swagger-spec.json +++ b/docs/swagger/swagger-spec.json @@ -220,6 +220,39 @@ ] } }, + "/employees/employee-list": { + "get": { + "operationId": "EmployeesController_findListEmployees", + "parameters": [], + "responses": { + "200": { + "description": "List of employees with scoped info found", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EmployeeListItemDto" + } + } + } + } + }, + "400": { + "description": "List of employees with scoped info not found" + } + }, + "security": [ + { + "access-token": [] + } + ], + "summary": "Find all employees with scoped info", + "tags": [ + "Employees" + ] + } + }, "/employees/{id}": { "get": { "operationId": "EmployeesController_findOne", @@ -2241,6 +2274,11 @@ "example": 335567447, "description": "Employee`s company code" }, + "job_title": { + "type": "string", + "example": "technicient", + "description": "employee`s job title" + }, "first_work_day": { "type": "string", "example": "23/09/3018", @@ -2261,9 +2299,14 @@ "phone_number", "external_payroll_id", "company_code", + "job_title", "first_work_day" ] }, + "EmployeeListItemDto": { + "type": "object", + "properties": {} + }, "UpdateEmployeeDto": { "type": "object", "properties": { @@ -2312,6 +2355,11 @@ "example": 335567447, "description": "Employee`s company code" }, + "job_title": { + "type": "string", + "example": "technicient", + "description": "employee`s job title" + }, "first_work_day": { "format": "date-time", "type": "string", diff --git a/src/modules/exports/services/csv-exports.service.ts b/src/modules/exports/services/csv-exports.service.ts index 30c15c1..77c5d70 100644 --- a/src/modules/exports/services/csv-exports.service.ts +++ b/src/modules/exports/services/csv-exports.service.ts @@ -21,7 +21,7 @@ export class CsvExportService { async collectTransaction(periodId: number, companies: ExportCompany[]): Promise { const companyCodes = companies.map(c => c === ExportCompany.TARGO ? 1 : 2); - const period = await this.prisma.payPeriods.findUnique({ + const period = await this.prisma.payPeriods.findFirst({ where: { period_number: periodId }, }); if(!period) { diff --git a/src/modules/pay-periods/services/pay-periods-command.service.ts b/src/modules/pay-periods/services/pay-periods-command.service.ts index 4a46c09..c7e2a0a 100644 --- a/src/modules/pay-periods/services/pay-periods-command.service.ts +++ b/src/modules/pay-periods/services/pay-periods-command.service.ts @@ -10,7 +10,7 @@ export class PayPeriodsCommandService { ) {} async approvalPayPeriod(year: number , periodNumber: number): Promise { - const period = await this.prisma.payPeriods.findUnique({ + const period = await this.prisma.payPeriods.findFirst({ where: { period_number: periodNumber }, }); if (!period) throw new NotFoundException(`PayPeriod #${periodNumber} not found`); diff --git a/src/modules/shifts/services/shifts-query.service.ts b/src/modules/shifts/services/shifts-query.service.ts index 6a73100..bfa18fe 100644 --- a/src/modules/shifts/services/shifts-query.service.ts +++ b/src/modules/shifts/services/shifts-query.service.ts @@ -116,7 +116,7 @@ export class ShiftsQueryService { async getSummary(period_id: number): Promise { //fetch pay-period to display - const period = await this.prisma.payPeriods.findUnique({ + const period = await this.prisma.payPeriods.findFirst({ where: { period_number: period_id }, }); if(!period) {