diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma new file mode 100644 index 0000000..8e5139a --- /dev/null +++ b/backend/prisma/schema.prisma @@ -0,0 +1,38 @@ +datasource db { + provider = "postgresql" + url = env("DATABASE_URL") +} + +generator client { + provider = "prisma-client-js" +} + +enum EquipmentStatus { + Active + Inactive + Repair +} + +model Equipment { + id String @id @default(uuid()) + name String + serialNumber String + dateOfInspection DateTime? @db.Date + commissionedAt DateTime? + status EquipmentStatus @default(Active) + statusChanges ChangeEquipmentStatus[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt +} + +model ChangeEquipmentStatus { + id String @id @default(uuid()) + equipment Equipment @relation(fields: [equipmentId], references: [id]) + equipmentId String + newStatus EquipmentStatus + number String? + date DateTime + responsible String? + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt +} diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts new file mode 100644 index 0000000..c537f84 --- /dev/null +++ b/backend/src/app.module.ts @@ -0,0 +1,15 @@ +import { Module } from '@nestjs/common'; +import { AuthModule } from './auth/auth.module'; +import { PrismaService } from './prisma/prisma.service'; +import { EquipmentModule } from './equipment/equipment.module'; +import { ChangeEquipmentStatusModule } from './change-equipment-status/change-equipment-status.module'; + +@Module({ + imports: [ + AuthModule, + EquipmentModule, + ChangeEquipmentStatusModule, + ], + providers: [PrismaService], +}) +export class AppModule {} diff --git a/backend/src/change-equipment-status/change-equipment-status.controller.ts b/backend/src/change-equipment-status/change-equipment-status.controller.ts new file mode 100644 index 0000000..feecd95 --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.controller.ts @@ -0,0 +1,54 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; +import { ChangeEquipmentStatusService } from './change-equipment-status.service'; +import { CreateChangeEquipmentStatusDto } from './dto/create-change-equipment-status.dto'; +import { UpdateChangeEquipmentStatusDto } from './dto/update-change-equipment-status.dto'; +import { JwtAuthGuard } from '../auth/jwt-auth.guard'; + +const parseJson = (value?: string): T | undefined => { + if (!value) return undefined; + try { return JSON.parse(value) as T; } catch { return undefined; } +}; + +@ApiTags('change-equipment-status') +@ApiBearerAuth() +@UseGuards(JwtAuthGuard) +@Controller('change-equipment-status') +export class ChangeEquipmentStatusController { + constructor(private readonly changeEquipmentStatusService: ChangeEquipmentStatusService) {} + + @Get() + findAll( + @Query('skip') skip?: string, + @Query('take') take?: string, + @Query('orderBy') orderBy?: string, + @Query('where') where?: string, + ) { + return this.changeEquipmentStatusService.findAll({ + skip: skip ? Number(skip) : 0, + take: take ? Number(take) : 25, + orderBy: parseJson(orderBy), + where: parseJson(where), + }); + } + + @Get(':id') + findOne(@Param('id') id: string) { + return this.changeEquipmentStatusService.findOne({ id }); + } + + @Post() + create(@Body() dto: CreateChangeEquipmentStatusDto) { + return this.changeEquipmentStatusService.create(dto); + } + + @Patch(':id') + update(@Param('id') id: string, @Body() dto: UpdateChangeEquipmentStatusDto) { + return this.changeEquipmentStatusService.update({ where: { id }, data: dto }); + } + + @Delete(':id') + remove(@Param('id') id: string) { + return this.changeEquipmentStatusService.remove({ id }); + } +} diff --git a/backend/src/change-equipment-status/change-equipment-status.module.ts b/backend/src/change-equipment-status/change-equipment-status.module.ts new file mode 100644 index 0000000..28b2c87 --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { ChangeEquipmentStatusService } from './change-equipment-status.service'; +import { ChangeEquipmentStatusController } from './change-equipment-status.controller'; +import { PrismaService } from '../prisma/prisma.service'; + +@Module({ + controllers: [ChangeEquipmentStatusController], + providers: [ChangeEquipmentStatusService, PrismaService], +}) +export class ChangeEquipmentStatusModule {} diff --git a/backend/src/change-equipment-status/change-equipment-status.service.ts b/backend/src/change-equipment-status/change-equipment-status.service.ts new file mode 100644 index 0000000..9744606 --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.service.ts @@ -0,0 +1,56 @@ +import { Injectable } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service'; +import { ChangeEquipmentStatus, Prisma } from '@prisma/client'; +import { CreateChangeEquipmentStatusDto } from './dto/create-change-equipment-status.dto'; +import { UpdateChangeEquipmentStatusDto } from './dto/update-change-equipment-status.dto'; + +@Injectable() +export class ChangeEquipmentStatusService { + constructor(private prisma: PrismaService) {} + + async findAll(params: { + skip?: number; + take?: number; + where?: Prisma.ChangeEquipmentStatusWhereInput; + orderBy?: Prisma.ChangeEquipmentStatusOrderByWithRelationInput; + }): Promise<{ data: ChangeEquipmentStatus[]; total: number }> { + const { skip, take, where, orderBy } = params; + const [data, total] = await this.prisma.$transaction([ + this.prisma.changeEquipmentStatus.findMany({ skip, take, where, orderBy }), + this.prisma.changeEquipmentStatus.count({ where }), + ]); + return { data, total }; + } + + async findOne(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.findUnique({ where }); + } + + async create(dto: CreateChangeEquipmentStatusDto): Promise { + const { date, ...rest } = dto; + return this.prisma.changeEquipmentStatus.create({ + data: { + ...rest, + date: new Date(date), + }, + }); + } + + async update(params: { + where: Prisma.ChangeEquipmentStatusWhereUniqueInput; + data: UpdateChangeEquipmentStatusDto; + }): Promise { + const { date, ...rest } = params.data; + return this.prisma.changeEquipmentStatus.update({ + where: params.where, + data: { + ...rest, + ...(date !== undefined ? { date: date ? new Date(date) : undefined } : {}), + }, + }); + } + + async remove(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.delete({ where }); + } +} diff --git a/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts b/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts new file mode 100644 index 0000000..5daddc9 --- /dev/null +++ b/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts @@ -0,0 +1,28 @@ +import { IsString, IsNotEmpty, IsEnum, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateChangeEquipmentStatusDto { + @ApiProperty() + @IsString() + @IsNotEmpty() + equipmentId: string; + + @ApiProperty({ enum: EquipmentStatus, enumName: 'EquipmentStatus' }) + @IsEnum(EquipmentStatus) + newStatus: EquipmentStatus; + + @ApiProperty({ required: false }) + @IsString() + @IsOptional() + number?: string; + + @ApiProperty() + @IsDateString({ strict: false }) + date: string; + + @ApiProperty({ required: false }) + @IsString() + @IsOptional() + responsible?: string; +} diff --git a/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts b/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts new file mode 100644 index 0000000..9ba4dd8 --- /dev/null +++ b/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts @@ -0,0 +1,4 @@ +import { PartialType } from '@nestjs/mapped-types'; +import { CreateChangeEquipmentStatusDto } from './create-change-equipment-status.dto'; + +export class UpdateChangeEquipmentStatusDto extends PartialType(CreateChangeEquipmentStatusDto) {} diff --git a/backend/src/equipment/dto/create-equipment.dto.ts b/backend/src/equipment/dto/create-equipment.dto.ts new file mode 100644 index 0000000..d34854e --- /dev/null +++ b/backend/src/equipment/dto/create-equipment.dto.ts @@ -0,0 +1,29 @@ +import { IsString, IsNotEmpty, IsEnum, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateEquipmentDto { + @ApiProperty() + @IsString() + @IsNotEmpty() + name: string; + + @ApiProperty() + @IsString() + @IsNotEmpty() + serialNumber: string; + + @ApiProperty({ required: false }) + @IsDateString({ strict: false }) + @IsOptional() + dateOfInspection?: string; + + @ApiProperty({ required: false }) + @IsDateString({ strict: false }) + @IsOptional() + commissionedAt?: string; + + @ApiProperty({ enum: EquipmentStatus, enumName: 'EquipmentStatus' }) + @IsEnum(EquipmentStatus) + status: EquipmentStatus; +} diff --git a/backend/src/equipment/dto/update-equipment.dto.ts b/backend/src/equipment/dto/update-equipment.dto.ts new file mode 100644 index 0000000..dd5340c --- /dev/null +++ b/backend/src/equipment/dto/update-equipment.dto.ts @@ -0,0 +1,4 @@ +import { PartialType } from '@nestjs/mapped-types'; +import { CreateEquipmentDto } from './create-equipment.dto'; + +export class UpdateEquipmentDto extends PartialType(CreateEquipmentDto) {} diff --git a/backend/src/equipment/equipment.controller.ts b/backend/src/equipment/equipment.controller.ts new file mode 100644 index 0000000..b1655e4 --- /dev/null +++ b/backend/src/equipment/equipment.controller.ts @@ -0,0 +1,54 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; +import { EquipmentService } from './equipment.service'; +import { CreateEquipmentDto } from './dto/create-equipment.dto'; +import { UpdateEquipmentDto } from './dto/update-equipment.dto'; +import { JwtAuthGuard } from '../auth/jwt-auth.guard'; + +const parseJson = (value?: string): T | undefined => { + if (!value) return undefined; + try { return JSON.parse(value) as T; } catch { return undefined; } +}; + +@ApiTags('equipment') +@ApiBearerAuth() +@UseGuards(JwtAuthGuard) +@Controller('equipment') +export class EquipmentController { + constructor(private readonly equipmentService: EquipmentService) {} + + @Get() + findAll( + @Query('skip') skip?: string, + @Query('take') take?: string, + @Query('orderBy') orderBy?: string, + @Query('where') where?: string, + ) { + return this.equipmentService.findAll({ + skip: skip ? Number(skip) : 0, + take: take ? Number(take) : 25, + orderBy: parseJson(orderBy), + where: parseJson(where), + }); + } + + @Get(':id') + findOne(@Param('id') id: string) { + return this.equipmentService.findOne({ id }); + } + + @Post() + create(@Body() dto: CreateEquipmentDto) { + return this.equipmentService.create(dto); + } + + @Patch(':id') + update(@Param('id') id: string, @Body() dto: UpdateEquipmentDto) { + return this.equipmentService.update({ where: { id }, data: dto }); + } + + @Delete(':id') + remove(@Param('id') id: string) { + return this.equipmentService.remove({ id }); + } +} diff --git a/backend/src/equipment/equipment.module.ts b/backend/src/equipment/equipment.module.ts new file mode 100644 index 0000000..d31a37d --- /dev/null +++ b/backend/src/equipment/equipment.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { EquipmentService } from './equipment.service'; +import { EquipmentController } from './equipment.controller'; +import { PrismaService } from '../prisma/prisma.service'; + +@Module({ + controllers: [EquipmentController], + providers: [EquipmentService, PrismaService], +}) +export class EquipmentModule {} diff --git a/backend/src/equipment/equipment.service.ts b/backend/src/equipment/equipment.service.ts new file mode 100644 index 0000000..5719027 --- /dev/null +++ b/backend/src/equipment/equipment.service.ts @@ -0,0 +1,58 @@ +import { Injectable } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service'; +import { Equipment, Prisma } from '@prisma/client'; +import { CreateEquipmentDto } from './dto/create-equipment.dto'; +import { UpdateEquipmentDto } from './dto/update-equipment.dto'; + +@Injectable() +export class EquipmentService { + constructor(private prisma: PrismaService) {} + + async findAll(params: { + skip?: number; + take?: number; + where?: Prisma.EquipmentWhereInput; + orderBy?: Prisma.EquipmentOrderByWithRelationInput; + }): Promise<{ data: Equipment[]; total: number }> { + const { skip, take, where, orderBy } = params; + const [data, total] = await this.prisma.$transaction([ + this.prisma.equipment.findMany({ skip, take, where, orderBy }), + this.prisma.equipment.count({ where }), + ]); + return { data, total }; + } + + async findOne(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.findUnique({ where }); + } + + async create(dto: CreateEquipmentDto): Promise { + const { dateOfInspection, commissionedAt, ...rest } = dto; + return this.prisma.equipment.create({ + data: { + ...rest, + dateOfInspection: dateOfInspection ? new Date(dateOfInspection) : null, + commissionedAt: commissionedAt ? new Date(commissionedAt) : null, + }, + }); + } + + async update(params: { + where: Prisma.EquipmentWhereUniqueInput; + data: UpdateEquipmentDto; + }): Promise { + const { dateOfInspection, commissionedAt, ...rest } = params.data; + return this.prisma.equipment.update({ + where: params.where, + data: { + ...rest, + ...(dateOfInspection !== undefined ? { dateOfInspection: dateOfInspection ? new Date(dateOfInspection) : null } : {}), + ...(commissionedAt !== undefined ? { commissionedAt: commissionedAt ? new Date(commissionedAt) : null } : {}), + }, + }); + } + + async remove(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.delete({ where }); + } +} diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx new file mode 100644 index 0000000..fc19960 --- /dev/null +++ b/frontend/src/App.tsx @@ -0,0 +1,31 @@ +import { Admin, Resource } from 'react-admin'; +import { dataProvider } from './dataProvider'; +import { authProvider } from './authProvider'; +import { EquipmentList, EquipmentCreate, EquipmentEdit, EquipmentShow } from './resources/equipment'; +import { + ChangeEquipmentStatusList, + ChangeEquipmentStatusCreate, + ChangeEquipmentStatusEdit, + ChangeEquipmentStatusShow, +} from './resources/change-equipment-status'; + +const App = () => ( + + + + +); + +export default App; diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx new file mode 100644 index 0000000..e5623a6 --- /dev/null +++ b/frontend/src/main.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import { initKeycloak } from './authProvider'; +import App from './App'; + +const rootEl = document.getElementById('root'); + +initKeycloak().then((authenticated) => { + if (authenticated && rootEl) { + ReactDOM.createRoot(rootEl).render( + + + , + ); + } +}); diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx new file mode 100644 index 0000000..3e5a37e --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx @@ -0,0 +1,19 @@ +import { Create, SimpleForm, TextInput, DateTimeInput, SelectInput, ReferenceInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'Active' }, + { id: 'Inactive', name: 'Inactive' }, + { id: 'Repair', name: 'Repair' }, +]; + +export const ChangeEquipmentStatusCreate = () => ( + + + + + + + + + +); diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx new file mode 100644 index 0000000..15eb78f --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx @@ -0,0 +1,20 @@ +import { Edit, SimpleForm, TextInput, DateTimeInput, SelectInput, ReferenceInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'Active' }, + { id: 'Inactive', name: 'Inactive' }, + { id: 'Repair', name: 'Repair' }, +]; + +export const ChangeEquipmentStatusEdit = () => ( + + + + + + + + + + +); diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx new file mode 100644 index 0000000..3d4c134 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx @@ -0,0 +1,19 @@ +import { List, DataTable, TextField, DateField, EditButton, ReferenceField } from 'react-admin'; + +export const ChangeEquipmentStatusList = () => ( + + + + + + + + + + + + + + + +); diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx new file mode 100644 index 0000000..e5d6e75 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx @@ -0,0 +1,16 @@ +import { Show, SimpleShowLayout, TextField, DateField, ReferenceField } from 'react-admin'; + +export const ChangeEquipmentStatusShow = () => ( + + + + + + + + + + + + +); diff --git a/frontend/src/resources/change-equipment-status/index.ts b/frontend/src/resources/change-equipment-status/index.ts new file mode 100644 index 0000000..ab089db --- /dev/null +++ b/frontend/src/resources/change-equipment-status/index.ts @@ -0,0 +1,4 @@ +export { ChangeEquipmentStatusList } from './ChangeEquipmentStatusList'; +export { ChangeEquipmentStatusEdit } from './ChangeEquipmentStatusEdit'; +export { ChangeEquipmentStatusCreate } from './ChangeEquipmentStatusCreate'; +export { ChangeEquipmentStatusShow } from './ChangeEquipmentStatusShow'; diff --git a/frontend/src/resources/equipment/EquipmentCreate.tsx b/frontend/src/resources/equipment/EquipmentCreate.tsx new file mode 100644 index 0000000..a179801 --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentCreate.tsx @@ -0,0 +1,19 @@ +import { Create, SimpleForm, TextInput, DateInput, DateTimeInput, SelectInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'Active' }, + { id: 'Inactive', name: 'Inactive' }, + { id: 'Repair', name: 'Repair' }, +]; + +export const EquipmentCreate = () => ( + + + + + + + + + +); diff --git a/frontend/src/resources/equipment/EquipmentEdit.tsx b/frontend/src/resources/equipment/EquipmentEdit.tsx new file mode 100644 index 0000000..76b7fac --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentEdit.tsx @@ -0,0 +1,20 @@ +import { Edit, SimpleForm, TextInput, DateInput, DateTimeInput, SelectInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'Active' }, + { id: 'Inactive', name: 'Inactive' }, + { id: 'Repair', name: 'Repair' }, +]; + +export const EquipmentEdit = () => ( + + + + + + + + + + +); diff --git a/frontend/src/resources/equipment/EquipmentList.tsx b/frontend/src/resources/equipment/EquipmentList.tsx new file mode 100644 index 0000000..ce64304 --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentList.tsx @@ -0,0 +1,15 @@ +import { List, DataTable, TextField, DateField, EditButton } from 'react-admin'; + +export const EquipmentList = () => ( + + + + + + + + + + + +); diff --git a/frontend/src/resources/equipment/EquipmentShow.tsx b/frontend/src/resources/equipment/EquipmentShow.tsx new file mode 100644 index 0000000..8b79e1b --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentShow.tsx @@ -0,0 +1,14 @@ +import { Show, SimpleShowLayout, TextField, DateField } from 'react-admin'; + +export const EquipmentShow = () => ( + + + + + + + + + + +); diff --git a/frontend/src/resources/equipment/index.ts b/frontend/src/resources/equipment/index.ts new file mode 100644 index 0000000..04ab947 --- /dev/null +++ b/frontend/src/resources/equipment/index.ts @@ -0,0 +1,4 @@ +export { EquipmentList } from './EquipmentList'; +export { EquipmentEdit } from './EquipmentEdit'; +export { EquipmentCreate } from './EquipmentCreate'; +export { EquipmentShow } from './EquipmentShow';